diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index dedc733d7..8fff611d1 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -10,8 +10,8 @@ #include "d/d_bg_w.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_player_HIO.h" -#include "d/res/res_link.h" // IWYU pragma: export -#include "d/res/res_lkanm.h" +#include "res/Object/Link.h" // IWYU pragma: export +#include "res/Object/LkAnm.h" class mDoExt_MtxCalcOldFrame; @@ -1808,23 +1808,23 @@ public: BOOL checkNoUpperAnime() const { return m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xFFFF; } BOOL checkGrabAnime() const { return checkGrabAnimeLight() || checkGrabAnimeHeavy(); }; - BOOL checkGrabAnimeLight() const { return checkUpperAnime(LKANM_BCK_GRABWAIT); }; - BOOL checkGrabAnimeHeavy() const { return checkUpperAnime(LKANM_BCK_GRABWAITB); }; - BOOL checkBoomerangCatchAnime() const { return checkUpperAnime(LKANM_BCK_BOOMCATCH); }; - BOOL checkBoomerangThrowAnime() const { return checkUpperAnime(LKANM_BCK_BOOMTHROW); }; - BOOL checkBoomerangReadyAnime() const { return checkUpperAnime(LKANM_BCK_BOOMWAIT); }; - BOOL checkHookshotReadyAnime() const { return checkUpperAnime(LKANM_BCK_HOOKSHOTWAIT); } - BOOL checkDashDamageAnime() const { return checkUpperAnime(LKANM_BCK_DAMDASH); } - BOOL checkBowReloadAnime() const { return checkUpperAnime(LKANM_BCK_ARROWRELORD); } - BOOL checkBowShootAnime() const { return checkUpperAnime(LKANM_BCK_ARROWSHOOT); } - BOOL checkBowWaitAnime() const { return checkUpperAnime(LKANM_BCK_BOWWAIT); } + BOOL checkGrabAnimeLight() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_GRABWAIT_e); }; + BOOL checkGrabAnimeHeavy() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_GRABWAITB_e); }; + BOOL checkBoomerangCatchAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMCATCH_e); }; + BOOL checkBoomerangThrowAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMTHROW_e); }; + BOOL checkBoomerangReadyAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMWAIT_e); }; + BOOL checkHookshotReadyAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_HOOKSHOTWAIT_e); } + BOOL checkDashDamageAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_DAMDASH_e); } + BOOL checkBowReloadAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_ARROWRELORD_e); } + BOOL checkBowShootAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_ARROWSHOOT_e); } + BOOL checkBowWaitAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_BOWWAIT_e); } BOOL checkGuardSlip() const { return mCurProc == daPyProc_GUARD_SLIP_e || mCurProc == daPyProc_CROUCH_DEFENSE_SLIP_e; } BOOL checkUpperGuardAnime() const { - return checkUpperAnime(LKANM_BCK_ATNG) || - checkUpperAnime(LKANM_BCK_ATNGHAM); + return checkUpperAnime(dRes_INDEX_LKANM_BCK_ATNG_e) || + checkUpperAnime(dRes_INDEX_LKANM_BCK_ATNGHAM_e); } s16 checkTinkleShield() const { return mTinkleShieldTimer; } @@ -1979,7 +1979,7 @@ public: virtual BOOL checkGrabBarrel() { return checkGrabBarrelSearch(1); } virtual u32 checkPlayerNoDraw() { return dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_SUBJECT_e) || checkNoResetFlg0(daPyFlg0_NO_DRAW); } virtual BOOL checkRopeTag() { return mActorKeepEquip.getActor() == NULL; } - virtual BOOL checkRopeReadyAnime() const { return checkUpperAnime(LKANM_BCK_ROPETHROWWAIT); } + virtual BOOL checkRopeReadyAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_ROPETHROWWAIT_e); } virtual void voiceStart(u32); virtual void setOutPower(f32, s16, int); virtual void onFrollCrashFlg(u32 param_1) { m3620 = param_1; onNoResetFlg0(daPyFlg0_UNK8); } diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 6fddb9261..44660cf35 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -18,7 +18,7 @@ #include "d/d_demo.h" #include "d/d_timer.h" -#include "d/res/res_always.h" // IWYU pragma: export +#include "res/Object/Always.h" // IWYU pragma: export class JKRArchive; class JKRAramBlock; diff --git a/include/d/d_name.h b/include/d/d_name.h index 4a7672201..6b85e1eb1 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -12,6 +12,7 @@ public: }; class dDlst_NameIN_c : public dDlst_base_c { +public: virtual ~dDlst_NameIN_c() {} void draw(); }; diff --git a/src/d/actor/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp index 83c055252..6c5a3845a 100644 --- a/src/d/actor/d_a_acorn_leaf.cpp +++ b/src/d/actor/d_a_acorn_leaf.cpp @@ -11,7 +11,7 @@ #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/actor/d_a_tsubo.h" #include "d/actor/d_a_player.h" -#include "d/res/res_vigah.h" +#include "res/Object/VigaH.h" static cXyz acorn_offset(0.0f, 15.0f, 0.0f); @@ -64,7 +64,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_actor) { /* 0000010C-00000258 .text CreateHeap__9daAleaf_cFv */ BOOL daAleaf_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BDL_VIGAH); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAleaf_c::m_arcname, dRes_INDEX_VIGAH_BDL_VIGAH_e); JUT_ASSERT(DEMO_SELECT(258, 262), modelData != NULL); unk_298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -72,7 +72,7 @@ BOOL daAleaf_c::CreateHeap() { return FALSE; } - J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BCK_VIGAH); + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(daAleaf_c::m_arcname, dRes_INDEX_VIGAH_BCK_VIGAH_e); JUT_ASSERT(DEMO_SELECT(273, 277), pbck != NULL); if (!unk_408.init(modelData, pbck, true, J3DFrameCtrl::EMode_RESET)) { diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 53d463d5a..375f21326 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -6,7 +6,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_agb.h" #include "d/d_msg.h" -#include "d/res/res_agb.h" +#include "res/Object/Agb.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTGba.h" @@ -1745,7 +1745,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { /* 800D396C-800D3B58 .text createHeap__7daAgb_cFv */ BOOL daAgb_c::createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Agb", AGB_BDL_AGBCURSOR); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Agb", dRes_INDEX_AGB_BDL_AGBCURSOR_e); JUT_ASSERT(VERSION_SELECT(2960, 2960, 3277, 3286), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); @@ -1753,7 +1753,7 @@ BOOL daAgb_c::createHeap() { return FALSE; } - J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Agb", AGB_BRK_AGBCURSOR); + J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Agb", dRes_INDEX_AGB_BRK_AGBCURSOR_e); if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, TRUE)) { return FALSE; } diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 6c9759942..97d8ee882 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_am.h" -#include "d/res/res_am.h" +#include "res/Object/Am.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/J3DGraphAnimator/J3DNode.h" #include "SSystem/SComponent/c_xyz.h" @@ -244,7 +244,7 @@ static BOOL medama_atari_check(am_class* i_this) { switch (hitObj->GetAtType()) { case AT_TYPE_GRAPPLING_HOOK: - if (i_this->mCurrBckIdx != AM_BCK_SLEEP && i_this->mCurrBckIdx != AM_BCK_SLEEP_LOOP) { + if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_SLEEP_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_SLEEP_LOOP_e) { if (actor->stealItemLeft > 0) { actor->max_health = 10; actor->health = 10; @@ -285,8 +285,8 @@ static BOOL medama_atari_check(am_class* i_this) { case AT_TYPE_ICE_ARROW: fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x42); 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::EMode_NONE, 1.0f, -1); + if (i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_SLEEP_e || i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_SLEEP_LOOP_e) { + anm_init(i_this, dRes_INDEX_AM_BCK_OKIRU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; i_this->mNeedleCyl.OnAtSPrmBit(cCcD_AtSPrm_Set_e); i_this->mNeedleCyl.OnAtHitBit(); @@ -373,8 +373,8 @@ static BOOL bomb_nomi_check(am_class* i_this) { fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); i_this->mStts.Move(); - if (i_this->mCurrBckIdx != AM_BCK_OPEN && i_this->mCurrBckIdx != AM_BCK_OPEN_LOOP && - i_this->mCurrBckIdx != AM_BCK_DAMAGE && i_this->mCurrBckIdx != AM_BCK_DAMAGE_LOOP) + if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_OPEN_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_OPEN_LOOP_e && + i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_DAMAGE_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_DAMAGE_LOOP_e) { return FALSE; } @@ -458,7 +458,7 @@ static BOOL Line_check(am_class* i_this, cXyz destPos) { static void medama_move(am_class* i_this) { fopAc_ac_c* actor = &i_this->actor; daPy_py_c* player = daPy_getPlayerActorClass(); - if (i_this->mCurrBckIdx == AM_BCK_SLEEP || i_this->mCurrBckIdx == AM_BCK_SLEEP_LOOP) { + if (i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_SLEEP_e || i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_SLEEP_LOOP_e) { i_this->mEyeRot.setall(0); return; } @@ -494,7 +494,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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_SLEEP_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode += 1; // Fall-through case 1: { @@ -512,7 +512,7 @@ static void action_dousa(am_class* i_this) { } #endif if (Line_check(i_this, player->current.pos)) { - anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_OKIRU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_monsSeStart(actor, JA_SE_CV_AM_AWAKE, 0); actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; i_this->mNeedleCyl.OnAtSetBit(); @@ -529,12 +529,12 @@ static void action_dousa(am_class* i_this) { i_this->mMode += 1; // Fall-through case 3: - if (i_this->mCurrBckIdx != AM_BCK_CLOSE && i_this->mCurrBckIdx != AM_BCK_CLOSE_LOOP) { - if (i_this->mCurrBckIdx != AM_BCK_DAMAGE_END) { + if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_CLOSE_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_CLOSE_LOOP_e) { + if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_DAMAGE_END_e) { fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_OUT, 0); fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0); } - anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_CLOSE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mCountDownTimers[2] = 6; } i_this->mTargetAngleY = fopAcM_searchPlayerAngleY(actor); @@ -589,9 +589,9 @@ static void action_dousa(am_class* i_this) { i_this->mMode += 1; break; case 6: - if (i_this->mCurrBckIdx == AM_BCK_CLOSE) { + if (i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_CLOSE_e) { if (i_this->mpMorf->isStop()) { - anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_CLOSE_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } if (!i_this->mAcch.ChkGroundHit()) { @@ -619,7 +619,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_DAMAGE_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_IN, 0); fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_OPEN, 0); fopAcM_monsSeStart(actor, JA_SE_CV_AM_OPEN_MOUTH, 0); @@ -666,7 +666,7 @@ static void action_dousa(am_class* i_this) { } break; case MODE_DOUSA_SLEEP_INIT: - anm_init(i_this, AM_BCK_SLEEP, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_SLEEP_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_IN, 0); i_this->mNeedleCyl.OffAtSetBit(); i_this->mNeedleCyl.OffAtSetBit(); @@ -710,7 +710,7 @@ static void action_modoru_move(am_class* i_this) { fopAc_ac_c* actor = &i_this->actor; switch (i_this->mMode) { case MODE_MODORU_MOVE_INIT: { - anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_CLOSE_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mNeedleCyl.OnAtSetBit(); i_this->mNeedleCyl.OnAtHitBit(); actor->gravity = -11.0f; @@ -779,10 +779,10 @@ static void action_handou_move(am_class* i_this) { actor->speedF = 40.0f; } i_this->mTargetAngleY = actor->current.angle.y; - if (i_this->mCurrBckIdx != AM_BCK_CLOSE && i_this->mCurrBckIdx != AM_BCK_CLOSE_LOOP) { + if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_CLOSE_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_CLOSE_LOOP_e) { fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_OUT, 0); fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0); - anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_CLOSE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } i_this->mMode += 1; // Fall-through @@ -813,7 +813,7 @@ static void action_itai_move(am_class* i_this) { actor->current.angle.y = fopAcM_searchPlayerAngleY(actor); i_this->mTargetAngleY = actor->current.angle.y; fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_IN, 0); - anm_init(i_this, AM_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_DAMAGE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode += 1; // Fall-through case 41: @@ -823,14 +823,14 @@ static void action_itai_move(am_class* i_this) { } i_this->mCountDownTimers[0] = 100; actor->speedF = 0.0f; - anm_init(i_this, AM_BCK_DAMAGE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_DAMAGE_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode += 1; break; case 42: if (i_this->mCountDownTimers[0] != 0) { break; } - anm_init(i_this, AM_BCK_DAMAGE_END, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_DAMAGE_END_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_OUT, 0); fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0); i_this->mMode += 1; @@ -853,7 +853,7 @@ static void action_itai_move(am_class* i_this) { 0xB9, &i_this->mSmokeCbs[3], fopAcM_GetRoomNo(actor) ); fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0); - anm_init(i_this, AM_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_BOM_NOMI_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); mDoAud_onEnemyDamage(); i_this->mEyeRot.setall(0); i_this->mNeedleCyl.OffAtSetBit(); @@ -907,7 +907,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_DEAD_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHFLASH00, &i_this->mWaistPos); dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHHAHEN00, &i_this->mWaistPos); @@ -1002,7 +1002,7 @@ static BOOL daAM_Execute(am_class* i_this) { } if (i_this->mAction != ACTION_ITAI_MOVE && i_this->mSpawnPosY - 1500.0f > actor->current.pos.y) { - anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM_BCK_DEAD_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHFLASH00, &i_this->mWaistPos); dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHHAHEN00, &i_this->mWaistPos); @@ -1121,9 +1121,9 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { am_class* a_this = (am_class*)i_this; a_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("AM", AM_BDL_AM), + (J3DModelData*)dComIfG_getObjectRes("AM", dRes_INDEX_AM_BDL_AM_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("AM", AM_BCK_SLEEP_LOOP), + (J3DAnmTransformKey*)dComIfG_getObjectRes("AM", dRes_INDEX_AM_BCK_SLEEP_LOOP_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00000000, diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 7317013a0..e6880e407 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_am2.h" -#include "d/res/res_am2.h" +#include "res/Object/Am2.h" #include "f_op/f_op_actor_mng.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_s_play.h" @@ -149,7 +149,7 @@ static BOOL medama_atari_check(am2_class* i_this) { cXyz hitPos = *i_this->mEyeSph.GetTgHitPosP(); if (hitObj->ChkAtType(AT_TYPE_GRAPPLING_HOOK)) { - if (i_this->mCurrBckIdx != AM2_BCK_SLEEP) { + if (i_this->mCurrBckIdx != dRes_INDEX_AM2_BCK_SLEEP_e) { if (actor->stealItemLeft > 0) { s8 origHealth = actor->health; actor->health = 10; @@ -177,8 +177,8 @@ 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::EMode_NONE, 1.0f, -1); + if (i_this->mCurrBckIdx == dRes_INDEX_AM2_BCK_SLEEP_e) { + anm_init(i_this, dRes_INDEX_AM2_BCK_WAIT_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; fopAcM_OnStatus(actor, fopAcStts_SHOWMAP_e); i_this->mNeedleCyl.OnAtSetBit(); @@ -483,8 +483,8 @@ static void action_dousa(am2_class* i_this) { i_this->mCountUpTimers[i] = 0; } 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::EMode_NONE, 1.0f, -1); + if (i_this->mCurrBckIdx != dRes_INDEX_AM2_BCK_WAIT_e) { + anm_init(i_this, dRes_INDEX_AM2_BCK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } i_this->mMode++; // Fall-through @@ -496,7 +496,7 @@ static void action_dousa(am2_class* i_this) { if (Line_check(i_this, centerPos)) { actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; fopAcM_OnStatus(actor, fopAcStts_SHOWMAP_e); - anm_init(i_this, AM2_BCK_START, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_START_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_monsSeStart(actor, JA_SE_CV_AM2_AWAKE, 0); i_this->mEyeSph.OnTgSetBit(); i_this->mWeakSph.OnTgSetBit(); @@ -530,8 +530,8 @@ static void action_dousa(am2_class* i_this) { i_this->mTargetAngleY = fopAcM_searchPlayerAngleY(actor); actor->gravity = -3.0f; actor->speed.y = 12.0f; - if (i_this->mCurrBckIdx != AM2_BCK_JUMP) { - anm_init(i_this, AM2_BCK_JUMP, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + if (i_this->mCurrBckIdx != dRes_INDEX_AM2_BCK_JUMP_e) { + anm_init(i_this, dRes_INDEX_AM2_BCK_JUMP_e, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mMode++; } @@ -585,7 +585,7 @@ static void action_dousa(am2_class* i_this) { } break; case 6: - anm_init(i_this, AM2_BCK_SLEEP, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_SLEEP_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_AM2_SPIKE_IN, 0); i_this->mWeakSph.OffTgSetBit(); i_this->mWeakSph.ClrTgHit(); @@ -648,7 +648,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_DAMAGE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode++; break; @@ -658,7 +658,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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_MAHI_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode++; } } @@ -813,8 +813,8 @@ 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::EMode_LOOP, 1.0f, -1); + if (i_this->mCurrBckIdx != dRes_INDEX_AM2_BCK_BURUBURU_e) { + anm_init(i_this, dRes_INDEX_AM2_BCK_BURUBURU_e, 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(actor, JA_SE_CM_AM2_RECOVER, 0); @@ -861,7 +861,7 @@ static void action_itai(am2_class* i_this) { dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTH2WEAKPOINT00, &i_this->mWeakPos, &actor->shape_angle); if (actor->health > 0) { - anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_DAMAGE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); if (i_this->mCountDownTimers[2] > 5) { actor->speedF = 5.0f; } @@ -879,7 +879,7 @@ static void action_itai(am2_class* i_this) { i_this->mAction = ACTION_DOUSA; i_this->mMode = 3; } else { - anm_init(i_this, AM2_BCK_MAHI, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_MAHI_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mAction = ACTION_MAHI; i_this->mMode = 12; } @@ -890,7 +890,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_DEAD1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode++; break; case 23: @@ -904,7 +904,7 @@ static void action_itai(am2_class* i_this) { actor->speedF = 10.0f; i_this->mCountDownTimers[0] = 100; actor->current.angle.y = fopAcM_searchPlayerAngleY(actor); - anm_init(i_this, AM2_BCK_DEAD2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_DEAD2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode++; // Fall-through case 24: @@ -934,7 +934,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_DEAD3_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_AM2_BEF_EXPLODE, 0); actor->speedF = 0.0f; @@ -961,7 +961,7 @@ static void action_itai(am2_class* i_this) { if (naraku_check(i_this)) { if (i_this->mbNotInHomeRoom || actor->health <= 0) { if (i_this->mMode != 25) { - anm_init(i_this, AM2_BCK_DEAD3, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_DEAD3_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_AM2_BEF_EXPLODE, 0); actor->speedF = 0.0f; i_this->mMode = 25; @@ -1031,7 +1031,7 @@ static void action_modoru_move(am2_class* i_this) { i_this->mInAbyssTimer = 0; i_this->mbMadeWaterSplash = false; i_this->mRippleCb.remove(); - anm_init(i_this, AM2_BCK_WAIT, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_AM2_BCK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_AM2_WTR_RECOVER, 0); i_this->mMode++; // Fall-through @@ -1204,9 +1204,9 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { am2_class* a_this = (am2_class*)i_this; a_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("AM2", AM2_BDL_AM2), + (J3DModelData*)dComIfG_getObjectRes("AM2", dRes_INDEX_AM2_BDL_AM2_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("AM2", AM2_BCK_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("AM2", dRes_INDEX_AM2_BCK_WAIT_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00000000, @@ -1219,14 +1219,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { a_this->mpBtkAnm = new mDoExt_btkAnm(); if (!a_this->mpBtkAnm) { return FALSE; } - J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("AM2", AM2_BTK_AM2); + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("AM2", dRes_INDEX_AM2_BTK_AM2_e); int ret = a_this->mpBtkAnm->init(model->getModelData(), pbtk, TRUE, J3DFrameCtrl::EMode_LOOP); if (!ret) { return FALSE; } if (!a_this->mpBtkAnm) { return FALSE; } a_this->mpBrkAnm = new mDoExt_brkAnm(); if (!a_this->mpBrkAnm) { return FALSE; } - J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("AM2", AM2_BRK_AM2); + J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("AM2", dRes_INDEX_AM2_BRK_AM2_e); ret = a_this->mpBrkAnm->init(model->getModelData(), pbrk, TRUE, J3DFrameCtrl::EMode_LOOP); if (!ret) { return FALSE; } if (!a_this->mpBrkAnm) { return FALSE; } diff --git a/src/d/actor/d_a_amiprop.cpp b/src/d/actor/d_a_amiprop.cpp index 94522cf0f..b7187e4ca 100644 --- a/src/d/actor/d_a_amiprop.cpp +++ b/src/d/actor/d_a_amiprop.cpp @@ -11,7 +11,7 @@ #if VERSION > VERSION_DEMO #include "d/d_vibration.h" #endif -#include "d/res/res_hami1.h" +#include "res/Object/Hami1.h" static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf @@ -74,7 +74,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000000F4-00000244 .text CreateHeap__11daAmiProp_cFv */ BOOL daAmiProp_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, HAMI1_BDL_HAMI1); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, dRes_INDEX_HAMI1_BDL_HAMI1_e); JUT_ASSERT(DEMO_SELECT(250, 255), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -87,7 +87,7 @@ BOOL daAmiProp_c::CreateHeap() { mpBgW = new dBgW(); if (mpBgW != NULL) { - cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, HAMI1_DZB_HAMI1); + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, dRes_INDEX_HAMI1_DZB_HAMI1_e); if (mpBgW->Set(dzb, cBgW::MOVE_BG_e, &unk_40C) == true) { return FALSE; } diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index e21ea3d73..6df704553 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -13,7 +13,7 @@ #include "d/actor/d_a_pz.h" #include "d/d_jnt_hit.h" #include "d/d_s_play.h" -#include "d/res/res_link.h" +#include "res/Object/Link.h" s16 daArrow_c::m_count; @@ -87,9 +87,9 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { BOOL daArrow_c::_createHeap() { u16 modelFileIndex; if (mArrowType == TYPE_LIGHT) { - modelFileIndex = LINK_BDL_ARROWGLITTER; + modelFileIndex = dRes_INDEX_LINK_BDL_ARROWGLITTER_e; } else { - modelFileIndex = LINK_BDL_ARROW; + modelFileIndex = dRes_INDEX_LINK_BDL_ARROW_e; } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, modelFileIndex); JUT_ASSERT(190, modelData != NULL); diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index 12ef4c347..391468a27 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { BOOL daArrow_Iceeff_c::CreateHeap() { J3DModelData* modelData; if(field_0xA38 == 0) { - modelData = static_cast(dComIfG_getObjectRes("Link", LINK_BDL_GICER00)); + modelData = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GICER00_e)); JUT_ASSERT(87, modelData != NULL); for(int i = 0; i < 30; i++) { field_0x298[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -30,14 +30,14 @@ BOOL daArrow_Iceeff_c::CreateHeap() { } } else { - modelData = static_cast(dComIfG_getObjectRes("Link", LINK_BDL_GICER01)); + modelData = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GICER01_e)); JUT_ASSERT(98, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if(mpModel == NULL) { return false; } - J3DAnmTransform* bck = static_cast(dComIfG_getObjectRes("Link", LINK_BCK_GICER01)); + J3DAnmTransform* bck = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BCK_GICER01_e)); JUT_ASSERT(107, bck != NULL); if(!mBck.init(modelData, bck, true, J3DFrameCtrl::EMode_NONE)) { return false; diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 5be811496..fcd8517e6 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -80,13 +80,13 @@ BOOL daArrow_Lighteff_c::CreateHeap() { J3DModelData* modelData; if(field_0x2E8 == 1) { - modelData = static_cast(dComIfG_getObjectRes("Link", LINK_BDL_GARWFI00)); + modelData = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GARWFI00_e)); } else if(field_0x2E8 == 2) { - modelData = static_cast(dComIfG_getObjectRes("Link", LINK_BDL_GARWFI01)); + modelData = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GARWFI01_e)); } else { - modelData = static_cast(dComIfG_getObjectRes("Link", LINK_BDL_GARWG00)); + modelData = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GARWG00_e)); } JUT_ASSERT(187, modelData != NULL); @@ -99,16 +99,16 @@ BOOL daArrow_Lighteff_c::CreateHeap() { J3DAnmTextureSRTKey* btk; J3DAnmTevRegKey* brk; if(field_0x2E8 == 1) { - btk = static_cast(dComIfG_getObjectRes("Link", LINK_BTK_GARWFI00)); - brk = static_cast(dComIfG_getObjectRes("Link", LINK_BRK_GARWFI00)); + btk = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTK_GARWFI00_e)); + brk = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BRK_GARWFI00_e)); } else if(field_0x2E8 == 2) { - btk = static_cast(dComIfG_getObjectRes("Link", LINK_BTK_GARWFI01)); - brk = static_cast(dComIfG_getObjectRes("Link", LINK_BRK_GARWFI01)); + btk = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTK_GARWFI01_e)); + brk = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BRK_GARWFI01_e)); } else { - btk = static_cast(dComIfG_getObjectRes("Link", LINK_BTK_GARWG00)); - brk = static_cast(dComIfG_getObjectRes("Link", LINK_BRK_GARWG00)); + btk = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTK_GARWG00_e)); + brk = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BRK_GARWG00_e)); } JUT_ASSERT(216, btk != NULL); diff --git a/src/d/actor/d_a_atdoor.cpp b/src/d/actor/d_a_atdoor.cpp index d14d1baa5..2b91b35dc 100644 --- a/src/d/actor/d_a_atdoor.cpp +++ b/src/d/actor/d_a_atdoor.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_atdoor.h" #include "d/d_com_inf_game.h" -#include "d/res/res_atdoor.h" +#include "res/Object/Atdoor.h" enum Action_e { ACT_WAIT_e = 0, @@ -30,7 +30,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000000A4-000001E8 .text CreateHeap__10daAtdoor_cFv */ BOOL daAtdoor_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(daAtdoor_c::M_arcname, ATDOOR_BDL_SDOOR01)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(daAtdoor_c::M_arcname, dRes_INDEX_ATDOOR_BDL_SDOOR01_e)); JUT_ASSERT(112, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -43,7 +43,7 @@ BOOL daAtdoor_c::CreateHeap() { return FALSE; } - cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAtdoor_c::M_arcname, ATDOOR_DZB_SDOOR01); + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAtdoor_c::M_arcname, dRes_INDEX_ATDOOR_DZB_SDOOR01_e); if (dzb == NULL) { return FALSE; } diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 32baa5ba9..a33f2d1d6 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_player_main.h" #include "d/d_camera.h" -#include "d/res/res_pspl.h" +#include "res/Object/Pspl.h" #include "m_Do/m_Do_controller_pad.h" #include "d/d_auction_screen.h" @@ -244,7 +244,7 @@ cPhs_State daAuction_c::_create() { /* 000006F4-00000770 .text createHeap__11daAuction_cFv */ BOOL daAuction_c::createHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectIDRes("Pspl", PSPL_BDL_PSPL)); + J3DModelData* modelData = static_cast(dComIfG_getObjectIDRes("Pspl", dRes_ID_PSPL_BDL_PSPL_e)); if (modelData == NULL) { return FALSE; diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index df2ed6630..14c66bafe 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -9,7 +9,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include "d/res/res_bb.h" +#include "res/Object/Bb.h" #include "d/d_kankyo.h" #include "f_op/f_op_kankyo_mng.h" #include "d/d_snap.h" @@ -119,7 +119,7 @@ static f32 tial_scale[] = { 0.25f, 0.275f, 0.2875f, 0.3f, 0.325f, 0.375f, 0.4625f, 0.575f, 0.8f, }; static u16 bb_tex_anm_idx[] = { - BB_BTP_TATACK, BB_BTP_TCLOSE, BB_BTP_TDAMAGE, BB_BTP_TKAIJO, BB_BTP_TMABATAKI, BB_BTP_TOPEN, + dRes_INDEX_BB_BTP_TATACK_e, dRes_INDEX_BB_BTP_TCLOSE_e, dRes_INDEX_BB_BTP_TDAMAGE_e, dRes_INDEX_BB_BTP_TKAIJO_e, dRes_INDEX_BB_BTP_TMABATAKI_e, dRes_INDEX_BB_BTP_TOPEN_e, }; static u16 bb_tex_max_frame[] = { 5, 3, 40, 5, 7, 3, @@ -732,14 +732,14 @@ void bb_path_move(bb_class* i_this) { frame = i_this->mpMorf->getFrame(); if (a_this->current.pos.y > i_this->unk_2F4.y && frame == (REG0_S(0) + 9)) { i_this->unk_2F0 = 1; - anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); } break; case 1: if (a_this->current.pos.y <= i_this->unk_2F4.y) { i_this->unk_2F0 = 0; - anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); } break; @@ -921,7 +921,7 @@ void bb_path_move(bb_class* i_this) { case 25: r29 = 1; - anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); i_this->unk_2F1 = -1; i_this->unk_310 = REG0_F(4) * 10.0f + 5000.0f; i_this->unk_300 = 25.0f; @@ -957,7 +957,7 @@ void bb_auto_move(bb_class* i_this) { if ((i_this->unk_318[0] == 0) && (frame == REG0_S(0) + 9)) { i_this->unk_2F0 = 1; i_this->unk_318[0] = cM_rndF(200.0) + 50.0f; - anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); } break; @@ -965,7 +965,7 @@ void bb_auto_move(bb_class* i_this) { if ((i_this->unk_318[0] == 0) && (i_this->actor.current.pos.y < i_this->unk_2F4.y)) { i_this->unk_2F0 = 0; i_this->unk_318[0] = cM_rndF(60.0) + 20.0f; - anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); } break; @@ -977,7 +977,7 @@ void bb_auto_move(bb_class* i_this) { if (frame == 0x22) { i_this->unk_2F0 = 0; i_this->unk_318[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, BB_BCK_FLY01, 0.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 0.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); } break; } @@ -1041,11 +1041,11 @@ void bb_auto_move(bb_class* i_this) { if (i_this->unk_2F1 == 10) { if (sqrt < l_bbHIO.unk_50) { i_this->unk_2F1 = 11; - anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY03_e, 10.0f, 0, 1.0f, dRes_INDEX_BB_BAS_FLY03_e); } } else if (sqrt < REG0_F(9) * 10.0f + 300.0f) { i_this->unk_2F1 = 20; - anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01); + anm_init(i_this, dRes_INDEX_BB_BCK_LAND01_e, 5.0f, 2, l_bbHIO.unk_44, dRes_INDEX_BB_BAS_LAND01_e); i_this->unk_2F0 = 10; i_this->actor.speed.y = 0.0f; i_this->unk_354 = 0; @@ -1078,7 +1078,7 @@ void bb_auto_move(bb_class* i_this) { i_this->unk_2F1 = 25; } else if (i_this->mAcch.ChkGroundHit()) { i_this->actor.speed.y = -0.5f; - anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02); + anm_init(i_this, dRes_INDEX_BB_BCK_LAND02_e, 5.0f, 0, l_bbHIO.unk_48, dRes_INDEX_BB_BAS_LAND02_e); i_this->unk_2F1 = 22; i_this->unk_318[2] = 50; } @@ -1108,7 +1108,7 @@ void bb_auto_move(bb_class* i_this) { i_this->unk_2F4.z = ac->current.pos.z; i_this->unk_310 = 1000.0f; i_this->unk_308 = 1.0f; - anm_init(i_this, BB_BCK_WALK, 5.0f, 2, 1.0f, BB_BAS_WALK); + anm_init(i_this, dRes_INDEX_BB_BCK_WALK_e, 5.0f, 2, 1.0f, dRes_INDEX_BB_BAS_WALK_e); } else { i_this->unk_2F1 = 0x19; } @@ -1128,7 +1128,7 @@ void bb_auto_move(bb_class* i_this) { i_this->unk_2F1 = 21; i_this->unk_318[2] = cM_rndF(50.0f) + 50.0f; - anm_init(i_this, BB_BCK_EAT, 5.0f, 0, 1.0f, BB_BAS_EAT); + anm_init(i_this, dRes_INDEX_BB_BCK_EAT_e, 5.0f, 0, 1.0f, dRes_INDEX_BB_BAS_EAT_e); i_this->unk_2F1 = 24; } @@ -1152,14 +1152,14 @@ void bb_auto_move(bb_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->unk_2F1 = 21; i_this->unk_318[2] = cM_rndF(50.0f); - anm_init(i_this, BB_BCK_WAIT, 5.0f, 2, 1.0f, BB_BAS_WAIT); + anm_init(i_this, dRes_INDEX_BB_BCK_WAIT_e, 5.0f, 2, 1.0f, dRes_INDEX_BB_BAS_WAIT_e); } break; } case 25: r29 = 1; i_this->unk_2F1 = 0; - anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); i_this->unk_310 = REG0_F(4) * 10.0f + 2000.0f; i_this->unk_300 = 25.0f; i_this->unk_304 = 1.0f; @@ -1203,7 +1203,7 @@ void bb_auto_move(bb_class* i_this) { } i_this->unk_2F0 = 0; i_this->unk_318[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, BB_BCK_FLY01, 3.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 3.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); if (i_this->unk_2DA != 0xFF) { i_this->unk_35D = i_this->unk_2DA + 1; path_check(i_this); @@ -1263,14 +1263,14 @@ void bb_kamome_attack(bb_class* i_this) { s32 frame = i_this->mpMorf->getFrame(); if ((i_this->actor.current.pos.y > i_this->unk_2F4.y) && (frame == REG0_S(0) + 9)) { i_this->unk_2F0 = 1; - anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); } break; } case 1: { if (i_this->actor.current.pos.y <= i_this->unk_2F4.y) { i_this->unk_2F0 = 0; - anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); } break; } @@ -1281,7 +1281,7 @@ void bb_kamome_attack(bb_class* i_this) { switch (i_this->unk_2F1) { case 0: - anm_init(i_this, BB_BCK_FLY02, 10.0f, 2, 1.0f, BB_BAS_FLY02); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 10.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); i_this->unk_2F1 = 1; case 1: { @@ -1352,7 +1352,7 @@ void bb_atack_move(bb_class* i_this) { i_this->unk_C7C = 0; i_this->unk_318[5] = (cM_rndF(30.0f) + 20.0f) * l_bbHIO.unk_20; - anm_init(i_this, BB_BCK_FLYB01, 10.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 10.0f, 2, l_bbHIO.unk_28, dRes_INDEX_BB_BAS_FLYB01_e); i_this->unk_308 = 0.0f; i_this->unk_30C = 0.0f; @@ -1378,7 +1378,7 @@ void bb_atack_move(bb_class* i_this) { i_this->unk_308 = 0.0f; i_this->unk_300 = 30.0f; i_this->unk_304 = 1.0f; - anm_init(i_this, BB_BCK_FLY02, 10.0f, 2, 1.0f, BB_BAS_FLY02); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 10.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); case 1: case 2: @@ -1396,7 +1396,7 @@ void bb_atack_move(bb_class* i_this) { if (std::sqrtf(x * x + y * y + z * z) < l_bbHIO.unk_50) { i_this->unk_2F1 = 2; - anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY03_e, 10.0f, 0, 1.0f, dRes_INDEX_BB_BAS_FLY03_e); kuti_open(i_this, 0x15, JA_SE_CV_BB_FIND); } } else { @@ -1425,7 +1425,7 @@ void bb_atack_move(bb_class* i_this) { i_this->unk_308 = 0.0f; i_this->unk_30C = 0.0f; - anm_init(i_this, BB_BCK_FLYB01, 5.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 5.0f, 2, l_bbHIO.unk_28, dRes_INDEX_BB_BAS_FLYB01_e); kuti_open(i_this, 0x30, JA_SE_CV_BB_NORMAL); } break; @@ -1471,7 +1471,7 @@ void bb_atack_move(bb_class* i_this) { if (i_this->unk_33C > ((REG0_F(5) * 10.0f + 200.0f)) && i_this->unk_33C < (REG0_F(6) * 10.0f + 350.0f)) { i_this->unk_2F1 = 5; i_this->unk_318[0] = l_bbHIO.unk_32; - anm_init(i_this, BB_BCK_FLYB01, 2.0f, 2, l_bbHIO.unk_34, BB_BAS_FLYB01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 2.0f, 2, l_bbHIO.unk_34, dRes_INDEX_BB_BAS_FLYB01_e); tex_anm_set(i_this, 0); } } @@ -1493,7 +1493,7 @@ void bb_atack_move(bb_class* i_this) { if (i_this->unk_318[0] == 0) { i_this->unk_2F1 = 6; - anm_init(i_this, BB_BCK_ATACK01, 2.0f, 0, l_bbHIO.unk_2C, BB_BAS_ATACK01); + anm_init(i_this, dRes_INDEX_BB_BCK_ATACK01_e, 2.0f, 0, l_bbHIO.unk_2C, dRes_INDEX_BB_BAS_ATACK01_e); i_this->unk_2F4.x = player_actor->current.pos.x; i_this->unk_2F4.y = player_actor->current.pos.y + 100.0f; @@ -1524,7 +1524,7 @@ void bb_atack_move(bb_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->unk_2F1 = 4; - anm_init(i_this, BB_BCK_FLYB01, 3.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 3.0f, 2, l_bbHIO.unk_28, dRes_INDEX_BB_BAS_FLYB01_e); i_this->unk_318[5] = l_bbHIO.unk_20 * (cM_rndF(30.0f) + 20.0f); i_this->unk_308 = 0.0f; @@ -1546,7 +1546,7 @@ void bb_atack_move(bb_class* i_this) { i_this->unk_2F1 = 10; i_this->unk_318[0] = l_bbHIO.unk_30; - anm_init(i_this, BB_BCK_GUSYA01, 0.0f, 0, l_bbHIO.unk_38, BB_BAS_GUSYA01); + anm_init(i_this, dRes_INDEX_BB_BCK_GUSYA01_e, 0.0f, 0, l_bbHIO.unk_38, dRes_INDEX_BB_BAS_GUSYA01_e); i_this->unk_300 = REG0_F(7); i_this->unk_304 = 1.0f; a_this->speedF = -20.0f; @@ -1568,7 +1568,7 @@ void bb_atack_move(bb_class* i_this) { if (i_this->mpMorf->isStop() && (i_this->unk_2F1 == 10)) { i_this->unk_2F1 = 11; - anm_init(i_this, BB_BCK_FURA01, 0.0f, 2, l_bbHIO.unk_3C, BB_BAS_FURA01); + anm_init(i_this, dRes_INDEX_BB_BCK_FURA01_e, 0.0f, 2, l_bbHIO.unk_3C, dRes_INDEX_BB_BAS_FURA01_e); } if ((i_this->unk_2F1 == 11) && ((i_this->unk_318[0] & 7) == 5)) { @@ -1579,7 +1579,7 @@ void bb_atack_move(bb_class* i_this) { i_this->unk_2F1 = 4; i_this->unk_318[5] = l_bbHIO.unk_20 * (cM_rndF(30.0f) + 20.0f); - anm_init(i_this, BB_BCK_FLYB01, 10.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 10.0f, 2, l_bbHIO.unk_28, dRes_INDEX_BB_BAS_FLYB01_e); i_this->unk_308 = 0.0f; i_this->unk_30C = 0.0f; @@ -1605,14 +1605,14 @@ void bb_atack_move(bb_class* i_this) { if ((i_this->unk_2DD == 4) || (i_this->unk_2DD == 7)) { i_this->unk_2F1 = 10; - anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); } else { i_this->unk_2F1 = 0; i_this->unk_318[0] = 0; i_this->unk_318[1] = 0; i_this->unk_2F0 = 1; - anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); a_this->speedF = 0.0f; i_this->unk_2F4.y = player_actor->current.pos.y + 500.0f; @@ -1668,7 +1668,7 @@ void bb_wait_move(bb_class* i_this) { i_this->unk_2F1 = 0; case 0: - anm_init(i_this, BB_BCK_WAIT, 1.0f, 2, 1.0f, BB_BAS_WAIT); + anm_init(i_this, dRes_INDEX_BB_BCK_WAIT_e, 1.0f, 2, 1.0f, dRes_INDEX_BB_BAS_WAIT_e); i_this->unk_2F1 = 1; i_this->unk_318[0] = 100; @@ -1695,7 +1695,7 @@ void bb_wait_move(bb_class* i_this) { break; } i_this->unk_2F1 = 3; - anm_init(i_this, BB_BCK_FLY01, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, dRes_INDEX_BB_BAS_FLY01_e); i_this->unk_318[0] = REG0_S(0) + 70; case 3: @@ -1754,11 +1754,11 @@ void bb_wait_move(bb_class* i_this) { } else if (i_this->unk_2F1 == 11) { if (sqrt < l_bbHIO.unk_50) { i_this->unk_2F1 = 12; - anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY03_e, 10.0f, 0, 1.0f, dRes_INDEX_BB_BAS_FLY03_e); } } else if (i_this->unk_2F1 == 12 && sqrt < REG0_F(9) * 10.0f + 300.0f) { i_this->unk_2F1 = 20; - anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01); + anm_init(i_this, dRes_INDEX_BB_BCK_LAND01_e, 5.0f, 2, l_bbHIO.unk_44, dRes_INDEX_BB_BAS_LAND01_e); i_this->unk_2F0 = 10; i_this->actor.speed.y = 0.0f; i_this->unk_354 = 0; @@ -1788,7 +1788,7 @@ void bb_wait_move(bb_class* i_this) { i_this->actor.current.pos.y = i_this->actor.home.pos.y; i_this->actor.speed.y = -0.5; if (old_354 > l_bbHIO.unk_40) { - anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02); + anm_init(i_this, dRes_INDEX_BB_BCK_LAND02_e, 5.0f, 0, l_bbHIO.unk_48, dRes_INDEX_BB_BAS_LAND02_e); i_this->unk_2F1 = -1; } } @@ -1830,7 +1830,7 @@ void bb_su_wait_move(bb_class* i_this) { i_this->unk_2F1 = 0; case 0: - anm_init(i_this, BB_BCK_WAIT, 1.0f, 2, 1.0f, BB_BAS_WAIT); + anm_init(i_this, dRes_INDEX_BB_BCK_WAIT_e, 1.0f, 2, 1.0f, dRes_INDEX_BB_BAS_WAIT_e); i_this->unk_2F1 = 1; i_this->unk_318[0] = 100; @@ -1857,7 +1857,7 @@ void bb_su_wait_move(bb_class* i_this) { break; } i_this->unk_2F1 = 3; - anm_init(i_this, BB_BCK_FLY01, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, dRes_INDEX_BB_BAS_FLY01_e); i_this->unk_318[0] = REG0_S(0) + 70; case 3: @@ -1916,11 +1916,11 @@ void bb_su_wait_move(bb_class* i_this) { } else if (i_this->unk_2F1 == 11) { if (sqrt < l_bbHIO.unk_50) { i_this->unk_2F1 = 12; - anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY03_e, 10.0f, 0, 1.0f, dRes_INDEX_BB_BAS_FLY03_e); } } else if (i_this->unk_2F1 == 12 && sqrt < REG0_F(9) * 10.0f + 300.0f) { i_this->unk_2F1 = 20; - anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01); + anm_init(i_this, dRes_INDEX_BB_BCK_LAND01_e, 5.0f, 2, l_bbHIO.unk_44, dRes_INDEX_BB_BAS_LAND01_e); i_this->unk_2F0 = 10; i_this->actor.speed.y = 0.0f; i_this->unk_354 = 0; @@ -1950,7 +1950,7 @@ void bb_su_wait_move(bb_class* i_this) { i_this->actor.current.pos.y = i_this->actor.home.pos.y; i_this->actor.speed.y = -0.5; if (old_354 > l_bbHIO.unk_40) { - anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02); + anm_init(i_this, dRes_INDEX_BB_BCK_LAND02_e, 5.0f, 0, l_bbHIO.unk_48, dRes_INDEX_BB_BAS_LAND02_e); i_this->unk_2F1 = -1; } } @@ -1984,7 +1984,7 @@ void bb_key_move(bb_class* i_this) { if (!CPad_CHECK_HOLD_B(0) && frame == REG0_S(0) + 9) { i_this->unk_2F0 = 1; - anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); } break; } @@ -1999,7 +1999,7 @@ void bb_key_move(bb_class* i_this) { if (CPad_CHECK_HOLD_B(0)) { i_this->unk_2F0 = 0; - anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e); fopAcM_monsSeStart(&i_this->actor, JA_SE_CV_BB_NORMAL, 0); } break; @@ -2086,7 +2086,7 @@ void damage_check(bb_class* i_this) { i_this->mEnemyIce.mFreezeDuration = REG0_S(3) + 300; i_this->unk_2DD = 3; i_this->unk_2F1 = 0; - anm_init(i_this, BB_BCK_DAMAGEP, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BB_BCK_DAMAGEP_e, 0.0f, 0, 1.0f, -1); } else { i_this->mEnemyIce.mLightShrinkTimer = 1; } @@ -2196,7 +2196,7 @@ void damage_check(bb_class* i_this) { } i_this->unk_C7C = 1; - anm_init(i_this, BB_BCK_DAMAGEP, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BB_BCK_DAMAGEP_e, 0.0f, 0, 1.0f, -1); } } @@ -2336,7 +2336,7 @@ static BOOL daBb_Execute(bb_class* i_this) { if (i_this->unk_2DF != 0) { switch (i_this->unk_2DF) { case 1: - anm_init(i_this, BB_BCK_FLYC, 1.0f, 2, l_bbHIO.unk_4C, BB_BAS_FLYC); + anm_init(i_this, dRes_INDEX_BB_BCK_FLYC_e, 1.0f, 2, l_bbHIO.unk_4C, dRes_INDEX_BB_BAS_FLYC_e); i_this->unk_2DF = 2; break; @@ -2375,7 +2375,7 @@ static BOOL daBb_Execute(bb_class* i_this) { if (i_this->unk_2E0 != 0) { i_this->unk_2DF = 0; - anm_init(i_this, BB_BCK_FLY02, 12.0f, 2, 1.0f, BB_BAS_FLY02); + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); dr->mAction = 31; ac->speedF = 40.0f; } @@ -2530,12 +2530,12 @@ static BOOL useHeapInit(fopAc_ac_c* ac) { bb_class* i_this = (bb_class*)ac; i_this->mpMorf = new mDoExt_McaMorf( - static_cast(dComIfG_getObjectRes("Bb", BB_BDL_BB)), + static_cast(dComIfG_getObjectRes("Bb", dRes_INDEX_BB_BDL_BB_e)), NULL, NULL, - static_cast(dComIfG_getObjectRes("Bb", BB_BCK_FLY02)), + static_cast(dComIfG_getObjectRes("Bb", dRes_INDEX_BB_BCK_FLY02_e)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Bb", BB_BAS_FLY02), + dComIfG_getObjectRes("Bb", dRes_INDEX_BB_BAS_FLY02_e), 0x80000, 0x37221203 ); @@ -2544,7 +2544,7 @@ static BOOL useHeapInit(fopAc_ac_c* ac) { return FALSE; } - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Bb", BB_BDL_BB_TAIL)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Bb", dRes_INDEX_BB_BDL_BB_TAIL_e)); JUT_ASSERT(DEMO_SELECT(4508, 4535), modelData != NULL); for (s32 i = 0; i < 9; i++) { diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 6de602a48..f0d872cc1 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -4,7 +4,7 @@ */ #include "d/dolzel_rel.h" // IWYU pragma: keep -#include "d/res/res_bdk.h" +#include "res/Object/Bdk.h" #include "d/actor/d_a_bdk.h" #include "d/actor/d_a_player.h" #include "d/d_bg_s_movebg_actor.h" @@ -239,13 +239,13 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) { bdk_class* bdk = (bdk_class*)model->getUserArea(); if (bdk != NULL) { MTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); - if (jnt_no == JNT_J_DK_KUBI1) { + if (jnt_no == DK_JNT_J_DK_KUBI1_e) { cMtx_YrotM(*calc_mtx, bdk->mF14); cMtx_XrotM(*calc_mtx, bdk->mF12); model->setAnmMtx(jnt_no, *calc_mtx); MTXCopy(*calc_mtx, J3DSys::mCurrentMtx); - } else if (jnt_no >= JNT_J_DK_TOSAKA_A1 && JNT_J_DK_TOSAKA_B2 >= jnt_no) { - if (jnt_no >= JNT_J_DK_TOSAKA_B1) { + } else if (jnt_no >= DK_JNT_J_DK_TOSAKA_A1_e && DK_JNT_J_DK_TOSAKA_B2_e >= jnt_no) { + if (jnt_no >= DK_JNT_J_DK_TOSAKA_B1_e) { cMtx_YrotM(*calc_mtx, bdk->m112E + bdk->m1120 + bdk->m1124); cMtx_ZrotM(*calc_mtx, bdk->m112C + bdk->m1122 + bdk->m1126); } else { @@ -418,7 +418,7 @@ static void kamen_draw(bdk_class* i_this) { fVar3 = REG8_F(18) + 1.20f; } - MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_ATAMA1), *calc_mtx); + MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_ATAMA1_e), *calc_mtx); cMtx_YrotM(*calc_mtx, sVar1 + 0x4000); cMtx_ZrotM(*calc_mtx, sVar2 + -0x4000); MtxTrans(0.0f, 40.0f, 125.0f, TRUE); @@ -595,7 +595,7 @@ static void up_fly(bdk_class* i_this) { u8 pos_flag = 0; switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_TOBITATU1, 5.0f, 0, 1.0f, BDK_BAS_TOBITATU1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TOBITATU1_e, 0); i_this->m2618 = 0x19; cMtx_YrotS(*calc_mtx, actor->current.angle.y); diff.x = 0.0f; @@ -649,7 +649,7 @@ static void fly(bdk_class* i_this) { case 0: break; case -1: - anm_init(i_this, BDK_BCK_FLY1, 10.0f, 2, 1.0f, BDK_BAS_FLY1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_FLY1_e, 10.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_FLY1_e, 0); i_this->m2CA = 0; break; default: @@ -791,12 +791,12 @@ static void landing(bdk_class* i_this) { diff1 = i_this->m2CC - actor->current.pos; if (diff1.abs() < 1300.0f) { i_this->mState = 2; - anm_init(i_this, BDK_BCK_TYAKUTI1, 15.0f, 0, 0.001f, BDK_BAS_TYAKUTI1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI1_e, 15.0f, 0, 0.001f, dRes_INDEX_BDK_BAS_TYAKUTI1_e, 0); i_this->m2E0 = 1.0f; pos_flag = 1; } else { if (i_this->m2EC[0] == 1) { - anm_init(i_this, BDK_BCK_KAKKU1, 30.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_KAKKU1_e, 30.0f, 2, 1.0f, -1, 0); } } break; @@ -832,7 +832,7 @@ static void landing(bdk_class* i_this) { actor->speed.x = 0.0f; actor->speed.y = -10.0f; if (i_this->mState == 3) { - anm_init(i_this, BDK_BCK_TYAKUTI1, 5.0f, 0, 1.0f, BDK_BAS_TYAKUTI1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TYAKUTI1_e, 0); i_this->mState = 4; eff_hane_num = 10; dComIfGp_getVibration().StartShock(DEMO_SELECT(REG6_S(2), REG0_S(2)) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f)); @@ -905,7 +905,7 @@ static void wait(bdk_class* i_this) { i_this->m2592 = 0; break; } - anm_init(i_this, BDK_BCK_WAIT1, 10.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT1_e, 10.0f, 2, 1.0f, -1, 0); i_this->mState = 1; i_this->m2EC[0] = cM_rndF(30.0f) + 40.0f; i_this->m2CA = 0; @@ -923,19 +923,19 @@ static void wait(bdk_class* i_this) { if (angle > 0x800) { if (i_this->m2CA != 1) { i_this->m2CA = 1; - anm_init(i_this, BDK_BCK_SENKAI_L1, 10.0f, 2, 1.0f, BDK_BAS_SENKAI_L1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_SENKAI_L1_e, 10.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_SENKAI_L1_e, 0); i_this->m2EC[1] = 0x14; } } else { if (angle < -0x800) { if (i_this->m2CA != 2) { i_this->m2CA = 2; - anm_init(i_this, BDK_BCK_SENKAI_R1, 10.0f, 2, 1.0f, BDK_BAS_SENKAI_R1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_SENKAI_R1_e, 10.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_SENKAI_R1_e, 0); i_this->m2EC[1] = 0x14; } } else if (i_this->m2CA != 3) { i_this->m2CA = 3; - anm_init(i_this, BDK_BCK_WAIT1, 10.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT1_e, 10.0f, 2, 1.0f, -1, 0); i_this->m2EC[1] = 0x14; } } @@ -972,7 +972,7 @@ static void wait(bdk_class* i_this) { i_this->mState = 0; } else if (dist < DEMO_SELECT(REG12_F(15), REG0_F(15)) + 1300.0f) { i_this->mState = 2; - anm_init(i_this, BDK_BCK_WALK1, 3.0f, 2, l_HIO.m01C, BDK_BAS_WALK1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_WALK1_e, 3.0f, 2, l_HIO.m01C, dRes_INDEX_BDK_BAS_WALK1_e, 0); i_this->m2E0 = 0.0f; actor->speedF = 0.0f; } else { @@ -996,7 +996,7 @@ static void wait(bdk_class* i_this) { } break; case 5: - anm_init(i_this, BDK_BCK_JUMP1, 5.0f, 0, 0.0f, BDK_BAS_JUMP1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_JUMP1_e, 5.0f, 0, 0.0f, dRes_INDEX_BDK_BAS_JUMP1_e, 0); i_this->mState = 6; fopAcM_GetSpeed_p(actor)->y = REG8_F(9) + 50.0f; actor->speedF = 0.0f; @@ -1004,7 +1004,7 @@ static void wait(bdk_class* i_this) { case 6: i_this->m2DC = 700.0f; if (fopAcM_GetSpeed_p(actor)->y < 0.0f && fopAcM_GetPosition_p(actor)->y < i_this->mAcch.GetGroundH() + 5.0f) { - anm_init(i_this, BDK_BCK_JUMP1, 2.0f, 0, 1.0f, BDK_BAS_JUMP1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_JUMP1_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_JUMP1_e, 0); i_this->mState = 7; } break; @@ -1033,7 +1033,7 @@ static void jump(bdk_class* i_this) { switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_TOBITATU1, 5.0f, 0, 1.0f, BDK_BAS_TOBITATU1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TOBITATU1_e, 0); i_this->m2618 = 0x19; i_this->mState = 1; i_this->m2CC = player->current.pos; @@ -1062,7 +1062,7 @@ static void jump(bdk_class* i_this) { actor->speed.y = 0.0f; } if (i_this->m2EC[0] == 0) { - anm_init(i_this, BDK_BCK_TYAKUTI1, 15.0f, 0, 0.001f, BDK_BAS_TYAKUTI1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI1_e, 15.0f, 0, 0.001f, dRes_INDEX_BDK_BAS_TYAKUTI1_e, 0); i_this->mAction = ACTION_LANDING; i_this->mState = 3; } @@ -1084,7 +1084,7 @@ static void jida_attack(bdk_class* i_this) { switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_JIDANDA1, 10.0f, 2, 1.0f, BDK_BAS_JIDANDA1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_JIDANDA1_e, 10.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_JIDANDA1_e, 0); i_this->mState = 1; i_this->m2EC[0] = (s16)cM_rndF(5.0f) * 0x18; // Fall-through @@ -1158,7 +1158,7 @@ static void kuti_attack(bdk_class* i_this) { i_this->m1134 = 2500; switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_ATTACK1, 5.0f, 0, 1.0f, BDK_BAS_ATTACK1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_ATTACK1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_ATTACK1_e, 0); i_this->mState = 2; fopAcM_monsSeStart(actor, JA_SE_CV_DK_ATTACK, 0); break; @@ -1190,7 +1190,7 @@ static void kuti_attack(bdk_class* i_this) { bVar2 = 1; } if (i_this->mpMorf->isStop()) { - anm_init(i_this, BDK_BCK_NUKENAI1, 2.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_NUKENAI1_e, 2.0f, 0, 1.0f, -1, 0); i_this->mState = 5; i_this->m2EC[0] = cM_rndF(60.0f) + 90.0f; @@ -1228,7 +1228,7 @@ static void kuti_attack(bdk_class* i_this) { if (i_this->m2EC[0] == 0) { bVar1 = 1; } else { - anm_init(i_this, BDK_BCK_NUKENAI1, 2.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_NUKENAI1_e, 2.0f, 0, 1.0f, -1, 0); i_this->mState = 5; fopAcM_seStart(actor, JA_SE_CM_DK_JITABATA, 0); fopAcM_monsSeStart(actor, JA_SE_CV_DK_NUKEZU, 0); @@ -1240,7 +1240,7 @@ static void kuti_attack(bdk_class* i_this) { break; } if (i_this->m2EC[2] == 1 || bVar1 != 0) { - anm_init(i_this, BDK_BCK_NUKU1, 1.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_NUKU1_e, 1.0f, 0, 1.0f, -1, 0); i_this->mState = 3; fopAcM_seStart(actor, JA_SE_CM_DK_PULL_UP_HEAD, 0); fopAcM_monsSeStart(actor, JA_SE_CV_DK_NUKERU, 0); @@ -1349,7 +1349,7 @@ static void fly_attack(bdk_class* i_this) { i_this->m2EC[0] = 0x28; eff_hane_set(i_this, &i_this->m1168, 10, 0); } else if (i_this->m2EC[0] == 1) { - anm_init(i_this, BDK_BCK_KAKKU1, 30.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_KAKKU1_e, 30.0f, 2, 1.0f, -1, 0); } break; case 2: @@ -1368,7 +1368,7 @@ static void fly_attack(bdk_class* i_this) { } break; case 10: - anm_init(i_this, BDK_BCK_DAMAGE4, 2.0f, 0, 1.0f, -1, 1); + anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE4_e, 2.0f, 0, 1.0f, -1, 1); i_this->mState = 0xB; actor->speed.y = 0.0f; i_this->m2EC[0] = REG0_S(5) + 0x28; @@ -1390,7 +1390,7 @@ static void fly_attack(bdk_class* i_this) { (s8)fopAcM_GetRoomNo(actor) ); if (emitter) { - emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MABUTA)); + emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MABUTA_e)); } } emitter = dComIfGp_particle_set( @@ -1405,13 +1405,13 @@ static void fly_attack(bdk_class* i_this) { &actor->tevStr.mColorK0 ); if (emitter) { - emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MUNE2)); + emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MUNE2_e)); } // Fall-through case 0xB: actor->current.pos.y += actor->speed.y; if (i_this->mpMorf->isStop()) { - anm_init(i_this, BDK_BCK_PIKUPIKU1, 5.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_PIKUPIKU1_e, 5.0f, 2, 1.0f, -1, 0); } if (i_this->m2EC[0] == 0) { actor->speed.y -= (0.5f + REG0_F(7)); @@ -1420,7 +1420,7 @@ static void fly_attack(bdk_class* i_this) { i_this->mState = 0xC; i_this->m2D8 = actor->current.angle.y + 0x8000; i_this->m2EC[0] = REG0_S(8) + 0x28; - anm_init(i_this, BDK_BCK_FLY2, 5.0f, 2, 2.0f, BDK_BAS_FLY2, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_FLY2_e, 5.0f, 2, 2.0f, dRes_INDEX_BDK_BAS_FLY2_e, 0); } } break; @@ -1470,7 +1470,7 @@ static void wind_attack(bdk_class* i_this) { cXyz offset; switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_TOBITATU1, 5.0f, 0, 1.0f, BDK_BAS_TOBITATU1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TOBITATU1_e, 0); i_this->m2618 = 0x19; i_this->mState++; i_this->m2CC = actor->current.pos; @@ -1484,7 +1484,7 @@ static void wind_attack(bdk_class* i_this) { break; case 2: if (i_this->mpMorf->isStop()) { - anm_init(i_this, BDK_BCK_FLY2, 5.0f, 2, 2.0f, BDK_BAS_FLY2, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_FLY2_e, 5.0f, 2, 2.0f, dRes_INDEX_BDK_BAS_FLY2_e, 0); i_this->mState = 3; i_this->m2EC[0] = 200; } @@ -1622,7 +1622,7 @@ static void damage_check(bdk_class* i_this) { i_this->m1136 = cM_atan2s(actor->eyePos.x - player->current.pos.x, actor->eyePos.z - player->current.pos.z); if (i_this->mAction == ACTION_KUTI_ATTACK && i_this->m1150.y < 10000.0f) { - anm_init(i_this, BDK_BCK_DAMAGE1, 2.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE1_e, 2.0f, 0, 1.0f, -1, 0); i_this->mState = 10; i_this->m2594++; if (6 <= i_this->m2594) { @@ -1634,17 +1634,17 @@ static void damage_check(bdk_class* i_this) { if (i_this->m2586 != 0) { if (i_this->mAction == ACTION_KUTI_ATTACK) { i_this->mAction = ACTION_WAIT; - anm_init(i_this, BDK_BCK_WAIT1, 10.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT1_e, 10.0f, 2, 1.0f, -1, 0); i_this->mState = 1; i_this->m2EC[0] = cM_rndF(30.0f) + 30.0f; i_this->m2EC[1] = i_this->m2EC[0]; i_this->m2CA = 0; } - anm_init(i_this, BDK_BCK_DAMAGE3, 2.0f, 0, 1.0f, -1, 1); + anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE3_e, 2.0f, 0, 1.0f, -1, 1); sVar1 = 1; } else { - anm_init(i_this, BDK_BCK_DAMAGE2, 2.0f, 0, 1.0f, BDK_BAS_DAMAGE2, 1); + anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE2_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_DAMAGE2_e, 1); sVar1 = 1; } } @@ -1665,7 +1665,7 @@ static void damage_check(bdk_class* i_this) { &actor->tevStr.mColorK0 ); if (emitter) { - emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MUNE2)); + emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MUNE2_e)); } } } @@ -1717,7 +1717,7 @@ static void kamen_demo(bdk_class* i_this) { i_this->m1134 = 0; switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_NUKENAI1, 0.0f, 0, 0.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_NUKENAI1_e, 0.0f, 0, 0.0f, -1, 0); i_this->mState = 1; i_this->m25A0 = 1; fopAcM_OnStatus(actor, fopAcStts_UNK4000_e); @@ -1733,7 +1733,7 @@ static void kamen_demo(bdk_class* i_this) { pos.y = 0.0f; pos.z = 0.0f; - MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_ATAMA1), *calc_mtx); + MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_ATAMA1_e), *calc_mtx); MtxPosition(&pos, &i_this->m910[i]); i_this->m9A0[i].y = actor->shape_angle.y; i_this->m9A0[i].x = REG0_S(6) + 0x3625; @@ -1766,7 +1766,7 @@ static void kamen_demo(bdk_class* i_this) { if (i_this->m25A6 >= 0x6E && REG8_S(8) == 0) { i_this->m25A0 = 150; i_this->mAction = ACTION_KUTI_ATTACK; - anm_init(i_this, BDK_BCK_NUKENAI1, 2.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_NUKENAI1_e, 2.0f, 0, 1.0f, -1, 0); i_this->mState = 5; i_this->m2EC[0] = cM_rndF(120.0f) + 30.0f; mDoAud_bgmStart(JA_BGM_UNK_110); @@ -1816,7 +1816,7 @@ static void start(bdk_class* i_this) { i_this->m2F6 = REG0_S(6) + 0x19; actor->current.pos.y = DEMO_SELECT(REG13_F(10), REG0_F(10)) + 8500.0f; actor->speed.y = DEMO_SELECT(REG13_F(12), REG0_F(12)) + 80.0f; - anm_init(i_this, BDK_BCK_S_DEMO1, 5.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_S_DEMO1_e, 5.0f, 2, 1.0f, -1, 0); fopAcM_seStart(actor, JA_SE_CM_DK_ROUND_UP, 0); dComIfGp_particle_set( @@ -1839,7 +1839,7 @@ static void start(bdk_class* i_this) { if (i_this->m25D8 != 0) { i_this->m25D8 = 0; i_this->mState = 3; - anm_init(i_this, BDK_BCK_S_DEMO2, 5.0f, 0, 1.0f, BDK_BAS_S_DEMO2, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_S_DEMO2_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_S_DEMO2_e, 0); i_this->m2EC[0] = 0x2D; } break; @@ -1865,7 +1865,7 @@ static void start(bdk_class* i_this) { ); if (emitter) { - emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MUNE2)); + emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MUNE2_e)); } } } @@ -1889,19 +1889,19 @@ static void end(bdk_class* i_this) { switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_LAST_DAMAGE1, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_LAST_DAMAGE1_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_LAST_DAMAGE1_e, 0); i_this->mState = 5; i_this->m2EC[0] = 0xB3; particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W00; break; case 1: - anm_init(i_this, BDK_BCK_LAST_DAMAGE3, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE3, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_LAST_DAMAGE3_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_LAST_DAMAGE3_e, 0); i_this->mState = 5; i_this->m2EC[0] = 0xB3; particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W02; break; case 2: - anm_init(i_this, BDK_BCK_LAST_DAMAGE2, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE2, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_LAST_DAMAGE2_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_LAST_DAMAGE2_e, 0); i_this->mState = 5; i_this->m2EC[0] = 0; particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W01; @@ -1909,7 +1909,7 @@ static void end(bdk_class* i_this) { case 5: if (i_this->mpMorf->isStop()) { i_this->mState = 6; - anm_init(i_this, BDK_BCK_DEATH1, 2.0f, 2, 1.0f, BDK_BAS_DEATH1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_DEATH1_e, 2.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_DEATH1_e, 0); i_this->m2EC[0] = DEMO_SELECT(REG6_S(3), REG0_S(3)) + 300; for (s32 i = 0; i <= 1; i++) { @@ -1940,7 +1940,7 @@ static void end(bdk_class* i_this) { for (s32 i = 0; i <= 1; i++) { JPABaseEmitter* emitter = i_this->m6100[i]; if (emitter) { - emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_HANE_L2 + i * 0xA)); // j_dk_hane_l2 joint, j_dk_hane_r2 joint + emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_HANE_L2_e + i * 0xA)); // j_dk_hane_l2 joint, j_dk_hane_r2 joint } } if (i_this->m2EC[0] == 0xAA) { @@ -1952,7 +1952,7 @@ static void end(bdk_class* i_this) { cLib_addCalcAngleS2(&actor->current.angle.y, -8000, 0x10, 0x80); if (i_this->m2EC[0] == 0x3C) { fopAcM_seStart(actor, JA_SE_CV_DK_DIE, 0); - anm_init(i_this, BDK_BCK_DEATH2, 5.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_DEATH2_e, 5.0f, 0, 1.0f, -1, 0); } if (i_this->m2EC[0] == 0 && DEMO_SELECT(REG6_S(4), REG0_S(4)) == 0) { i_this->mState = 7; @@ -2020,7 +2020,7 @@ static void end(bdk_class* i_this) { &actor->tevStr.mColorK0 ); if (emitter) { - emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MUNE2)); + emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MUNE2_e)); } for (s32 i = 0; i <= 1; i++) { JPABaseEmitter* emitter = dComIfGp_particle_set( @@ -2036,7 +2036,7 @@ static void end(bdk_class* i_this) { ); if (emitter) { - emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_HANE_L2 + i * 0xA)); // j_dk_hane_l2 joint, j_dk_hane_r2 joint + emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_HANE_L2_e + i * 0xA)); // j_dk_hane_l2 joint, j_dk_hane_r2 joint } } } @@ -2070,7 +2070,7 @@ static void t_fly(bdk_class* i_this) { switch (i_this->mState) { case -10: - anm_init(i_this, BDK_BCK_TOBITATU1, 5.0f, 0, 1.0f, BDK_BAS_TOBITATU1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TOBITATU1_e, 0); i_this->mState++; break; case -9: @@ -2080,20 +2080,20 @@ static void t_fly(bdk_class* i_this) { break; case 0: fopAcM_OffStatus(actor, fopAcStts_UNK4000_e); - anm_init(i_this, BDK_BCK_FLY2, 5.0f, 2, 1.0f, BDK_BAS_FLY2, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_FLY2_e, 5.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_FLY2_e, 0); i_this->mState++; // Fall-through case 1: if (bdkobj) { i_this->m2CC = bdkobj->current.pos; - anm_init(i_this, BDK_BCK_ATTACK_T1, 5.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_ATTACK_T1_e, 5.0f, 0, 1.0f, -1, 0); i_this->mState++; fopAcM_monsSeStart(actor, JA_SE_CV_DK_ATTACK, 0); i_this->mp2598 = bdkobj; } else { i_this->m2CC = player->current.pos; if (i_this->m2EC[0] == 0) { - anm_init(i_this, BDK_BCK_ATTACK_T2, 5.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_ATTACK_T2_e, 5.0f, 0, 1.0f, -1, 0); i_this->mState = 10; fopAcM_monsSeStart(actor, JA_SE_CV_DK_ATTACK, 0); fopAcM_seStart(actor, JA_SE_CM_DK_FOOT_ATTACK, 0); @@ -2175,7 +2175,7 @@ static void t_landing(bdk_class* i_this) { i_this->mF10 = 1; switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_TOBITATU_T1, 5.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU_T1_e, 5.0f, 2, 1.0f, -1, 0); i_this->mState++; break; case 1: @@ -2224,14 +2224,14 @@ static void t_lastattack(bdk_class* i_this) { case 0: actor->speed.y = DEMO_SELECT(REG13_F(6), REG0_F(6)) + 80.0f; i_this->mState++; - anm_init(i_this, BDK_BCK_TYAKUTI_T1, 10.0f, 0, 0.001f, BDK_BAS_TYAKUTI_T1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI_T1_e, 10.0f, 0, 0.001f, dRes_INDEX_BDK_BAS_TYAKUTI_T1_e, 0); break; case 1: if (!(s8)isfalling) { break; } - anm_init(i_this, BDK_BCK_TYAKUTI_T1, 1.0f, 0, 1.0f, BDK_BAS_TYAKUTI_T1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI_T1_e, 1.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TYAKUTI_T1_e, 0); i_this->mState++; dComIfGp_getVibration().StartShock(DEMO_SELECT(REG6_S(2), REG0_S(2)) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f)); dComIfGp_particle_set( @@ -2256,13 +2256,13 @@ static void t_lastattack(bdk_class* i_this) { break; case 2: if (i_this->mpMorf->isStop()) { - anm_init(i_this, BDK_BCK_WAIT_T1, 5.0, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT_T1_e, 5.0, 2, 1.0f, -1, 0); i_this->mState++; } break; case 3: if (i_this->m2EC[0] == 0 && fopAcM_searchActorDistance(actor, daPy_getPlayerActorClass()) < REG0_F(13) + 700.0f) { - anm_init(i_this, BDK_BCK_ATTACK_T3, 5.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_ATTACK_T3_e, 5.0f, 0, 1.0f, -1, 0); fopAcM_monsSeStart(actor, JA_SE_CV_DK_ATTACK, 0); i_this->mState = 4; } @@ -2279,7 +2279,7 @@ static void t_lastattack(bdk_class* i_this) { eff_hane_set(i_this, &i_this->m1168, 5, 0); } if (i_this->mpMorf->isStop()) { - anm_init(i_this, BDK_BCK_WAIT_T1, 5.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT_T1_e, 5.0f, 2, 1.0f, -1, 0); i_this->mState = 3; i_this->m2EC[0] = cM_rndF(100.0f) + 100.0f; } @@ -2301,7 +2301,7 @@ static void t_down(bdk_class* i_this) { switch (i_this->mState) { case 0: - anm_init(i_this, BDK_BCK_TO_DAMAGE_T1, 2.0f, 0, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_TO_DAMAGE_T1_e, 2.0f, 0, 1.0f, -1, 0); i_this->mState++; i_this->m2EC[0] = REG0_S(6) + 0x50; i_this->m2EC[1] = REG0_S(7) + 0x50; @@ -2322,7 +2322,7 @@ static void t_down(bdk_class* i_this) { case 1: case 2: if (i_this->mpMorf->isStop()) { - anm_init(i_this, BDK_BCK_DAMAGE_T1, 2.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE_T1_e, 2.0f, 2, 1.0f, -1, 0); } cLib_addCalc2(&actor->current.pos.x, center_pos.x, 0.2f, REG0_F(4) + 10.0f); cLib_addCalc2(&actor->current.pos.z, center_pos.z, 0.2f, REG0_F(4) + 10.0f); @@ -2331,7 +2331,7 @@ static void t_down(bdk_class* i_this) { cLib_addCalcAngleS2(&i_this->m259E, 1, 1, 2); #endif if (i_this->m2EC[1] == 1) { - anm_init(i_this, BDK_BCK_RAKKA_T1, DEMO_SELECT(REG13_F(6), REG0_F(6)) + 20.0f, 2, 1.0f, -1, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_RAKKA_T1_e, DEMO_SELECT(REG13_F(6), REG0_F(6)) + 20.0f, 2, 1.0f, -1, 0); #if VERSION > VERSION_DEMO i_this->m259E = 1; #else @@ -2460,7 +2460,7 @@ static void col_set(bdk_class* i_this) { i_this->m1168 = actor->current.pos; i_this->m1168.y += 380.0f; model = i_this->mpMorf->getModel(); - MTXCopy(model->getAnmMtx(JNT_J_DK_ATAMA1), *calc_mtx); + MTXCopy(model->getAnmMtx(DK_JNT_J_DK_ATAMA1_e), *calc_mtx); offset.x = REG8_F(0) + 40.0f; offset.y = REG8_F(1); @@ -2475,7 +2475,7 @@ static void col_set(bdk_class* i_this) { i_this->m1144 = i_this->m1150; MtxPosition(&offset, &i_this->m1150); if (i_this->m2584 == 1) { - MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_AGO), *calc_mtx); + MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_AGO_e), *calc_mtx); offset.x = REG8_F(3) + 120.0f; offset.y = REG8_F(4); offset.z = REG8_F(5); @@ -2509,10 +2509,10 @@ static void col_set(bdk_class* i_this) { for (s32 i = 0; i < 2; i++) { if (i == 0) { model = i_this->mpMorf->getModel(); - MTXCopy(model->getAnmMtx(JNT_J_DK_ASHI_L3), *calc_mtx); + MTXCopy(model->getAnmMtx(DK_JNT_J_DK_ASHI_L3_e), *calc_mtx); } else { model = i_this->mpMorf->getModel(); - MTXCopy(model->getAnmMtx(JNT_J_DK_ASHI_R3), *calc_mtx); + MTXCopy(model->getAnmMtx(DK_JNT_J_DK_ASHI_R3_e), *calc_mtx); } if (i_this->mAction == ACTION_T_LASTATTACK) { i_this->mFootCCSph[i].SetR(DEMO_SELECT(REG12_F(8), REG0_F(8)) + 300.0f); @@ -2990,7 +2990,7 @@ static void demo_camera(bdk_class* i_this) { cLib_addCalc2(&i_this->m25B4.z, i_this->m1150.z, 0.1f, 50.0f); if (i_this->mpMorf->isStop()) { - anm_init(i_this, BDK_BCK_FLY3, 1.0f, 2, 1.0f, BDK_BAS_FLY3, 0); + anm_init(i_this, dRes_INDEX_BDK_BCK_FLY3_e, 1.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_FLY3_e, 0); player->changeDemoMode(daPy_demo_c::DEMO_A_WAIT_e); player->changeDemoParam0(2); } @@ -3579,7 +3579,7 @@ static BOOL daBdk_Execute(bdk_class* i_this) { } actor->shape_angle.y = actor->current.angle.y; actor->shape_angle.z = actor->current.angle.z; - MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_ATAMA1), *calc_mtx); + MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_ATAMA1_e), *calc_mtx); offset.x = DEMO_SELECT(REG6_F(10), REG0_F(10)) + 120.0f; offset.y = 0.0f; @@ -3704,16 +3704,16 @@ static BOOL daBdk_Delete(bdk_class* i_this) { static BOOL useHeapInit(fopAc_ac_c* i_actor) { bdk_class* i_this = (bdk_class*)i_actor; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_DK), + (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_DK_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bdk", BDK_BCK_FLY1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BCK_FLY1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Bdk", BDK_BAS_FLY1), + dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BAS_FLY1_e), 0x80000, 0x11000022 ); @@ -3723,8 +3723,8 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } for (u16 i = 0; i < i_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) { - if (i == JNT_J_DK_KUBI1 || (JNT_J_DK_TOSAKA_A1 <= i && i <= JNT_J_DK_TOSAKA_B2) || i == JNT_J_DK_O_LA2 || i == JNT_J_DK_O_LB2 || i == JNT_J_DK_O_RA2 || - i == JNT_J_DK_O_RB2) + if (i == DK_JNT_J_DK_KUBI1_e || (DK_JNT_J_DK_TOSAKA_A1_e <= i && i <= DK_JNT_J_DK_TOSAKA_B2_e) || i == DK_JNT_J_DK_O_LA2_e || i == DK_JNT_J_DK_O_LB2_e || i == DK_JNT_J_DK_O_RA2_e || + i == DK_JNT_J_DK_O_RB2_e) { i_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } @@ -3737,13 +3737,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { return FALSE; } - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_DK_KAMEN4); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_DK_KAMEN4_e); i_this->mp8F0 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); if (!i_this->mp8F0) { return FALSE; } - static u16 kamen_break_bdl[] = {BDK_BDL_BUHINA, BDK_BDL_BUHINB, BDK_BDL_BUHINC, BDK_BDL_BUHIND}; + static u16 kamen_break_bdl[] = {dRes_INDEX_BDK_BDL_BUHINA_e, dRes_INDEX_BDK_BDL_BUHINB_e, dRes_INDEX_BDK_BDL_BUHINC_e, dRes_INDEX_BDK_BDL_BUHIND_e}; for (s32 i = 0; i < 0x4; i++) { i_this->m8FC[i] = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Bdk", kamen_break_bdl[i]), 0x80000, 0x11000022); @@ -3755,14 +3755,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { i_this->bva = new mDoExt_bvaAnm(); JUT_ASSERT(DEMO_SELECT(0x1831, 0x1864), i_this->bva); - s32 bva = i_this->bva->init(i_this->mp8F0, (J3DAnmVisibilityFull*)dComIfG_getObjectRes("Bdk", BDK_BVA_HIBIWARE1), 1, J3DFrameCtrl::EMode_NONE); + s32 bva = i_this->bva->init(i_this->mp8F0, (J3DAnmVisibilityFull*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BVA_HIBIWARE1_e), 1, J3DFrameCtrl::EMode_NONE); #if VERSION > VERSION_DEMO if (bva == 0) { return FALSE; } #endif - modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_DK_TAIL); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_DK_TAIL_e); JUT_ASSERT(DEMO_SELECT(0x183D, 0x1878), modelData != NULL); for (int i = 0; i < 4; i++) { @@ -3778,9 +3778,9 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { for (s32 i = 0; i < 0x28; i++) { if (i == 0x27) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_GROCK00); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_GROCK00_e); } else if (i < 0x27) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_GHANE00); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_GHANE00_e); } JUT_ASSERT(DEMO_SELECT(0x185B, 0x189C), modelData != NULL); i_this->m261C[i].m044 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -3789,7 +3789,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_S_TSHUTTER); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_S_TSHUTTER_e); JUT_ASSERT(DEMO_SELECT(0x1868, 0x18A9), modelData != NULL); for (s32 i = 0; i < 3; i++) { @@ -3802,12 +3802,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { if (i_this->mp63BC[i] == NULL) { return FALSE; } - if (i_this->mp63BC[i]->Set((cBgD_t*)(dComIfG_getObjectRes("Bdk", BDK_DZB_S_TSHUTTER)), dBgW::MOVE_BG_e, &i_this->m632C[i]) == TRUE) { + if (i_this->mp63BC[i]->Set((cBgD_t*)(dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_DZB_S_TSHUTTER_e)), dBgW::MOVE_BG_e, &i_this->m632C[i]) == TRUE) { return FALSE; } i_this->mp63BC[i]->SetCrrFunc(dBgS_MoveBGProc_Typical); } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_S_TTOGE); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_S_TTOGE_e); JUT_ASSERT(DEMO_SELECT(0x1883, 0x18C4), modelData != NULL); i_this->mp62D8 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -3818,7 +3818,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { i_this->pm_bgw = new dBgW(); JUT_ASSERT(DEMO_SELECT(0x188D, 0x18CE), i_this->pm_bgw != NULL); - i_this->pm_bgw->Set((cBgD_t*)(dComIfG_getObjectRes("Bdk", BDK_DZB_S_TTOGE)), dBgW::MOVE_BG_e, &i_this->m62DC); + i_this->pm_bgw->Set((cBgD_t*)(dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_DZB_S_TTOGE_e)), dBgW::MOVE_BG_e, &i_this->m62DC); i_this->pm_bgw->SetCrrFunc(dBgS_MoveBGProc_Typical); static Vec kosi1_offset[] = {{0.0f, 0.0f, 0.0f}}; @@ -3849,73 +3849,73 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { static __jnt_hit_data_c search_data[] = { { /* mShapeType */ JntHitType_SPH_e, - /* mJointIndex */ JNT_J_DK_KOSI, + /* mJointIndex */ DK_JNT_J_DK_KOSI_e, /* mRadius */ 132.0f, /* mpOffsets */ kosi1_offset, }, { /* mShapeType */ JntHitType_SPH_e, - /* mJointIndex */ JNT_J_DK_MUNE1, + /* mJointIndex */ DK_JNT_J_DK_MUNE1_e, /* mRadius */ 140.0f, /* mpOffsets */ mune1_offset, }, { /* mShapeType */ JntHitType_SPH_e, - /* mJointIndex */ JNT_J_DK_MUNE2, + /* mJointIndex */ DK_JNT_J_DK_MUNE2_e, /* mRadius */ 148.0f, /* mpOffsets */ mune2_offset, }, { /* mShapeType */ JntHitType_SPH_e, - /* mJointIndex */ JNT_J_DK_MUNE2, + /* mJointIndex */ DK_JNT_J_DK_MUNE2_e, /* mRadius */ 112.0f, /* mpOffsets */ mune3_offset, }, { /* mShapeType */ JntHitType_CYL_e, - /* mJointIndex */ JNT_J_DK_KUBI1, + /* mJointIndex */ DK_JNT_J_DK_KUBI1_e, /* mRadius */ 85.0f, /* mpOffsets */ kubi1_offset, }, { /* mShapeType */ JntHitType_SPH_DELETE_e, - /* mJointIndex */ JNT_J_DK_ATAMA1, + /* mJointIndex */ DK_JNT_J_DK_ATAMA1_e, /* mRadius */ 90.0f, /* mpOffsets */ atama_offset, }, { /* mShapeType */ JntHitType_SPH_e, - /* mJointIndex */ JNT_J_DK_TUBASA_L1, + /* mJointIndex */ DK_JNT_J_DK_TUBASA_L1_e, /* mRadius */ 100.0f, /* mpOffsets */ tubasaL1_0_offset, }, { /* mShapeType */ JntHitType_CYL_e, - /* mJointIndex */ JNT_J_DK_TUBASA_L1, + /* mJointIndex */ DK_JNT_J_DK_TUBASA_L1_e, /* mRadius */ 55.0f, /* mpOffsets */ tubasaL1_1_offset, }, { /* mShapeType */ JntHitType_CYL2_e, - /* mJointIndex */ JNT_J_DK_TUBASA_L1, + /* mJointIndex */ DK_JNT_J_DK_TUBASA_L1_e, /* mRadius */ 110.0f, /* mpOffsets */ tubasaL1_2_offset, }, { /* mShapeType */ JntHitType_SPH_e, - /* mJointIndex */ JNT_J_DK_TUBASA_R1, + /* mJointIndex */ DK_JNT_J_DK_TUBASA_R1_e, /* mRadius */ 100.0f, /* mpOffsets */ tubasaR1_0_offset, }, { /* mShapeType */ JntHitType_CYL_e, - /* mJointIndex */ JNT_J_DK_TUBASA_R1, + /* mJointIndex */ DK_JNT_J_DK_TUBASA_R1_e, /* mRadius */ 55.0f, /* mpOffsets */ tubasaR1_1_offset, }, { /* mShapeType */ JntHitType_CYL2_e, - /* mJointIndex */ JNT_J_DK_TUBASA_R1, + /* mJointIndex */ DK_JNT_J_DK_TUBASA_R1_e, /* mRadius */ 110.0f, /* mpOffsets */ tubasaR1_2_offset, }, diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index c7359cece..3092dccaa 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/src/d/actor/d_a_bdkobj.cpp @@ -12,7 +12,7 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include "d/res/res_bdkobj.h" +#include "res/Object/Bdkobj.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_mtx.h" @@ -454,14 +454,14 @@ static BOOL daBdkobj_Delete(bdkobj_class* i_this) { return TRUE; } static u16 bdl_data[] = { - BDKOBJ_BDL_S_TBLOCK, - BDKOBJ_BDL_S_TPOLE, - BDKOBJ_BDL_S_TOWER_BRIDGE, + dRes_INDEX_BDKOBJ_BDL_S_TBLOCK_e, + dRes_INDEX_BDKOBJ_BDL_S_TPOLE_e, + dRes_INDEX_BDKOBJ_BDL_S_TOWER_BRIDGE_e, }; static u16 hahen_bdl_data[] = { - BDKOBJ_BDL_SHAHENS, - BDKOBJ_BDL_SHAHENL, - BDKOBJ_BDL_GWOOD00, + dRes_INDEX_BDKOBJ_BDL_SHAHENS_e, + dRes_INDEX_BDKOBJ_BDL_SHAHENL_e, + dRes_INDEX_BDKOBJ_BDL_GWOOD00_e, }; /* 000022E8-000024C8 .text useHeapInit__FP10fopAc_ac_c */ @@ -480,7 +480,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { i_this->pm_bgw = new dBgW(); JUT_ASSERT(DEMO_SELECT(781, 801), i_this->pm_bgw != NULL); - cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Bdkobj", BDKOBJ_DZB_S_TOWER_BRIDGE); + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Bdkobj", dRes_INDEX_BDKOBJ_DZB_S_TOWER_BRIDGE_e); if (i_this->pm_bgw->Set(dzb, cBgW::MOVE_BG_e, &i_this->mMtx) == TRUE) { return FALSE; } diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index 607749057..178a06f5e 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_beam.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_hot_floor.h" -#include "d/res/res_ylesr00.h" +#include "res/Object/Ylesr00.h" #include "d/d_cc_d.h" #include "d/d_lib.h" #include "d/d_particle.h" @@ -126,19 +126,19 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) { /* 000003D0-00000688 .text CreateHeap__8daBeam_cFv */ BOOL daBeam_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BMD_YLESR00)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YLESR00_BMD_YLESR00_e)); JUT_ASSERT(304, modelData != NULL); M_mdl = mDoExt_J3DModel__create(modelData, 0, 0x11020203); JUT_ASSERT(306, M_mdl != NULL); - M_bck = static_cast(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BCK_YLESR00)); + M_bck = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YLESR00_BCK_YLESR00_e)); JUT_ASSERT(310, M_bck != NULL); - M_brk = static_cast(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BRK_YLESR00)); + M_brk = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YLESR00_BRK_YLESR00_e)); JUT_ASSERT(314, M_brk != NULL); - M_btk = static_cast(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BTK_YLESR00)); + M_btk = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YLESR00_BTK_YLESR00_e)); JUT_ASSERT(318, M_brk != NULL); BOOL tmp1 = mBckAnm.init(modelData, M_bck, false, J3DFrameCtrl::EMode_LOOP); diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index 044239441..b8f401f56 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bflower.h" -#include "d/res/res_vbakh.h" +#include "res/Object/VbakH.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_bomb2.h" @@ -116,7 +116,7 @@ BOOL daBFlower_c::CreateHeap() { mState = daBFlower_c::STATE_LIVE_E; } - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKH)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BDL_VBAKH_e)); JUT_ASSERT(0x1B2, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -124,7 +124,7 @@ BOOL daBFlower_c::CreateHeap() { return FALSE; } - J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAHX)); + J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BCK_VBAHX_e)); JUT_ASSERT(0x1C3, pbck != NULL); if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_RESET)) { @@ -132,7 +132,7 @@ BOOL daBFlower_c::CreateHeap() { } mBck1.setFrame(mBck1.getEndFrame()); - J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAHX)); + J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BRK_VBAHX_e)); JUT_ASSERT(0x1D9, pbrk != NULL); if (!mBrk1.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE)) { @@ -140,7 +140,7 @@ BOOL daBFlower_c::CreateHeap() { } mBrk1.setPlaySpeed(0.0f); - modelData = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKM)); + modelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BDL_VBAKM_e)); JUT_ASSERT(0x1E7, modelData != NULL); mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -148,7 +148,7 @@ BOOL daBFlower_c::CreateHeap() { return FALSE; } - pbck = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAMX)); + pbck = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BCK_VBAMX_e)); JUT_ASSERT(0x1F7, pbck != NULL); if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE)) { @@ -156,7 +156,7 @@ BOOL daBFlower_c::CreateHeap() { } mBck2.setPlaySpeed(0.0f); - pbrk = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAMX)); + pbrk = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BRK_VBAMX_e)); JUT_ASSERT(0x208, pbrk != NULL); if (!mBrk2.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE)) { @@ -225,7 +225,7 @@ int daBFlower_c::init_bck_anm(s16 param) { m55C = param; - J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKH)); + J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BDL_VBAKH_e)); J3DAnmTransform* pBck = static_cast(dComIfG_getObjectRes(m_arcname, param)); return mBck1.init(pModelData, pBck, TRUE, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, true); @@ -293,12 +293,12 @@ BOOL daBFlower_c::actLive() { f32 tmp = cLib_addCalc(&mBombScale.z, 1.0f, 0.05f, 0.1f, 0.05f); if (m5B8 != 0 && tmp == 0.0f) { - init_bck_anm(VBAKH_BCK_VBAKH); + init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e); } // Play animation if player walks by bomb flower if (dist < 50.0f && std::abs(mPrevPlayerDist - dist) > 2.0f && std::abs(player->current.pos.y - current.pos.y) < 10.0f) { - init_bck_anm(VBAKH_BCK_VBAKH); + init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e); } // Play animation if player dropped held actor near bomb flower? @@ -307,7 +307,7 @@ BOOL daBFlower_c::actLive() { if (pActor != NULL) { if ((pActor->current.pos - current.pos).absXZ() < 70.0f) { - init_bck_anm(VBAKH_BCK_VBAKH); + init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e); } } } @@ -372,7 +372,7 @@ BOOL daBFlower_c::actLive() { daPy_getPlayerLinkActorClass()->exchangeGrabActor(mpBombActor); } - init_bck_anm(VBAKH_BCK_VBAKH); + init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e); } if (m58C != 0 && tmp > 0.0f) { @@ -396,12 +396,12 @@ BOOL daBFlower_c::actDead() { // Play animation if player walks by bomb flower if (dist < 50.0f && std::abs(mPrevPlayerDist - dist) > 2.0f) { - init_bck_anm(VBAKH_BCK_VBAHX); + init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAHX_e); } if (mAnimTimer == 0) { mAnimTimer = cM_rndF(100.0f) + 100.0f; - init_bck_anm(VBAKH_BCK_VBAHX); + init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAHX_e); } mBrk1.setPlaySpeed(0.0f); @@ -414,7 +414,7 @@ BOOL daBFlower_c::actDead() { mState = daBFlower_c::STATE_LIVE_E; fopAcM_onSwitch(this, mSwitchNo); - init_bck_anm(VBAKH_BCK_VBAKH); + init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e); mBrk1.setPlaySpeed(1.0f); mBrk2.setPlaySpeed(1.0f); mBck2.setPlaySpeed(1.0f); diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index 000aee913..3c076729a 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -16,7 +16,7 @@ #include "d/d_meter.h" #include "d/d_s_play.h" #include "d/d_snap.h" -#include "d/res/res_bgn.h" +#include "res/Object/Bgn.h" #include "dolphin/gf/GFGeometry.h" #include "f_op/f_op_actor_mng.h" #include "d/d_cc_d.h" @@ -3426,10 +3426,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { bgn_class* i_this = (bgn_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_HEAD1), + (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_HEAD1_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_BGN_HEAD1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_BGN_HEAD1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -3444,12 +3444,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } i_this->mHeadParts[0].mpPartModel = i_this->mpMorf->getModel(); i_this->mHeadParts[0].m0D2 = 16; - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_MAIN1); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_MAIN1_e); i_this->mpChestModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->mpChestModel == NULL) { return FALSE; } - bodyModelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_BODY1); + bodyModelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_BODY1_e); if (!part_init(&i_this->mPelvisParts[0], bodyModelData)) { return FALSE; } @@ -3480,12 +3480,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } i_this->mTailParts[i].m0D2 = 11 - i; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_JYAKUTENA); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_JYAKUTENA_e); i_this->mpJyakutenAModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenAModel == NULL) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_JYAKUTENB); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_JYAKUTENB_e); i_this->mpJyakutenBModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenBModel == NULL) { return FALSE; @@ -3496,11 +3496,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } #endif - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENB)); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENB_e)); if (!i_this->mJyakutenBBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_JYAKUTENC); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_JYAKUTENC_e); i_this->mpJyakutenCModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenCModel == NULL) { return FALSE; @@ -3511,25 +3511,25 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } #endif - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENC)); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENC_e)); if (!i_this->mJyakutenCBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } - pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1); + pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e); if (!i_this->mRedRopeMat.init(1, 0x3C, pBti, 1)) { return FALSE; } - pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_HIMO); + pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_HIMO_e); if (!i_this->mBlueRopeMat.init(8, 0x3C, pBti, 1)) { return FALSE; } #if VERSION > VERSION_DEMO - pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1); + pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e); if (!i_this->mDefeatCSRopeMat.init(1, 0x3C, pBti, 1)) { return FALSE; } #endif - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_R0E_A); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_R0E_A_e); JUT_ASSERT(DEMO_SELECT(6628, 7026), modelData != NULL); i_this->mpWater0Model = mDoExt_J3DModel__create(modelData, 0x80000, 0x31000000); if (i_this->mpWater0Model == NULL) { @@ -3539,7 +3539,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpWater1Model == NULL) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_R00); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_R00_e); i_this->mpRoomReflectionModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); JUT_ASSERT(DEMO_SELECT(6654, 7052), modelData != NULL); if (i_this->mpRoomReflectionModel == NULL) { diff --git a/src/d/actor/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp index dbd90e478..6b612b498 100644 --- a/src/d/actor/d_a_bgn2.cpp +++ b/src/d/actor/d_a_bgn2.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" -#include "d/res/res_bgn.h" +#include "res/Object/Bgn.h" class daBgn2_HIO_c : public JORReflexible { public: @@ -287,13 +287,13 @@ static s32 pos_move(bgn2_class* i_this) { static void start(bgn2_class* i_this) { switch (i_this->m0314) { case 0: - anm_init(i_this, BGN_BCK_DERU1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_DERU1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0314 = 1; // fallthrough case 1: if (i_this->mpBodyMorf->isStop()) { i_this->m0312 = 1; - anm_init(i_this, BGN_BCK_RAKKA1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0314 = 1; } break; @@ -325,7 +325,7 @@ static void plesattack(bgn2_class* i_this) { break; } i_this->m2E82 = 0; - anm_init(i_this, BGN_BCK_RAKKA1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0314 = 1; if (actor->health == 3) { i_this->m0330[0] = l_HIO.m1E; @@ -337,7 +337,7 @@ static void plesattack(bgn2_class* i_this) { } case 1: if (i_this->mpBodyMorf->isStop()) { - anm_init(i_this, BGN_BCK_RAKKA2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0314 = 2; } // fallthrough @@ -349,7 +349,7 @@ static void plesattack(bgn2_class* i_this) { i_this->m2E79 = 1; if (checkGround(i_this)) { ki_set(i_this); - anm_init(i_this, BGN_BCK_SETTI1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_SETTI1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0314 = 3; dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f)); sVar6 = actor->health; @@ -401,7 +401,7 @@ static void jumpattack(bgn2_class* i_this) { pBrk = i_this->mpBodyMorf->getModel(); switch (i_this->m0314) { case 0: - anm_init(i_this, BGN_BCK_JUMP1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_JUMP1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0314 = 1; // fallthrough case 1: @@ -494,7 +494,7 @@ static void damage(bgn2_class* i_this) { i_this->mpHeadMorf->play(&actor->current.pos, 0, 0); switch (i_this->m0314) { case 0: - anm_init(i_this, BGN_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0314 = 1; // fallthrough case 1: @@ -530,7 +530,7 @@ static void hensin(bgn2_class* i_this) { switch (i_this->m0314) { #if VERSION == VERSION_DEMO case 0: - anm_init(i_this, BGN_BCK_WAIT2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_WAIT2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m0314 = 1; i_this->m0330[0] = 0x96; bgn->mCSMode = 10; @@ -538,7 +538,7 @@ static void hensin(bgn2_class* i_this) { case 1: #else case 0: - anm_init(i_this, BGN_BCK_SETTI1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_SETTI1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0314 = 1; bgn->mCSMode = 10; actor->speed.y = REG8_F(0xc) + 50.0f; @@ -547,7 +547,7 @@ static void hensin(bgn2_class* i_this) { case 1: if (i_this->m0330[0] == 0) { i_this->m0314 = 2; - anm_init(i_this, BGN_BCK_WAIT2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_WAIT2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m0330[0] = REG8_S(5) + 0x5a; actor->speed.y = 0.0f; } @@ -560,7 +560,7 @@ static void hensin(bgn2_class* i_this) { if (i_this->m0330[0] == 0) { i_this->m0314 = 5; i_this->m0330[0] = 0x46; - anm_init(i_this, BGN_BCK_MODORU1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BGN_BCK_MODORU1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_BGN_T_TO_M_1, 0); } break; @@ -1079,10 +1079,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { bgn2_class* i_this = (bgn2_class*)a_this; i_this->mpHeadMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_HEAD1), + (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_HEAD1_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_BGN_HEAD1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_BGN_HEAD1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1096,10 +1096,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } i_this->mpBodyMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_KUMO1), + (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_KUMO1_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_WAIT1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1112,12 +1112,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if ((i_this->mpBodyMorf == NULL) || (i_this->mpBodyMorf->getModel() == NULL)) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENA, BGN_BDL_BGN_JYAKUTENA2)); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENA_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENA2_e)); i_this->mpJyakutenModel[2] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenModel[2] == NULL) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENB, BGN_BDL_BGN_JYAKUTENB2)); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENB_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENB2_e)); i_this->mpJyakutenModel[1] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenModel[1] == NULL) { return FALSE; @@ -1128,11 +1128,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } #endif - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENB2)); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENB2_e)); if (!i_this->mJyakutenBBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENC, BGN_BDL_BGN_JYAKUTENC2)); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENC_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENC2_e)); i_this->mpJyakutenModel[0] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenModel[0] == NULL) { return FALSE; @@ -1143,11 +1143,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } #endif - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENC2)); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENC2_e)); if (!i_this->mJyakutenCBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } - pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1); + pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e); if (!i_this->mRedRopeMat.init(1, 0x3C, pBti, 1)) { return FALSE; } diff --git a/src/d/actor/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp index fc094b37d..bce657a89 100644 --- a/src/d/actor/d_a_bgn3.cpp +++ b/src/d/actor/d_a_bgn3.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" -#include "d/res/res_bgn.h" +#include "res/Object/Bgn.h" class daBgn3_HIO_c : public JORReflexible { public: @@ -1154,10 +1154,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { bgn3_class* i_this = (bgn3_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_HEAD1), + (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_HEAD1_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_BGN_HEAD1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_BGN_HEAD1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1170,7 +1170,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_DEKU1); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_DEKU1_e); i_this->m002CC = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->m002CC == NULL) { return FALSE; @@ -1187,12 +1187,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return false; } } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENA, BGN_BDL_BGN_JYAKUTENA3)); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENA_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENA3_e)); i_this->mpJyakutenAModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenAModel == NULL) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENB, BGN_BDL_BGN_JYAKUTENB3)); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENB_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENB3_e)); i_this->mpJyakutenBModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenBModel == NULL) { return FALSE; @@ -1203,11 +1203,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } #endif - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENB3)); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENB3_e)); if (!i_this->mJyakutenBBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENC, BGN_BDL_BGN_JYAKUTENC3)); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENC_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENC3_e)); i_this->mpJyakutenCModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203)); if (i_this->mpJyakutenCModel == NULL) { return FALSE; @@ -1218,11 +1218,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } #endif - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENC3)); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENC3_e)); if (!i_this->mJyakutenCBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } - pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1); + pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e); if (!i_this->mRedRopeMat.init(1, 0x3c, pBti, 1)) { return FALSE; } diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index c8b6d9eb6..380767b28 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bita.h" -#include "d/res/res_bita.h" +#include "res/Object/Bita.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "d/d_bg_s_movebg_actor.h" @@ -17,10 +17,10 @@ static btd_class* btd = NULL; -static u32 ita_bmd[] = { BITA_BDL_MBIT1, BITA_BDL_MBIT2 }; -static u32 ita_dzb[] = { BITA_DZB_MBIT1, BITA_DZB_MBIT2 }; -static u32 ita_Ef_bmd[] = { BITA_BDL_EF_BTDITA0, BITA_BDL_EF_BTDITA1 }; -static u32 ita_Ef[] = { BITA_BRK_EF_BTDITA0, BITA_BRK_EF_BTDITA1 }; +static u32 ita_bmd[] = { dRes_INDEX_BITA_BDL_MBIT1_e, dRes_INDEX_BITA_BDL_MBIT2_e }; +static u32 ita_dzb[] = { dRes_INDEX_BITA_DZB_MBIT1_e, dRes_INDEX_BITA_DZB_MBIT2_e }; +static u32 ita_Ef_bmd[] = { dRes_INDEX_BITA_BDL_EF_BTDITA0_e, dRes_INDEX_BITA_BDL_EF_BTDITA1_e }; +static u32 ita_Ef[] = { dRes_INDEX_BITA_BRK_EF_BTDITA0_e, dRes_INDEX_BITA_BRK_EF_BTDITA1_e }; /* 00000078-000000C4 .text b_a_sub__FPvPv */ static void* b_a_sub(void* search, void* user) { diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index e02efe782..5869297a7 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bk.h" #include "d/d_bg_s_gnd_chk.h" -#include "d/res/res_bk.h" +#include "res/Object/Bk.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" @@ -47,21 +47,21 @@ struct attack_info_s { }; static attack_info_s attack1_info[] = { - { BK_BCK_BK_ATTACK1, 1.2f, BK_BAS_BK_ATTACK1 }, - { BK_BCK_BK_ATTACK2, 1.0f, BK_BAS_BK_ATTACK2 }, - { BK_BCK_BK_ATTACK3, 1.0f, BK_BAS_BK_ATTACK3 }, + { dRes_INDEX_BK_BCK_BK_ATTACK1_e, 1.2f, dRes_INDEX_BK_BAS_BK_ATTACK1_e }, + { dRes_INDEX_BK_BCK_BK_ATTACK2_e, 1.0f, dRes_INDEX_BK_BAS_BK_ATTACK2_e }, + { dRes_INDEX_BK_BCK_BK_ATTACK3_e, 1.0f, dRes_INDEX_BK_BAS_BK_ATTACK3_e }, }; static attack_info_s jattack1_info[] = { - { BK_BCK_BK_JATTACK1, 1.0f, -1 }, - { BK_BCK_BK_JATTACK2, 1.0f, BK_BAS_BK_JATTACK2 }, - { BK_BCK_BK_JATTACK3, 1.0f, BK_BAS_BK_JATTACK3 }, + { dRes_INDEX_BK_BCK_BK_JATTACK1_e, 1.0f, -1 }, + { dRes_INDEX_BK_BCK_BK_JATTACK2_e, 1.0f, dRes_INDEX_BK_BAS_BK_JATTACK2_e }, + { dRes_INDEX_BK_BCK_BK_JATTACK3_e, 1.0f, dRes_INDEX_BK_BAS_BK_JATTACK3_e }, }; static attack_info_s kattack1_info[] = { - { BK_BCK_BK_KERI1, 1.0f, BK_BAS_BK_KERI1 }, - { BK_BCK_BK_KERI2, 1.0f, BK_BAS_BK_KERI2 }, - { -BK_BTP_TMABATAKI, 1.0f, 0 }, // TODO: why is bckFileIdx negative and soundFileIdx zero? bug? + { dRes_INDEX_BK_BCK_BK_KERI1_e, 1.0f, dRes_INDEX_BK_BAS_BK_KERI1_e }, + { dRes_INDEX_BK_BCK_BK_KERI2_e, 1.0f, dRes_INDEX_BK_BAS_BK_KERI2_e }, + { -dRes_INDEX_BK_BTP_TMABATAKI_e, 1.0f, 0 }, // TODO: why is bckFileIdx negative and soundFileIdx zero? bug? }; static attack_info_s* attack_info[] = { @@ -79,7 +79,7 @@ static s8 joint_check[] = { /* 000000EC-00000234 .text anm_init__FP8bk_classifUcfi */ static void anm_init(bk_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f32 speed, int soundFileIdx) { - if (i_this->dr.mAction == 19 && bckFileIdx != BK_BCK_BK_OTISOU1 && bckFileIdx != BK_BCK_BK_OTISOU2) { + if (i_this->dr.mAction == 19 && bckFileIdx != dRes_INDEX_BK_BCK_BK_OTISOU1_e && bckFileIdx != dRes_INDEX_BK_BCK_BK_OTISOU2_e) { return; } if (soundFileIdx >= 0) { @@ -936,11 +936,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::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO1_e); } else if (i_this->dr.mAction >= 4) { - anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO1_e); } else { - anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e); } i_this->m0300[1] = 40.0f + cM_rndF(60.0f); } @@ -948,11 +948,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::EMode_LOOP, 1.0f, BK_BAS_BK_WALK); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK_e); } else if (i_this->m11F3 == 0) { - anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_NIGERU_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_NIGERU_e); } else { - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK_e); } if (i_this->m0B30 == 0 && i_this->m121F != 0) { fopAcM_monsSeStart(i_this, JA_SE_CV_BK_LOST_BOKO, 0); @@ -962,7 +962,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::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, dRes_INDEX_BK_BAS_BK_RUN_e); } /* 00003C74-00004104 .text path_check__FP8bk_classUc */ @@ -1214,7 +1214,7 @@ static void stand(bk_class* i_this) { switch (i_this->dr.mMode) { case -20: fopAcM_OnStatus(i_this, fopAcStts_UNK4000_e); - anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WAIT_e); i_this->dr.mMode = -19; i_this->m0300[1] = 20; #if VERSION > VERSION_DEMO @@ -1244,14 +1244,14 @@ static void stand(bk_class* i_this) { i_this->dr.mMode = 1; if (i_this->m02DC != 0) { if (cM_rndF(1.0f) < 0.5f) { - anm_init(i_this, BK_BCK_BK_NOZOKU, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_NOZOKU_e, 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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_TATAKU_e, 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::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WAIT_e); } i_this->m121E++; // Fall-through @@ -1261,7 +1261,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::EMode_NONE, 1.0f, BK_BAS_BK_NOBI); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_NOBI_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_NOBI_e); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_NOBI, 0); if (i_this->m121E < 3) { i_this->dr.mMode = 2; @@ -1282,7 +1282,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::EMode_LOOP, 1.0f, BK_BAS_BK_SLEEP); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_SLEEP_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_SLEEP_e); i_this->m0300[1] = l_bkHIO.m108 + cM_rndF(l_bkHIO.m10A - l_bkHIO.m108); i_this->dr.mMode += 1; } @@ -1291,17 +1291,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::EMode_NONE, 1.0f, BK_BAS_BK_NOBI); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_NOBI_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_NOBI_e); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_NOBI, 0); i_this->dr.mMode = 2; } break; case 10: if (i_this->m0300[1] == 30) { - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 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::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e); i_this->dr.mMode = 11; i_this->m0300[3] = 30.0f + cM_rndF(30.0f); } @@ -1323,7 +1323,7 @@ static void stand(bk_class* i_this) { } break; case 50: - anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO1_e); i_this->dr.mMode += 1; i_this->m0300[1] = 50; // Fall-through @@ -1333,7 +1333,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::EMode_LOOP, 1.0f, BK_BAS_BK_RUN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_RUN_e); i_this->dr.mMode += 1; i_this->m0300[2] = 60; } @@ -1355,7 +1355,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0); i_this->dr.mMode = 53; } @@ -1366,7 +1366,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); i_this->dr.mMode += 1; break; case 54: @@ -1408,7 +1408,7 @@ static void stand(bk_class* i_this) { i_this->dr.mMode = 0; } else { i_this->dr.mMode = 20; - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0300[1] = 30; fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0); } @@ -1487,10 +1487,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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_MIGIROT_e, 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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_HIDARIROT_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->m122A = r28; i_this->m1228 = i_this->m1224; @@ -1504,10 +1504,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 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::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e); i_this->dr.mMode = 11; i_this->m0300[3] = 30.0f + cM_rndF(30.0f); } @@ -1530,14 +1530,14 @@ static void stand2(bk_class* i_this) { } break; case 50: - anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO1_e); i_this->dr.mMode += 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::EMode_LOOP, 1.0f, BK_BAS_BK_RUN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_RUN_e); i_this->dr.mMode += 1; path_check(i_this, 1); if (i_this->m1216 >= 4) { @@ -1599,7 +1599,7 @@ temp_568: i_this->dr.mMode = 0; } else { i_this->dr.mMode = 20; - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0300[1] = 30; fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0); } @@ -1623,7 +1623,7 @@ static void path_run(bk_class* i_this) { switch (i_this->dr.mMode) { case 0: - anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, dRes_INDEX_BK_BAS_BK_RUN_e); i_this->dr.mMode = 1; // Fall-through case 1: @@ -1666,7 +1666,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); i_this->m120C = 1; i_this->m1210 = 0; } @@ -1675,7 +1675,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); i_this->m1210 = 1; i_this->m034C = l_bkHIO.m00C + 2; i_this->m034E = 4; @@ -1685,14 +1685,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); 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::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, dRes_INDEX_BK_BAS_BK_RUN_e); i_this->m120C = 0; } break; @@ -1817,7 +1817,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::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, dRes_INDEX_BK_BAS_BK_RUN_e); i_this->m120C = 0; } if (i_this->mPlayerDistance < l_bkHIO.m02C) { @@ -1839,11 +1839,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); break; case 1: if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); i_this->m1210 = 2; i_this->m034C = l_bkHIO.m00C + 2; i_this->m034E = 4; @@ -1854,7 +1854,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); 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)); @@ -1885,9 +1885,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::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e); } else { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e); } if (stickPosX > 0.0f) { i_this->dr.mMode = 5; @@ -1896,16 +1896,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::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e); } else { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e); } i_this->dr.mMode = 4; } else { if (i_this->m0B30 != 0 || i_this->m11F3 != 0) { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e); } else { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e); } i_this->dr.mMode = 3; } @@ -1915,7 +1915,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0); i_this->dr.mMode = 33; break; @@ -1926,7 +1926,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); i_this->dr.mMode++; } break; @@ -1946,9 +1946,9 @@ static void fight_run(bk_class* i_this) { } i_this->dr.mMode = 3; if (i_this->m0B30 != 0 || i_this->m11F3 != 0) { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e); } else { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e); } break; case 5: @@ -2033,7 +2033,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.mAction = 5; attack_set(i_this, 1); - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); i_this->dr.mMode = -10; i_this->speedF = -60.0f + REG0_F(3); i_this->speed.y = 80.0f + REG0_F(4); @@ -2153,7 +2153,7 @@ static void fight(bk_class* i_this) { switch (i_this->dr.mMode) { case -10: if (i_this->dr.mAcch.ChkGroundHit()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); i_this->dr.mMode = -9; i_this->speedF = 0.0f; } @@ -2162,7 +2162,7 @@ static void fight(bk_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->dr.mMode = 1; i_this->m0300[2] = 8; - anm_init(i_this, BK_BCK_BK_JATTACK1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JATTACK1_e, 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; @@ -2366,7 +2366,7 @@ static void p_lost(bk_class* i_this) { // Fall-through case 0: i_this->dr.mMode = 1; - anm_init(i_this, BK_BCK_BK_KYORO2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e); i_this->speedF = 0.0f; i_this->m0300[1] = 30.0f + cM_rndF(30.0f); // Fall-through @@ -2410,7 +2410,7 @@ static void b_nige(bk_class* i_this) { switch (i_this->dr.mMode) { case 0: i_this->dr.mMode = 1; - anm_init(i_this, BK_BCK_BK_HAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_HAKKEN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_HAKKEN_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_HAKKEN_e); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0); i_this->m0300[1] = 20; // Fall-through @@ -2419,7 +2419,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.mMode = 2; - anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_NIGERU_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_NIGERU_e); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_LOST_BOKO, 0); } break; @@ -2430,7 +2430,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.mMode = 3; - anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WAIT_e); } break; case 3: @@ -2453,7 +2453,7 @@ static void defence(bk_class* i_this) { switch (i_this->dr.mMode) { case 0: i_this->dr.mMode = 1; - anm_init(i_this, BK_BCK_BK_BOUGYO1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_BOUGYO1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->speedF = 0.0f; // Fall-through case 1: @@ -2477,7 +2477,7 @@ static void defence(bk_class* i_this) { static void oshi(bk_class* i_this) { i_this->dr.mAction = 5; attack_set(i_this, 1); - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); i_this->dr.mMode = -10; i_this->speedF = -90.0f + REG6_F(10); i_this->speed.y = 85.0f + REG6_F(11); @@ -2497,11 +2497,11 @@ static void hukki(bk_class* i_this) { switch (i_this->dr.mMode) { case 10: - anm_init(i_this, BK_BCK_BK_OKIRUA, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_OKIRUA); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_OKIRUA_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_OKIRUA_e); i_this->m0300[2] = 15; goto temp_194; case 12: - anm_init(i_this, BK_BCK_BK_OKIRUU, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_OKIRUU); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_OKIRUU_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_OKIRUU_e); i_this->m0300[2] = 15 + REG0_S(5); temp_194: i_this->speedF = 0.0f; @@ -2668,7 +2668,7 @@ static void yogan_fail(bk_class* i_this) { switch (i_this->dr.mMode) { case 0: - anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_NIGERU_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_NIGERU_e); i_this->dr.mMode = 1; i_this->speed.y = 190.0f + REG0_F(19); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_SURPRISE, 0); @@ -2711,7 +2711,7 @@ static void water_fail(bk_class* i_this) { switch (i_this->dr.mMode) { case 0: - anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_NIGERU_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_NIGERU_e); i_this->dr.mMode = 1; fopAcM_monsSeStart(actor, JA_SE_CV_BK_SURPRISE, 0); i_this->dr.m458.y = 0.0f; @@ -2763,7 +2763,7 @@ static void wepon_search(bk_class* i_this) { case -1: i_this->dr.mMode = 0; i_this->m11F3 = 0; - anm_init(i_this, BK_BCK_BK_HAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_HAKKEN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_HAKKEN_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_HAKKEN_e); if (f31 < 900.0f) { i_this->m0300[1] = 20; } else { @@ -2779,7 +2779,7 @@ static void wepon_search(bk_class* i_this) { if (i_this->mpMorf->isStop() || i_this->m0300[1] == 0) { i_this->dr.mMode = 1; i_this->m030A = l_bkHIO.m08E; - anm_init(i_this, BK_BCK_BK_RUN, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, BK_BAS_BK_RUN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, dRes_INDEX_BK_BAS_BK_RUN_e); i_this->m02CE = 0; } } @@ -2791,7 +2791,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.mMode = 2; - anm_init(i_this, BK_BCK_BK_CATCH, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_CATCH); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_CATCH_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_CATCH_e); i_this->m0300[1] = 29; } else { if (i_this->m030A == 0) { @@ -2801,7 +2801,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); fopAcM_monsSeStart(actor, JA_SE_CV_BK_JUMP, 0); i_this->dr.mMode = 5; i_this->m02CE++; @@ -2871,7 +2871,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); i_this->dr.mMode++; } break; @@ -2879,7 +2879,7 @@ static void wepon_search(bk_class* i_this) { actor->speedF = 0.0f; if (i_this->mpMorf->isStop()) { i_this->dr.mMode = 1; - anm_init(i_this, BK_BCK_BK_RUN, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, BK_BAS_BK_RUN); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, dRes_INDEX_BK_BAS_BK_RUN_e); } break; } @@ -2896,10 +2896,10 @@ static void d_dozou(bk_class* i_this) { i_this->dr.mMode = 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::EMode_NONE, 0.0f, BK_BAS_BK_ATTACK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_ATTACK2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, dRes_INDEX_BK_BAS_BK_ATTACK2_e); i_this->mpMorf->setFrame(0.0f); } else { - anm_init(i_this, BK_BCK_BK_NOBI, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, BK_BAS_BK_NOBI); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_NOBI_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, dRes_INDEX_BK_BAS_BK_NOBI_e); i_this->mpMorf->setFrame(27.0f); } // Fall-through @@ -2942,11 +2942,11 @@ static void carry_drop(bk_class* i_this) { case 0: dComIfGs_onEventBit(dSv_event_flag_c::UNK_0004); i_this->dr.mMode = 1; - anm_init(i_this, BK_BCK_BK_KOUKA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KOUKA_e, 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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_TYAKU_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->dr.mMode = 2; i_this->m034C = l_bkHIO.m00C + 15; i_this->m034E = 3; @@ -2961,7 +2961,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KIME_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->dr.mMode = 3; fopAcM_monsSeStart(actor, JA_SE_CV_BK_SURPRISE, 0); } @@ -2982,7 +2982,7 @@ static void d_mahi(bk_class* i_this) { switch (i_this->dr.mMode) { case 0: i_this->dr.mMode = 1; - anm_init(i_this, BK_BCK_BK_SUWARI, 20.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_SUWARI); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_SUWARI_e, 20.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_SUWARI_e); i_this->m0300[0] = 100; // Fall-through case 1: @@ -3019,16 +3019,16 @@ static void tubo_wait(bk_class* i_this) { case 0: if (i_this->m0300[0] != 0) { i_this->m0300[0] = REG0_S(3) + 30; - anm_init(i_this, BK_BCK_BK_SUWARI, 0.0f, J3DFrameCtrl::EMode_NONE, 0.01f, BK_BAS_BK_SUWARI); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_SUWARI_e, 0.0f, J3DFrameCtrl::EMode_NONE, 0.01f, dRes_INDEX_BK_BAS_BK_SUWARI_e); i_this->dr.mMode = 20; } else { if (i_this->mType == 3) { - anm_init(i_this, BK_BCK_BK_JATTACK1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JATTACK1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->dr.mMode = 1; actor->speed.y = REG0_F(8) + 120.0f; actor->speedF = REG0_F(9) + 40.0f; } else { - anm_init(i_this, BK_BCK_BK_JUMP1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); i_this->dr.mMode = 10; actor->speed.y = REG8_F(8) + 120.0f; actor->speedF = REG8_F(9) + 40.0f; @@ -3044,7 +3044,7 @@ static void tubo_wait(bk_class* i_this) { case 1: if (i_this->dr.mAcch.ChkGroundHit()) { i_this->dr.mMode = 2; - anm_init(i_this, BK_BCK_BK_JATTACK2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JATTACK2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JATTACK2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JATTACK2_e); fopAcM_monsSeStart(actor, JA_SE_CV_BK_ATTACK_L, 0); } break; @@ -3052,12 +3052,12 @@ static void tubo_wait(bk_class* i_this) { r28 = true; if (i_this->mpMorf->isStop()) { i_this->dr.mMode = 11; - anm_init(i_this, BK_BCK_BK_JATTACK3, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JATTACK3); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JATTACK3_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JATTACK3_e); } break; case 10: if (i_this->m0300[0] == 0 && i_this->dr.mAcch.ChkGroundHit()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); i_this->dr.mMode = 11; i_this->m034C = l_bkHIO.m00C + 6; i_this->m034E = 3; @@ -3073,7 +3073,7 @@ static void tubo_wait(bk_class* i_this) { case 20: if (i_this->m0300[0] != 0) { if (i_this->m0300[0] == 1) { - anm_init(i_this, BK_BCK_BK_SUWARI, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_SUWARI); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_SUWARI_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_SUWARI_e); } } else if (i_this->mpMorf->isStop()) { i_this->dr.mAction = 0; @@ -3112,7 +3112,7 @@ static void z_demo_1(bk_class* i_this) { i_this->m0300[0] = 90; } i_this->dr.mMode = 1; - anm_init(i_this, BK_BCK_BK_TUTUKU1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_TUTUKU1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_TUTUKU1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_TUTUKU1_e); } break; case 1: @@ -3133,7 +3133,7 @@ static void z_demo_1(bk_class* i_this) { i_this->m0300[0] = 180; } i_this->dr.mMode = 2; - anm_init(i_this, BK_BCK_BK_TUTUKU2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_TUTUKU2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } break; case 2: @@ -3145,7 +3145,7 @@ static void z_demo_1(bk_class* i_this) { i_this->m0300[0] = 150; } i_this->dr.mMode = 0; - anm_init(i_this, BK_BCK_BK_TUTUKU3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_TUTUKU3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } break; } @@ -3163,7 +3163,7 @@ static void z_demo_1(bk_class* i_this) { i_this->mType = 0; i_this->dr.mAction = 1; i_this->dr.mMode = 20; - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0300[1] = 30; fopAcM_monsSeStart(actor, JA_SE_CV_BK_FOUND_LINK, 0); } @@ -3188,7 +3188,7 @@ static void b_hang(bk_class* i_this) { i_this->dr.m71E = 5; switch (i_this->dr.mMode) { case 0: - anm_init(i_this, BK_BCK_BK_OTISOU1, REG12_F(9) + 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_OTISOU1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_OTISOU1_e, REG12_F(9) + 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_OTISOU1_e); i_this->dr.mMode = 1; i_this->dr.m798 = 0.0f; i_this->m0300[0] = 100; @@ -3202,7 +3202,7 @@ static void b_hang(bk_class* i_this) { i_this->m0336 = 2; } if (i_this->m0300[0] == 0) { - anm_init(i_this, BK_BCK_BK_OTISOU2, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_OTISOU2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_OTISOU2_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_OTISOU2_e); i_this->dr.mMode = 2; } break; @@ -3264,14 +3264,14 @@ static void rope_on(bk_class* i_this) { switch (i_this->dr.mMode) { case 0: i_this->speedF = 0.0f; - anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e); i_this->dr.mMode = 1; i_this->m0300[0] = 40; // Fall-through case 1: if (i_this->m0300[0] == 0) { i_this->dr.mMode = 2; - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_BK_BAS_BK_WALK_e); } break; case 2: { @@ -3280,12 +3280,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0); i_this->dr.mMode = 3; } if (fopAcM_searchPlayerDistance(i_this) < 200.0f) { - anm_init(i_this, BK_BCK_BK_SUWARI, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_SUWARI); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_SUWARI_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_SUWARI_e); i_this->dr.mMode = 5; } break; @@ -3293,7 +3293,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::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e); i_this->dr.mMode = 4; } break; @@ -3301,14 +3301,14 @@ static void rope_on(bk_class* i_this) { i_this->speedF = 0.0f; if (i_this->mpMorf->isStop()) { i_this->dr.mMode = 2; - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_BK_BAS_BK_WALK_e); } break; case 5: i_this->speedF = 0.0f; if (fopAcM_searchPlayerDistance(i_this) > 250.0f) { i_this->dr.mMode = 2; - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_BK_BAS_BK_WALK_e); } break; } @@ -3708,7 +3708,7 @@ static void damage_check(bk_class* i_this) { i_this->dr.m424 |= 0x20; i_this->dr.m428 = 23.0f; cMtx_YrotS(*calc_mtx, i_this->m0332); - anm_init(i_this, BK_BCK_BK_AOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_AOMUKE); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_AOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_AOMUKE_e); i_this->dr.m48A = 10; i_this->dr.m474 = REG0_F(14) + 5000.0f; i_this->dr.m70E = 7; @@ -4018,7 +4018,7 @@ static void demo_camera(bk_class* i_this) { } if (i_this->m1236 == 5) { - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } if (i_this->m1236 >= 35) { @@ -4311,14 +4311,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::EMode_NONE, 1.0f, BK_BAS_BK_AOMUKE); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_AOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_AOMUKE_e); if (i_this->m0B30 != 0) { i_this->m0B34 = 1; } i_this->dr.mAction = 0; break; case 2: - anm_init(i_this, BK_BCK_BK_UTUBUSE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_UTUBUSE); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_UTUBUSE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_UTUBUSE_e); break; case 5: if (i_this->dr.mAction != 4 && i_this->dr.mAction != 11) { @@ -4349,7 +4349,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::EMode_NONE, 1.0f, BK_BAS_BK_AOMUKE); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_AOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_AOMUKE_e); if (i_this->m0B30 != 0) { i_this->m0B34 = 1; } @@ -4529,11 +4529,11 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { bk_class* i_this = (bk_class*)i_actor; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BK), + (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BDL_BK_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", BK_BCK_BK_SUWARI), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BCK_BK_SUWARI_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Bk", BK_BAS_BK_SUWARI), + dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BAS_BK_SUWARI_e), 0x00080000, 0x37221203 ); @@ -4555,9 +4555,9 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } if (i_this->m02DC != 0) { - i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_PINK); + i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_PINK_e); } else if (i_this->m02D4 != 0) { - i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_GREEN); + i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_GREEN_e); } i_this->m02C4 = new mDoExt_btpAnm(); @@ -4568,7 +4568,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { // TODO: Check what happens when this bug occurs. return cPhs_ERROR_e; } - J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", BK_BTP_TMABATAKI); + J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BTP_TMABATAKI_e); if (!i_this->m02C4->init(model->getModelData(), btp, TRUE, J3DFrameCtrl::EMode_NONE)) { // Bug: Same as above. // TODO check this case as well. @@ -4576,13 +4576,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } J3DModelData* modelData; - modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_KB); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMD_BK_KB_e); JUT_ASSERT(VERSION_SELECT(9459, 9398, 9418, 9418), modelData != NULL); if (i_this->m02D5 & 0x40) { - J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_KEN); + J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_BK_KEN_e); modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material); } else { - J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_BOKO); + J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_BK_BOKO_e); modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material); } i_this->m02E8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -4594,13 +4594,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { i_this->m02E8->setBaseScale(i_this->scale); if (i_this->m02D4 != 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_TATE); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMD_BK_TATE_e); i_this->m02D0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); JUT_ASSERT(VERSION_SELECT(9486, 9425, 9445, 9445), modelData != NULL); } if (i_this->m02DC != 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BOUEN); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BDL_BOUEN_e); i_this->m02D8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); JUT_ASSERT(VERSION_SELECT(9496, 9434, 9454, 9454), modelData != NULL); } @@ -4795,11 +4795,11 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) { } i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BK), + (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BDL_BK_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", BK_BCK_BK_SUWARI), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BCK_BK_SUWARI_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Bk", BK_BAS_BK_SUWARI), + dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BAS_BK_SUWARI_e), 0x00080000, 0x37221203 ); @@ -4818,28 +4818,28 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) { } if (i_this->m02DC != 0) { - i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_PINK); + i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_PINK_e); } else if (i_this->m02D4 != 0) { - i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_GREEN); + i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_GREEN_e); } i_this->m02C4 = new mDoExt_btpAnm(); if (i_this->m02C4 == NULL) { return cPhs_ERROR_e; } - J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", BK_BTP_TMABATAKI); + J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BTP_TMABATAKI_e); if (!i_this->m02C4->init(model->getModelData(), btp, TRUE, J3DFrameCtrl::EMode_NONE)) { return cPhs_ERROR_e; } J3DModelData* modelData; - modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_KB); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMD_BK_KB_e); JUT_ASSERT(VERSION_SELECT(9459, 9398, 9418, 9418), modelData != NULL); if (i_this->m02D5 & 0x40) { - J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_KEN); + J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_BK_KEN_e); modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material); } else { - J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_BOKO); + J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_BK_BOKO_e); modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material); } i_this->m02E8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -4850,13 +4850,13 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) { } if (i_this->m02D4 != 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_TATE); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMD_BK_TATE_e); i_this->m02D0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); JUT_ASSERT(VERSION_SELECT(9486, 9425, 9445, 9445), modelData != NULL); } if (i_this->m02DC != 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BOUEN); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BDL_BOUEN_e); i_this->m02D8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); JUT_ASSERT(VERSION_SELECT(9496, 9434, 9454, 9454), modelData != NULL); } @@ -5046,7 +5046,7 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) { i_this->dr.mAction = 29; i_this->dr.mMaxFallDistance = 300.0f; } else if (i_this->mType == 5) { - anm_init(i_this, BK_BCK_BK_HAKOBI, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BK_BCK_BK_HAKOBI_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->dr.mAction = 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_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 4debad561..62679751e 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -10,7 +10,7 @@ #include "d/d_camera.h" #include "d/d_kankyo_wether.h" #include "d/d_lib.h" -#include "d/res/res_bmd.h" +#include "res/Object/Bmd.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/d_snap.h" @@ -160,7 +160,7 @@ void damage(bmd_class* i_this) { i_this->m332 = 3; } if (actor->current.pos.y <= i_this->m328 + 5.0f) { - anm_init(i_this, BMD_BCK_HANA_OTIRU, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_OTIRU_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m304 = 1; i_this->m302 = 2; i_this->m93C = fopAcM_searchPlayerAngleY(actor); @@ -192,7 +192,7 @@ void damage(bmd_class* i_this) { i_this->mBD8 = 2000.0f; } if (i_this->mpBodyMorf->isStop()) { - anm_init(i_this, BMD_BCK_HIRAKU_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HIRAKU_WAIT_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m302 = 3; i_this->m308[0] = l_HIO.m14; i_this->m940 = 0; @@ -205,7 +205,7 @@ void damage(bmd_class* i_this) { i_this->mB71 = 2; if (i_this->m308[0] == 0) { i_this->m302 = 4; - anm_init(i_this, BMD_BCK_HANA_TOJIRU, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_TOJIRU_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m304 = 2; mDoAud_seStart(JA_SE_CM_BKM_FLW_WAVING, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } @@ -306,7 +306,7 @@ void damage(bmd_class* i_this) { if ((bVar1) && (fopAcM_searchPlayerDistance(actor) < (REG8_F(8) + 200.0f))) { i_this->mMode = 5; i_this->m302 = 0; - anm_init(i_this, BMD_BCK_HANA_TOJIRU, 1.0f, J3DFrameCtrl::EMode_NONE, 5.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_TOJIRU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 5.0f, -1); } #endif } @@ -333,7 +333,7 @@ void eat(bmd_class* i_this) { cLib_addCalcAngleS2(&i_this->m940, -0x4000, 1, 0x1000); if (i_this->mpBodyMorf->isStop()) { i_this->m302 = 2; - anm_init(i_this, BMD_BCK_HANA_EAT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_EAT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m308[0] = 0x32; if (dComIfGp_getStartStageName()[0] == 'X') { mDoAud_bgmStart(JA_BGM_PAST_BKM); @@ -348,7 +348,7 @@ void eat(bmd_class* i_this) { return; } i_this->m302 = 3; - anm_init(i_this, BMD_BCK_HANA_HAKIDASU, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_HAKIDASU_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(player_actor, JA_SE_CM_BKM_LINK_OUT, 0); return; case 3: @@ -427,8 +427,8 @@ void start(bmd_class* i_this) { i_this->m310 = 8; switch (i_this->m302) { case 0: - anm_init(i_this, BMD_BCK_HIRAKU_WAIT, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); - i_this->mpHeadMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_START1), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL); + anm_init(i_this, dRes_INDEX_BMD_BCK_HIRAKU_WAIT_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + i_this->mpHeadMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_START1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL); i_this->m302 = 1; i_this->m304 = 2; i_this->m2DC = 1; @@ -473,11 +473,11 @@ void start(bmd_class* i_this) { i_this->mBDC = 1.0f; } if (i_this->mB76 == 0x78) { - anm_init(i_this, BMD_BCK_HANA_START1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_START1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); mDoAud_seStart(JA_SE_CM_BKM_FLW_WAVING, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } if (i_this->mB76 == 0x96) { - anm_init(i_this, BMD_BCK_HANA_START2, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_START2_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mBD8 = 2000.0f; mDoAud_seStart(JA_SE_CM_BKM_FLW_TO_BUD, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } @@ -489,7 +489,7 @@ void start(bmd_class* i_this) { move1(i_this); } if (i_this->mB76 == 0xbe) { - anm_init(i_this, BMD_BCK_HANA_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } if (i_this->mB76 == 0xd2) { @@ -527,7 +527,7 @@ void end(bmd_class* i_this) { #if VERSION > VERSION_DEMO mDoAud_bgmStreamPrepare(JA_STRM_BOSS_CLEAR); #endif - anm_init(i_this, BMD_BCK_HANA_DEAD1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_DEAD1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m302 = 1; i_this->m332 = 8; i_this->m314 = 30000; @@ -540,11 +540,11 @@ void end(bmd_class* i_this) { player->changeDemoMode(daPy_demo_c::DEMO_UNK_029_e); } if (i_this->mB76 == REG0_S(4) + 0x17c) { - anm_init(i_this, BMD_BCK_HANA_DEAD2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_DEAD2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); fopAcM_seStartCurrent(actor, JA_SE_CM_BKM_END_FLW_WAVING, 0); } if (i_this->mB76 == REG0_S(5) + 0x1c2) { - anm_init(i_this, BMD_BCK_HANA_DEAD3, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_DEAD3_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStartCurrent(actor, JA_SE_CM_BKM_END_FLW_LIFTUP, 0); i_this->mBD8 = 2000.0f; i_this->m332 = 9; @@ -635,7 +635,7 @@ void core_move(bmd_class* i_this) { case 0: break; case 1: - i_this->mpHeadMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_DAMAGE), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL); + i_this->mpHeadMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_DAMAGE_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL); i_this->m306 = 2; i_this->m918 = 0; i_this->m91C = REG0_F(9) + 6000.0f; @@ -645,13 +645,13 @@ void core_move(bmd_class* i_this) { if (std::fabsf(i_this->m91C) < 200.0f) { i_this->m306 = 0; i_this->mpHeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_WAIT), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_WAIT_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL ); } break; case 100: i_this->mpHeadDeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_DEAD1), J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_DEAD1_e), J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m306 = 0x65; i_this->m924 = actor->current.pos; @@ -677,7 +677,7 @@ void core_move(bmd_class* i_this) { i_this->m306 = 0x66; mDoAud_bgmStreamPlay(); i_this->mpHeadDeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_DEAD2), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_DEAD2_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m930.y = 0.0f; i_this->m930.z = 0.0f; @@ -695,7 +695,7 @@ void core_move(bmd_class* i_this) { i_this->mA8C = 3; if (i_this->mpHeadDeadMorf->isStop()) { i_this->mpHeadDeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_NDEAD1), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_NDEAD1_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m306 = 0x67; i_this->m930.z = 10.0f; @@ -713,7 +713,7 @@ void core_move(bmd_class* i_this) { goto temp_884; } i_this->mpHeadDeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_NDEAD2), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_NDEAD2_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m306 = 0x68; goto temp_884; @@ -727,7 +727,7 @@ void core_move(bmd_class* i_this) { goto temp_884; } i_this->mpHeadDeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_LDEAD), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_LDEAD_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m306 = 0x69; i_this->m930.z = 0.0f; @@ -849,7 +849,7 @@ void mk_move(bmd_class* i_this) { case 1: if (i_this->m308[3] == 0) { i_this->mpMakarMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_01), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_01_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m308[3] = (s16)(cM_rndF(90.0f) + 60.0f); i_this->m2DC = 2; @@ -859,7 +859,7 @@ void mk_move(bmd_class* i_this) { case 2: if (i_this->m308[3] == 0) { i_this->mpMakarMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_02), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_02_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m308[3] = (s16)(cM_rndF(90.0f) + 60.0f); i_this->m2DC = 1; @@ -868,20 +868,20 @@ void mk_move(bmd_class* i_this) { break; case 3: i_this->mpMakarMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_01), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_01_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m2DC = 10; mk_voice_set(i_this, JA_SE_CV_CB_HELP); break; case 4: i_this->mpMakarMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_03), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_03_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m2DC = 10; mk_voice_set(i_this, JA_SE_CV_CB_HELP); break; case 5: - i_this->mpMakarMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_DROP), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL); + i_this->mpMakarMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_DROP_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL); i_this->m2DC = 6; break; case 6: @@ -942,7 +942,7 @@ void wait(bmd_class* i_this) { if (i_this->m308[0] == 0) { i_this->m302 = 0; i_this->m304 = 0; - anm_init(i_this, BMD_BCK_HANA_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); mDoAud_seStart(JA_SE_CM_BKM_VINE_OUT, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); i_this->m308[3] = 0x5a; } @@ -1039,14 +1039,14 @@ void attack_2(bmd_class* i_this) { i_this->m302 = 1; i_this->m332 = 2; i_this->m334 = 10; - anm_init(i_this, BMD_BCK_HANA_ATTACK, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_ATTACK_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); break; case 1: if (i_this->m334 == 0) { i_this->m332 = 0; i_this->mMode = 0; i_this->m302 = 0; - anm_init(i_this, BMD_BCK_HANA_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } break; } @@ -1274,7 +1274,7 @@ void demo_camera(bmd_class* i_this) { cLib_addCalc2(&i_this->mB88.y, actor->eyePos.y + 30.0f, 0.2f, REG0_F(4) + 5.0f); if (i_this->mB78 == 0x1e) { i_this->mpHeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_NEW_SDEMO1), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_NEW_SDEMO1_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL ); mDoAud_seStart(JA_SE_CM_BKM_CORE_ENTER, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); fopAcM_monsSeStart(actor, JA_SE_CV_BKM_ENTER, 0); @@ -1284,7 +1284,7 @@ void demo_camera(bmd_class* i_this) { i_this->mB78 = 0; i_this->mB74++; i_this->mpHeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_NEW_SDEMO2), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_NEW_SDEMO2_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL ); } } @@ -1317,7 +1317,7 @@ void demo_camera(bmd_class* i_this) { i_this->mB88.z = 104.0f; if (i_this->mB78 == 0x1e) { i_this->mpHeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_NEW_SDEMO3), J3DFrameCtrl::EMode_NONE, REG0_F(16) + 4.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_NEW_SDEMO3_e), J3DFrameCtrl::EMode_NONE, REG0_F(16) + 4.0f, 1.0f, 0.0f, -1.0f, NULL ); } if (i_this->mB78 > 0x1b) { @@ -1327,7 +1327,7 @@ void demo_camera(bmd_class* i_this) { i_this->m2DC = 0; mk_voice_set(i_this, 0x48c6); i_this->mpHeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_NEW_SDEMO4), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_NEW_SDEMO4_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->mB88 = actor->eyePos; i_this->mB88.y += REG0_F(15) + 60.0f; @@ -1364,7 +1364,7 @@ void demo_camera(bmd_class* i_this) { i_this->mB78 = REG0_S(6); i_this->m302 = 3; i_this->mpHeadMorf->setAnm( - (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_START3), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL + (J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_START3_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL ); i_this->m308[0] = 10; fopAcM_monsSeStart(actor, JA_SE_CV_BKM_LAUGH, 0); @@ -1710,10 +1710,10 @@ static BOOL daBmd_Delete(bmd_class* i_this) { /* 00005CF4-000064C0 .text useHeapInit__FP9bmd_class */ BOOL useHeapInit(bmd_class* i_this) { i_this->mpBodyMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_BKM), + (J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_BKM_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", BMD_BCK_HANA_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_HANA_WAIT_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1737,7 +1737,7 @@ BOOL useHeapInit(bmd_class* i_this) { if (i_this->mpBrkAnm == NULL) { return FALSE; } - J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", BMD_BRK_BKM); + J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BRK_BKM_e); if (!i_this->mpBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -1745,15 +1745,15 @@ BOOL useHeapInit(bmd_class* i_this) { if (i_this->mpBtkAnm == NULL) { return FALSE; } - J3DAnmTextureSRTKey* pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmd", BMD_BTK_BKM); + J3DAnmTextureSRTKey* pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BTK_BKM_e); if (!i_this->mpBtkAnm->init(model->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } i_this->mpHeadMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_BKM_COA), + (J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_BKM_COA_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_WAIT_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1772,10 +1772,10 @@ BOOL useHeapInit(bmd_class* i_this) { model->getModelData()->getJointNodePointer(uVar16)->setCallBack(core_nodeCallBack); } i_this->mpHeadDeadMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_BKM_COA_DEADMODEL), + (J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_BKM_COA_DEADMODEL_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_DEAD1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_DEAD1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1795,7 +1795,7 @@ BOOL useHeapInit(bmd_class* i_this) { return FALSE; } #endif - i_this->pm_bgw[5]->Set((cBgD_t*)dComIfG_getObjectRes("Bmd", BMD_DZB_COLL1), dBgW::MOVE_BG_e, &i_this->mA34); + i_this->pm_bgw[5]->Set((cBgD_t*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_DZB_COLL1_e), dBgW::MOVE_BG_e, &i_this->mA34); i_this->pm_bgw[5]->SetCrrFunc(dBgS_MoveBGProc_Typical); i_this->pm_bgw[5]->SetRideCallback(ride_call_back); #if VERSION < VERSION_USA @@ -1811,7 +1811,7 @@ BOOL useHeapInit(bmd_class* i_this) { return FALSE; } #endif - i_this->pm_bgw[i]->Set((cBgD_t*)dComIfG_getObjectRes("Bmd", BMD_DZB_COLL2), dBgW::MOVE_BG_e, &i_this->m944[i]); + i_this->pm_bgw[i]->Set((cBgD_t*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_DZB_COLL2_e), dBgW::MOVE_BG_e, &i_this->m944[i]); i_this->pm_bgw[i]->SetCrrFunc(dBgS_MoveBGProc_Typical); i_this->pm_bgw[i]->SetRideCallback(ride_call_back); #if VERSION < VERSION_USA @@ -1821,10 +1821,10 @@ BOOL useHeapInit(bmd_class* i_this) { #endif } i_this->mpMakarMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_CB), + (J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_CB_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_01), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_01_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1837,12 +1837,12 @@ BOOL useHeapInit(bmd_class* i_this) { if (i_this->mpMakarMorf->getModel() == NULL) { return FALSE; } - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_CB_FACE); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_CB_FACE_e); i_this->mpMakarFaceModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->mpMakarFaceModel == NULL) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BDL_R00_EF); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BDL_R00_EF_e); i_this->mpR00_EFModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->mpR00_EFModel == NULL) { return FALSE; @@ -1851,7 +1851,7 @@ BOOL useHeapInit(bmd_class* i_this) { if (i_this->mpR00_EFBrk == NULL) { return FALSE; } - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", BMD_BRK_R00_EF); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BRK_R00_EF_e); if (!i_this->mpR00_EFBrk->init(modelData, pBrk, true, J3DFrameCtrl::EMode_NONE, 0.0f)) { BOOL ret = FALSE; return ret; diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index 5e78d8100..e17a905bc 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bmdfoot.h" #include "d/actor/d_a_player.h" -#include "d/res/res_bmdfoot.h" +#include "res/Object/Bmdfoot.h" #include "d/actor/d_a_bmd.h" #include "d/d_s_play.h" #include "m_Do/m_Do_ext.h" @@ -137,7 +137,7 @@ void wait(bmdfoot_class* i_this) { break; case 0: i_this->m2BC++; - anm_init(i_this, BMDFOOT_BCK_ASI_WAIT, 50.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_WAIT_e, 50.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, -1); i_this->m2C0[0] = cM_rndF(150.0f) + 100.0f; i_this->m3EC = cM_rndFX(32768.0f); for (int i = 2; i <= ARRAY_SSIZE(i_this->m3A4); i++) { @@ -188,7 +188,7 @@ void attack_1(bmdfoot_class* i_this) { case 1: i_this->mBC4 = 0.0f; if (i_this->m2C0[0] == 0) { - anm_init(i_this, BMDFOOT_BCK_ASI_ATTACK1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_ATTACK1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m2BC++; i_this->mBD0 = 0x1e; } @@ -198,7 +198,7 @@ void attack_1(bmdfoot_class* i_this) { i_this->mBD0 = 0x1e; } if (i_this->mpBodyVineMorf->isStop()) { - anm_init(i_this, BMDFOOT_BCK_ASI_ATTACK_LOOP, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_ATTACK_LOOP_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m2C0[0] = 0x3c; i_this->m2BC++; } @@ -212,7 +212,7 @@ void attack_1(bmdfoot_class* i_this) { cLib_addCalc0(&i_this->m2CC[i].z, 0.1f, 0.05f); } if (i_this->m2C0[0] == 0) { - anm_init(i_this, BMDFOOT_BCK_ASI_ATTACK2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_ATTACK2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m2BC++; i_this->m2C0[0] = REG14_S(2) + 0x1c; mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_PREP, &i_this->mAE8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -342,7 +342,7 @@ void attack_2(bmdfoot_class* i_this) { case 1: i_this->mBC4 = 0.0f; if (i_this->m2C0[0] == 0) { - anm_init(i_this, BMDFOOT_BCK_ASI_UMARU, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_UMARU_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m2BC++; i_this->m2C0[0] = 5; i_this->mBD0 = 0x1e; @@ -358,7 +358,7 @@ void attack_2(bmdfoot_class* i_this) { mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_IN_G, &i_this->mAE8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } if (i_this->mpBodyVineMorf->isStop()) { - anm_init(i_this, BMDFOOT_BCK_ASI_UMARU_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_UMARU_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m2BC++; i_this->mBA8 = 1; } @@ -366,7 +366,7 @@ void attack_2(bmdfoot_class* i_this) { case 3: mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_DIG, &i_this->mBAC, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); if (ug_move(i_this)) { - pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_DATTACK1); + pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_DATTACK1_e); i_this->mpFloorVineMorf->setAnm(pBck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL); i_this->m2BC++; } @@ -381,7 +381,7 @@ void attack_2(bmdfoot_class* i_this) { } ug_move(i_this); if (i_this->mpFloorVineMorf->isStop()) { - pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_DATTACK2); + pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_DATTACK2_e); i_this->mpFloorVineMorf->setAnm(pBck, J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL); i_this->m2C0[0] = 0xb4; i_this->m2BC++; @@ -398,7 +398,7 @@ void attack_2(bmdfoot_class* i_this) { dComIfG_Ccsp()->Set(&i_this->mSph[i]); } if (i_this->m2C0[0] == 0) { - pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_DATTACK3); + pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_DATTACK3_e); i_this->mpFloorVineMorf->setAnm(pBck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL); i_this->m2BC++; } @@ -417,7 +417,7 @@ void attack_2(bmdfoot_class* i_this) { mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_IN_G2, &i_this->mBAC, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } if (i_this->mpFloorVineMorf->isStop()) { - anm_init(i_this, BMDFOOT_BCK_ASI_NUKU, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_NUKU_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m2BC++; i_this->mBA8 = 0; mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_OUT_G2, &i_this->mAE8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -457,7 +457,7 @@ void damage(bmdfoot_class* i_this) { switch (i_this->m2BC) { case 0: - anm_init(i_this, BMDFOOT_BCK_ASI_NOBIKIRU, 40.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_NOBIKIRU_e, 40.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m2BC++; i_this->m2C0[0] = 0x1e; i_this->m3EC = cM_rndFX(32768.0f); @@ -499,13 +499,13 @@ void start(bmdfoot_class* i_this) { case 1: if (i_this->m2C0[0] == 0) { i_this->mBC8 = 1; - anm_init(i_this, BMDFOOT_BCK_ASI_START1, 1.0f, J3DFrameCtrl::EMode_NONE, cM_rndF(0.2f) + 0.9f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_START1_e, 1.0f, J3DFrameCtrl::EMode_NONE, cM_rndF(0.2f) + 0.9f, -1); i_this->m2BC = 2; } break; case 2: if (i_this->mpBodyVineMorf->isStop()) { - anm_init(i_this, BMDFOOT_BCK_ASI_START2, 30.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_START2_e, 30.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, -1); i_this->m2BC = 3; } break; @@ -528,10 +528,10 @@ void end(bmdfoot_class* i_this) { i_this->m3A4[i] = 0; } if (boss->mB76 == 2) { - anm_init(i_this, BMDFOOT_BCK_ASI_DEAD_LOOP, 30.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_DEAD_LOOP_e, 30.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } if (boss->mB76 == REG8_S(8) + 0x17c) { - anm_init(i_this, BMDFOOT_BCK_ASI_DEAD, 30.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_DEAD_e, 30.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } } @@ -683,10 +683,10 @@ static BOOL daBmdfoot_Delete(bmdfoot_class* i_this) { /* 000026B0-000029B4 .text useHeapInit__FP13bmdfoot_class */ int useHeapInit(bmdfoot_class* i_this) { i_this->mpBodyVineMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BMD_ASI), + (J3DModelData*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BMD_ASI_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_WAIT_e), J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, 0, @@ -712,7 +712,7 @@ int useHeapInit(bmdfoot_class* i_this) { } i_this->btk = new mDoExt_btkAnm(); JUT_ASSERT(DEMO_SELECT(1416, 1426), i_this->btk); - J3DAnmTextureSRTKey* pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BTK_ASI); + J3DAnmTextureSRTKey* pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BTK_ASI_e); #if VERSION == VERSION_DEMO i_this->btk->init(model->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE); #else @@ -722,10 +722,10 @@ int useHeapInit(bmdfoot_class* i_this) { #endif i_this->mpFloorVineMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BMD_ASI), + (J3DModelData*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BMD_ASI_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_WAIT_e), J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, 0, diff --git a/src/d/actor/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp index 1f23ea214..1ddace141 100644 --- a/src/d/actor/d_a_bmdhand.cpp +++ b/src/d/actor/d_a_bmdhand.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bmdhand.h" #include "d/d_s_play.h" -#include "d/res/res_bmdhand.h" +#include "res/Object/Bmdhand.h" #include "d/actor/d_a_bmd.h" #include "d/d_cc_d.h" @@ -317,7 +317,7 @@ void start_control2(bmdhand_class* i_this) { void hand_close(bmdhand_class* i_this) { J3DAnmTransform* pAnimRes; - pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BCK_FOOK_TOJIRU); + pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BCK_FOOK_TOJIRU_e); i_this->mpMorf->setAnm(pAnimRes, 0, REG0_F(6) + 5.0f, 1.0f, 0.0f, -1.0f, NULL); } @@ -325,7 +325,7 @@ void hand_close(bmdhand_class* i_this) { void hand_open(bmdhand_class* i_this) { J3DAnmTransform* pAnimRes; - pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BCK_FOOK_HIRAKU); + pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BCK_FOOK_HIRAKU_e); i_this->mpMorf->setAnm(pAnimRes, 0, REG0_F(6) + 5.0f, 1.0f, 0.0f, -1.0f, NULL); } @@ -723,10 +723,10 @@ static BOOL daBmdhand_Delete(bmdhand_class* i_this) { /* 000030C4-00003210 .text useHeapInit__FP13bmdhand_class */ static BOOL useHeapInit(bmdhand_class* i_this) { i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BMD_BKM_FOOK), + (J3DModelData*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BMD_BKM_FOOK_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BCK_FOOK_HIRAKU), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BCK_FOOK_HIRAKU_e), J3DFrameCtrl::EMode_NONE, 1.0f, 0, @@ -744,7 +744,7 @@ static BOOL useHeapInit(bmdhand_class* i_this) { return FALSE; } #endif - ResTIMG* pBti = (ResTIMG*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BTI_SYOKUSYU_UE); + ResTIMG* pBti = (ResTIMG*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BTI_SYOKUSYU_UE_e); if (!i_this->mLineMat.init(1, 20, pBti, 1)) { return FALSE; } diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index 731d17ca1..303ddf672 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -6,12 +6,12 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_boko.h" #include "d/actor/d_a_player.h" -#include "d/res/res_boko.h" -#include "d/res/res_nata.h" -#include "d/res/res_club.h" -#include "d/res/res_tkwn.h" -#include "d/res/res_spear.h" -#include "d/res/res_pgsw.h" +#include "res/Object/Boko.h" +#include "res/Object/Nata.h" +#include "res/Object/Club.h" +#include "res/Object/Tkwn.h" +#include "res/Object/Spear.h" +#include "res/Object/Pgsw.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_s_play.h" @@ -845,7 +845,7 @@ static BOOL daBoko_createHeap(fopAc_ac_c* i_this) { /* 00002AE8-00002CFC .text createHeap__8daBoko_cFv */ BOOL daBoko_c::createHeap() { - static const int model_idx[] = {BOKO_BDL_BOKO, NATA_BDL_BK_NATA, CLUB_BDL_ST_BUKI, TKWN_BDL_TN_KEN1, SPEAR_BDL_MO_YARI, PGSW_BDL_BPG_KEN1}; + static const int model_idx[] = {dRes_INDEX_BOKO_BDL_BOKO_e, dRes_INDEX_NATA_BDL_BK_NATA_e, dRes_INDEX_CLUB_BDL_ST_BUKI_e, dRes_INDEX_TKWN_BDL_TN_KEN1_e, dRes_INDEX_SPEAR_BDL_MO_YARI_e, dRes_INDEX_PGSW_BDL_BPG_KEN1_e}; u32 type = fopAcM_GetParam(this); if (type >= Type_COUNT_e) { @@ -874,7 +874,7 @@ BOOL daBoko_c::createHeap() { } else if (type == 5 && !mBrkAnm.init( modelData, - static_cast(dComIfG_getObjectRes("Pgsw", PGSW_BRK_KIERU_KEN1)), + static_cast(dComIfG_getObjectRes("Pgsw", dRes_INDEX_PGSW_BRK_KIERU_KEN1_e)), true, J3DFrameCtrl::EMode_NONE )) { diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 73c921cdb..9a8ea6bc3 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -10,7 +10,7 @@ #include "d/d_a_obj.h" #include "d/d_kankyo_wether.h" #include "d/d_com_inf_game.h" -#include "d/res/res_vbakh.h" +#include "res/Object/VbakH.h" #include "f_op/f_op_camera.h" #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_mtx.h" @@ -263,15 +263,15 @@ namespace daBomb2 { bool Act_c::create_heap_nut() { const char* resName = attr().resName; - J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(attr().resName, VBAKH_BDL_VBAKM)); + J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(attr().resName, dRes_INDEX_VBAKH_BDL_VBAKM_e)); JUT_ASSERT(0x303, mdl_data != NULL); mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000022); - J3DAnmTransform* bck_data = static_cast(dComIfG_getObjectRes(resName, VBAKH_BCK_VBAKM)); + J3DAnmTransform* bck_data = static_cast(dComIfG_getObjectRes(resName, dRes_INDEX_VBAKH_BCK_VBAKM_e)); JUT_ASSERT(0x30D, bck_data != NULL); int temp = mBck0.init(mdl_data, bck_data, true, J3DFrameCtrl::EMode_NONE); - J3DAnmTevRegKey* brk_data = static_cast(dComIfG_getObjectRes(resName, VBAKH_BRK_VBAKM)); + J3DAnmTevRegKey* brk_data = static_cast(dComIfG_getObjectRes(resName, dRes_INDEX_VBAKH_BRK_VBAKM_e)); JUT_ASSERT(0x314, brk_data != NULL); int temp3 = mBrk0.init(mdl_data, brk_data, true, J3DFrameCtrl::EMode_NONE); diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index e1d364e9a..12cbc6161 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -14,7 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" -#include "d/res/res_vbakh.h" +#include "res/Object/VbakH.h" namespace { enum AttrSt_e { @@ -1316,30 +1316,30 @@ static BOOL daBomb_Delete(daBomb_c* i_this) { BOOL daBomb_c::createHeap() { BOOL ret; if(mType == 1) { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BDL_VBAKM)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BDL_VBAKM_e)); JUT_ASSERT(DEMO_SELECT(2416, 2469), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); - J3DAnmTransform* bck0_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAMX)); + J3DAnmTransform* bck0_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BCK_VBAMX_e)); JUT_ASSERT(DEMO_SELECT(2425, 2478), bck0_data != NULL); int temp = mBck0.init(modelData, bck0_data, true, J3DFrameCtrl::EMode_NONE); - J3DAnmTransform* bck1_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAKM)); + J3DAnmTransform* bck1_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BCK_VBAKM_e)); JUT_ASSERT(DEMO_SELECT(2431, 2484), bck1_data != NULL); int temp2 = mBck1.init(modelData, bck1_data, true, J3DFrameCtrl::EMode_NONE); - J3DAnmTevRegKey* brk0_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAMX)); + J3DAnmTevRegKey* brk0_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BRK_VBAMX_e)); JUT_ASSERT(DEMO_SELECT(2438, 2491), brk0_data != NULL); int temp3 = mBrk0.init(modelData, brk0_data, true, J3DFrameCtrl::EMode_NONE); - J3DAnmTevRegKey* brk1_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAKM)); + J3DAnmTevRegKey* brk1_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BRK_VBAKM_e)); JUT_ASSERT(DEMO_SELECT(2444, 2497), brk1_data != NULL); int temp4 = mBrk1.init(modelData, brk1_data, true, J3DFrameCtrl::EMode_NONE); return mpModel && temp && temp2 && temp3 && temp4; } else { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, LINK_BDL_BOMB)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_LINK_BDL_BOMB_e)); JUT_ASSERT(DEMO_SELECT(2457, 2510), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); @@ -1347,7 +1347,7 @@ BOOL daBomb_c::createHeap() { return false; } else { - J3DAnmTransform* bck0_data = (J3DAnmTransform*)dComIfG_getObjectRes(m_attrType[mType].resName, LINK_BCK_BOMB); + J3DAnmTransform* bck0_data = (J3DAnmTransform*)dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_LINK_BCK_BOMB_e); int temp = mBck0.init(modelData, bck0_data, false, J3DFrameCtrl::EMode_LOOP); return temp ? TRUE : FALSE; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index a456c19fe..1392fcfcc 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -9,7 +9,7 @@ #include "d/d_cc_d.h" #include "d/d_material.h" #include "d/actor/d_a_player_main.h" -#include "d/res/res_link.h" +#include "res/Object/Link.h" #include "dolphin/gf/GF.h" #include "f_op/f_op_camera.h" #include "f_op/f_op_camera_mng.h" @@ -743,7 +743,7 @@ static BOOL daBoomerang_Delete(daBoomerang_c*) { /* 800E2C00-800E2CC8 .text createHeap__13daBoomerang_cFv */ BOOL daBoomerang_c::createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Link", LINK_BDL_BOOMERANG); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_BOOMERANG_e); JUT_ASSERT(VERSION_SELECT(1543, 1539, 1546, 1546), modelData != NULL); @@ -812,7 +812,7 @@ cPhs_State daBoomerang_c::create() { } { - ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes("Link", LINK_BTI_BLUR); + ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTI_BLUR_e); JUT_ASSERT(VERSION_SELECT(1626, 1622, 1629, 1629), tmp_img != NULL); @@ -820,7 +820,7 @@ cPhs_State daBoomerang_c::create() { } { - ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes("Link", LINK_BTI_ROCK_MARK); + ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTI_ROCK_MARK_e); JUT_ASSERT(VERSION_SELECT(1634, 1630, 1637, 1637), tmp_img != NULL); diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 5da151c06..02924a071 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_pw.h" #include "d/d_lib.h" #include "d/d_snap.h" -#include "d/res/res_bpw.h" +#include "res/Object/Bpw.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "f_op/f_op_camera.h" @@ -463,15 +463,15 @@ BOOL body_atari_check(bpw_class* i_this) { player->getCutType() == daPy_py_c::CUT_TYPE_CUT_KESA) { i_this->mHitType = 2; - anm_init(i_this, BPW_BCK_BOYON_L1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_L1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } else { - anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } break; case AT_TYPE_HOOKSHOT: fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x44); i_this->mHitType = 0xc; - anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; case AT_TYPE_WIND: bVar2 = true; @@ -487,7 +487,7 @@ BOOL body_atari_check(bpw_class* i_this) { case AT_TYPE_STALFOS_MACE: case AT_TYPE_BOKO_STICK: fopAcM_seStart(actor, JA_SE_LK_W_WEP_HIT, 0x44); - anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; case AT_TYPE_SKULL_HAMMER: fopAcM_seStart(actor, JA_SE_LK_HAMMER_HIT, 0x44); @@ -495,21 +495,21 @@ BOOL body_atari_check(bpw_class* i_this) { if (player->getCutType() == daPy_py_c::CUT_TYPE_HAMMER_SIDESWING) { i_this->mHitType = 9; } - anm_init(i_this, BPW_BCK_BOYON_L1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_L1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; case AT_TYPE_BOMB: i_this->mHitType = 7; - anm_init(i_this, BPW_BCK_BOYON_L1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_L1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; case AT_TYPE_ICE_ARROW: i_this->mHitType = 6; fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x44); - anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; case AT_TYPE_LIGHT_ARROW: i_this->mHitType = 11; fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x44); - anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; case AT_TYPE_FIRE_ARROW: case AT_TYPE_FIRE: @@ -519,7 +519,7 @@ BOOL body_atari_check(bpw_class* i_this) { default: i_this->mHitType = 0; fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x44); - anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; } if (!bVar2) { @@ -762,20 +762,20 @@ void noroi_brk_check(bpw_class* i_this, u8 param_2) { case 0: if (i_this->m3E2 != 2) { i_this->m3E2 = 2; - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_S1); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_NOROI_S1_e); i_this->mpCurseStartBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); } break; case 1: if (i_this->m3E2 == 2) { i_this->m3E2 = 1; - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_E1); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_NOROI_E1_e); i_this->mpCurseEndBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); } break; case 2: i_this->m3E2 = 0; - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_DEFAULT_e); i_this->mpDefaultBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); break; } @@ -819,7 +819,7 @@ void next_status_clear(bpw_class* i_this, u8 param_2) { if (i_this->m3E1 != 0) { J3DModel* model = i_this->mpMorf->getModel(); i_this->m3E1 = 0; - J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT); + J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_DEFAULT_e); i_this->mpDefaultBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); } if (i_this->mAttWaitTimer == 0) { @@ -1069,7 +1069,7 @@ void action_dousa(bpw_class* i_this) { i_this->mSomeCountdownTimers[i + 10] = 0; } if (i_this->m3F8 != 0x2a) { - anm_init(i_this, BPW_BCK_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mSomeCountdownTimers[0] = 10; i_this->mSomeCountdownTimers[0] += (int)cM_rndF(i_this->mSomeCountdownTimers[0]); @@ -1100,7 +1100,7 @@ void action_dousa(bpw_class* i_this) { i_this->m488 = 5.0f; } if (i_this->m3F8 != 0x1d) { - anm_init(i_this, BPW_BCK_MOVEF1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_MOVEF1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mActionState++; case 3: @@ -1134,7 +1134,7 @@ void action_dousa(bpw_class* i_this) { } break; case 4: - anm_init(i_this, BPW_BCK_MOVEB1, REG12_F(0) + 15.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_MOVEB1_e, REG12_F(0) + 15.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mSomeCountdownTimers[0] = (s16)(int)(REG12_F(1) + 40.0f); noroi_brk_check(i_this, 0); fopAcM_monsSeStart(actor, JA_SE_CV_BPW_CURSE, 0); @@ -1146,7 +1146,7 @@ void action_dousa(bpw_class* i_this) { actor->speedF = REG8_F(12) + 75.0f; i_this->m488 = REG8_F(13) + 2.0f; i_this->m490 = 0.0f; - anm_init(i_this, BPW_BCK_MOVES1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_MOVES1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mActionState++; // fallthrough @@ -1189,7 +1189,7 @@ void action_dousa(bpw_class* i_this) { i_this->mSomeCountdownTimers[i + 10] = 0; } if (i_this->m3F8 != 0x2a) { - anm_init(i_this, BPW_BCK_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mActionState++; case 0xb: @@ -1206,7 +1206,7 @@ void action_dousa(bpw_class* i_this) { if (i_this->m47E >= 0x95) { i_this->m47E = 0x96; i_this->m480 = 0x96; - anm_init(i_this, BPW_BCK_HIROU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_HIROU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); kantera_pos_search(i_this); i_this->mActionState++; } @@ -1273,7 +1273,7 @@ void action_kougeki(bpw_class* i_this) { i_this->mSomeCountdownTimers[i + 10] = 0; } if (i_this->m3F8 != 0x2b) { - anm_init(i_this, BPW_BCK_WARAU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_WARAU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->m47A = 0x500; i_this->m4A0 = 0.0f; @@ -1310,7 +1310,7 @@ void action_kougeki(bpw_class* i_this) { case 0x28: if (i_this->mSomeCountdownTimers[2] != 0) break; - anm_init(i_this, BPW_BCK_SUIKOMU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_SUIKOMU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mSomeCountdownTimers[0] = 30; i_this->mSomeCountdownTimers[0] += (int)cM_rndF(i_this->mSomeCountdownTimers[0]); #if VERSION == VERSION_DEMO @@ -1362,7 +1362,7 @@ void action_kougeki(bpw_class* i_this) { #else i_this->m540.remove(); #endif - anm_init(i_this, BPW_BCK_IKI1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_IKI1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mActionState++; } break; @@ -1395,7 +1395,7 @@ void action_kougeki(bpw_class* i_this) { ); } #endif - anm_init(i_this, BPW_BCK_IKI_WAIT1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_IKI_WAIT1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mActionState++; } break; @@ -1433,7 +1433,7 @@ void action_kougeki(bpw_class* i_this) { break; } case 0x32: - anm_init(i_this, BPW_BCK_SUIKOMU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_SUIKOMU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mSomeCountdownTimers[0] = 0x4b; i_this->mSomeCountdownTimers[1] = (s16)(int)(REG8_F(2) + 20.0f); i_this->mKankyouHendouState = 2; @@ -1458,7 +1458,7 @@ void action_kougeki(bpw_class* i_this) { player->setOutPower(10.0f, fopAcM_searchPlayerAngleY(actor) + 0x8000, 1); } } else { - anm_init(i_this, BPW_BCK_HONOO1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_HONOO1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mActionState++; } break; @@ -1478,7 +1478,7 @@ void action_kougeki(bpw_class* i_this) { i_this->m47A = 0x300; i_this->mSomeCountdownTimers[5] = 0; GOUEN_FIRE_HIT = 0; - anm_init(i_this, BPW_BCK_HONOO_WAIT1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_HONOO_WAIT1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mActionState++; } } @@ -1526,7 +1526,7 @@ void action_kougeki(bpw_class* i_this) { i_this->mSomeCountdownTimers[5] = 0; i_this->mAttWaitTimer = 2; if (i_this->m3F8 != 5) { - anm_init(i_this, BPW_BCK_ATTACK_KAN1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_ATTACK_KAN1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); fopAcM_monsSeStart(actor, JA_SE_CV_BPW_ATTACK, 0); } i_this->mActionState++; @@ -1586,7 +1586,7 @@ void action_karada_taore(bpw_class* i_this) { i_this->mSomeCountdownTimers[i + 10] = 0; } if (i_this->m3F8 != 0x28) { - anm_init(i_this, BPW_BCK_TAME1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_TAME1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); } fopAcM_monsSeStart(actor, JA_SE_CV_BPW_CURSE, 0); noroi_brk_check(i_this, 0); @@ -1618,7 +1618,7 @@ void action_karada_taore(bpw_class* i_this) { break; case 0x48: if ((i_this->mpMorf->isStop()) && (i_this->m3F8 != 0x19)) { - anm_init(i_this, BPW_BCK_JUMP1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_JUMP1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mAttWaitTimer = 0; i_this->mActionState++; } @@ -1637,7 +1637,7 @@ void action_karada_taore(bpw_class* i_this) { i_this->m4A4 = 100.0f; search_get_skull(i_this, 2); actor->gravity = -3.0f; - anm_init(i_this, BPW_BCK_PRESS1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_PRESS1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m3E8 = 2; i_this->mSomeCountdownTimers[6] = (s16)(int)(REG21_F(0) + 20.0f); i_this->mFire1DousaPos = actor->current.pos; @@ -1693,7 +1693,7 @@ void action_karada_taore(bpw_class* i_this) { actor->speed.setall(0.0f); actor->speedF = 0.0f; noroi_brk_check(i_this, 0); - anm_init(i_this, BPW_BCK_SONOBA_PRESS1, REG12_F(2) + 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_SONOBA_PRESS1_e, REG12_F(2) + 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_monsSeStart(actor, JA_SE_CV_BPW_CURSE, 0); actor->speedF = DEMO_SELECT(REG11_F(12) + 14.75f, 14.75f); i_this->mAttWaitTimer = 0; @@ -1735,7 +1735,7 @@ void action_karada_taore(bpw_class* i_this) { break; case 0x4f: if (i_this->mSomeCountdownTimers[0] == 0) { - anm_init(i_this, BPW_BCK_SONOBA_PRESS2, REG12_F(2) + 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_SONOBA_PRESS2_e, REG12_F(2) + 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mActionState = 0x4c; } // fallthrough @@ -1777,7 +1777,7 @@ void action_damage(bpw_class* i_this) { i_this->m480 = 200; actor->speedF = 0.0f; i_this->m490 = 0.0f; - anm_init(i_this, BPW_BCK_HIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_HIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mSomeCountdownTimers[9] = 0; i_this->m476 = fopAcM_searchPlayerAngleY(actor); actor->current.angle.y = i_this->m476; @@ -1798,7 +1798,7 @@ void action_damage(bpw_class* i_this) { if (i_this->m3E1 == 0) { i_this->m3E1 = 1; i_this->m3E2 = 0; - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIT); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_HIT_e); i_this->mpLightStunBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0); } } @@ -1811,9 +1811,9 @@ void action_damage(bpw_class* i_this) { if (((i_this->mAttWaitTimer == 1) || (i_this->mAttWaitTimer == 2)) || (i_this->mAttWaitTimer == 0)) { i_this->mAttWaitTimer = 3; } - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIRARU1); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_HIRARU1_e); i_this->mpLightFreezeBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); - anm_init(i_this, BPW_BCK_DOSUN1, 0.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_DOSUN1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); i_this->m4A0 = 50.0f; i_this->mBodyAtSph.ClrAtSet(); i_this->mBodyAtSph.ClrAtSet(); @@ -1826,11 +1826,11 @@ void action_damage(bpw_class* i_this) { i_this->mActionState = 0x14; } if (i_this->m3F8 != 0x2a) { - anm_init(i_this, BPW_BCK_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } if (i_this->m3E1 != 0) { i_this->m3E1 = 0; - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_DEFAULT_e); i_this->mpDefaultBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); } } @@ -1856,7 +1856,7 @@ void action_damage(bpw_class* i_this) { #if VERSION > VERSION_DEMO i_this->mSomeCountdownTimers[1] = 0; #endif - anm_init(i_this, BPW_BCK_DOSUN1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_DOSUN1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); actor->gravity = 0.0f; } } @@ -1864,14 +1864,14 @@ void action_damage(bpw_class* i_this) { case 0x53: if (i_this->m3F8 != 0xc) { if (i_this->mpMorf->isStop()) { - anm_init(i_this, BPW_BCK_DOSUN_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_DOSUN_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mSomeCountdownTimers[1] = DEMO_SELECT(240, 450); cLib_onBit(actor->attention_info.flags, fopAc_Attn_ACTION_CARRY_e); i_this->m684 = actor->shape_angle.y; } } if (fopAcM_checkCarryNow(actor)) { - anm_init(i_this, BPW_BCK_JITA1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_JITA1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mBodyCoSph.ClrCoSet(); i_this->m3AC.y = 300.0f; actor->current.angle.y = player->shape_angle.y; @@ -1919,7 +1919,7 @@ void action_damage(bpw_class* i_this) { i_this->m49C = 300.0f; i_this->mBodyCoSph.OnCoSetBit(); fopAcM_monsSeStart(actor, JA_SE_CV_BPW_THROWN, 0); - anm_init(i_this, BPW_BCK_TAMA1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_TAMA1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mActionState = ACTION_STATE_DAMAGE_THROWN; } else if (i_this->mSomeCountdownTimers[1] == 1) { fopAcM_cancelCarryNow(actor); @@ -1965,7 +1965,7 @@ void action_damage(bpw_class* i_this) { actor->speedF = REG12_F(6) + 20.0f; i_this->m490 = REG12_F(6) + 20.0f; i_this->m47A = 0; - anm_init(i_this, BPW_BCK_DOSUN1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_DOSUN1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mActionState++; break; case 0x5b: @@ -1990,7 +1990,7 @@ void action_damage(bpw_class* i_this) { i_this->m47A = 0; actor->gravity = -3.0f; actor->speed.y = 70.0f; - anm_init(i_this, BPW_BCK_DAMAGE1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_DAMAGE1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mActionState++; break; case ACTION_STATE_DAMAGE_HIT: @@ -2108,7 +2108,7 @@ void action_bunri_dousa(bpw_class* i_this) { } i_this->m47C = 0; #endif - anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0), 0.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0), 0.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mBodyAtSph.OffAtSPrmBit(cCcD_TgSPrm_Set_e); i_this->mBodyAtSph.ClrAtSet(); i_this->mBodyCoSph.OffTgSetBit(); @@ -2180,7 +2180,7 @@ void action_bunri_dousa(bpw_class* i_this) { } player->changeOriginalDemo(); player->changeDemoMode(daPy_demo_c::DEMO_N_WAIT_e); - anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0), 0.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0), 0.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); camera->mCamera.Stop(); camera->mCamera.SetTrimSize(2); i_this->m440 = 50.0f; @@ -2230,7 +2230,7 @@ void action_bunri_dousa(bpw_class* i_this) { } if (i_this->m3F8 == 9) { if (i_this->mpMorf->isStop()) { - anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } fopAcM_seStart(actor, JA_SE_OBJ_BPW_MASK_LAUGH, 0); } @@ -2239,11 +2239,11 @@ void action_bunri_dousa(bpw_class* i_this) { sp70.z = 1625.0f; player->setPlayerPosAndAngle(&sp70, fopAcM_searchActorAngleY(player, actor)); if (i_this->m464 != 0) { - anm_init(i_this, BPW_BCK_CORE_NIGE1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE_NIGE1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m464 = 0; } if ((i_this->mSomeCountdownTimers[1] == 1) || (i_this->m462 >= actor->health)) { - anm_init(i_this, BPW_BCK_CORE_NIGE1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE_NIGE1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mSomeCountdownTimers[0] = 30; i_this->mActionState++; } @@ -2259,7 +2259,7 @@ void action_bunri_dousa(bpw_class* i_this) { break; } REG20_S(0) = 0; - anm_init(i_this, BPW_BCK_HUKKATU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_HUKKATU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_BPW_MASK_TO_BPW, 0); i_this->mActionState++; #if VERSION > VERSION_DEMO @@ -2299,7 +2299,7 @@ void action_bunri_dousa(bpw_class* i_this) { break; } REG20_S(0) = 0; - anm_init(i_this, BPW_BCK_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mSomeCountdownTimers[0] = DEMO_SELECT(REG11_F(10) + 20.0f, 0x14); i_this->mActionState++; } @@ -2351,7 +2351,7 @@ void action_bunri_dousa(bpw_class* i_this) { i_this->m3E6 = 0; i_this->m3E5 = 0; actor->scale.setall(0.0f); - anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); if (i_this->m3FC != fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* i_actor = fopAcM_SearchByID(i_this->m3FC); fopAcM_createDisappear(i_actor, &i_actor->current.pos, 5, daDisItem_NONE3_e, 0xFF); @@ -2521,7 +2521,7 @@ void action_bunri_dousa(bpw_class* i_this) { } } if (i_this->mSomeCountdownTimers[4] == 1) { - anm_init(i_this, BPW_BCK_KYORO_GARN1, 8.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_KYORO_GARN1_e, 8.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } if (i_this->mSomeCountdownTimers[1] != 0) { break; @@ -2571,7 +2571,7 @@ void action_bunri_dousa(bpw_class* i_this) { break; } REG20_S(0) = 0; - anm_init(i_this, BPW_BCK_CORE_NIGE1, 8.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE_NIGE1_e, 8.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mSomeCountdownTimers[0] = 4; i_this->mActionState++; #if VERSION > VERSION_DEMO @@ -2666,7 +2666,7 @@ void action_bunri_dousa(bpw_class* i_this) { fopAcM_seStart(actor, JA_SE_OBJ_BPW_LIGHT_ON, 0); i_this->mKankyouHendouState = 3; i_this->mSomeCountdownTimers[5] = 0; - anm_init(i_this, BPW_BCK_GATAGATA1, REG12_F(10) + 8.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_GATAGATA1_e, REG12_F(10) + 8.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } if (actor->current.pos.y > 2000.0f) { actor->speedF = 0.0f; @@ -2977,7 +2977,7 @@ void action_start_demo(bpw_class* i_this) { camera->mCamera.SetTrimSize(2); i_this->m440 = REG6_F(0) + 55.0f; i_this->mSomeCountdownTimers[0] = (s16)(int)(REG9_F(0) + 40.0f); - anm_init(i_this, BPW_BCK_CORE1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mActionState++; } // Fall-through @@ -3135,7 +3135,7 @@ void action_start_demo(bpw_class* i_this) { case 0xd0: if (i_this->m3F8 == 9) { if (i_this->mpMorf->isStop()) { - anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } cLib_addCalc2(&i_this->m3AC.y, REG18_F(12) + 100.0f, 1.0f, REG18_F(13) + 10.0f); fopAcM_seStart(actor, JA_SE_OBJ_BPW_MASK_LAUGH, 0); @@ -3143,7 +3143,7 @@ void action_start_demo(bpw_class* i_this) { cLib_addCalc2(&i_this->m3AC.y, 140.0f, 1.0f, REG18_F(13) + 10.0f); } if (i_this->m464 != 0) { - anm_init(i_this, BPW_BCK_CORE_NIGE1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_CORE_NIGE1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m464 = 0; } if (i_this->m462 < 0xf) @@ -3199,10 +3199,10 @@ void action_start_demo(bpw_class* i_this) { if (i_this->mSomeCountdownTimers[0] != 0) { break; } - anm_init(i_this, BPW_BCK_OPENING1, REG18_F(7) + 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_OPENING1_e, REG18_F(7) + 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); bpw_class* lantern = (bpw_class*)fopAcM_SearchByID(i_this->m3FC); if (lantern != NULL) { - anm_init(lantern, BPW_BCK_OPENING_KAN1, REG18_F(7) + 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(lantern, dRes_INDEX_BPW_BCK_OPENING_KAN1_e, REG18_F(7) + 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } i_this->mFire1DousaPos = i_this->m3B8; i_this->mFire1DousaRot = actor->shape_angle; @@ -3269,10 +3269,10 @@ void action_start_demo(bpw_class* i_this) { i_this->m554.remove(); #endif i_this->mSomeCountdownTimers[0] = (s16)(int)(REG6_F(5) + 40.0f); - anm_init(i_this, BPW_BCK_OPENING2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_OPENING2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); bpw_class* lantern = (bpw_class*)fopAcM_SearchByID(i_this->m3FC); if (lantern != NULL) { - anm_init(lantern, BPW_BCK_OPENING_KAN2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(lantern, dRes_INDEX_BPW_BCK_OPENING_KAN2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mActionState++; // Fall-through @@ -3295,7 +3295,7 @@ void action_start_demo(bpw_class* i_this) { dComIfGp_getVibration().StopQuake(0x20); bpw_class* lantern = (bpw_class*)fopAcM_SearchByID(i_this->m3FC); if (lantern != NULL) { - anm_init(lantern, BPW_BCK_KAN_DEFAULT1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(lantern, dRes_INDEX_BPW_BCK_KAN_DEFAULT1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } i_this->mSomeCountdownTimers[1] = 0; i_this->m3F6 = 4; @@ -3985,7 +3985,7 @@ void torituki_execute(bpw_class* i_this) { cLib_addCalc2(&actor->scale.x, 0.4f, 1.0f, 0.1f); actor->scale.y = actor->scale.z = actor->scale.x; if (!(actor->scale.x < 0.3f)) { - anm_init(i_this, BPW_BCK_TORITUKI1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_TORITUKI1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mSomeCountdownTimers[8] = DEMO_SELECT(0xD2, 0x96); actor->scale.setall(0.4f); i_this->mActionState++; @@ -4237,10 +4237,10 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { bpw_class* i_this = (bpw_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("BPW", BPW_BDL_BPW), + (J3DModelData*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BDL_BPW_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("BPW", BPW_BCK_WAIT1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BCK_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -4262,7 +4262,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpLightFreezeBrkAnm == NULL) { return FALSE; } - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIRARU1); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_HIRARU1_e); if (!i_this->mpLightFreezeBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -4270,7 +4270,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpLightStunBrkAnm == NULL) { return FALSE; } - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIT); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_HIT_e); if (!i_this->mpLightStunBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } @@ -4278,7 +4278,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpCurseStartBrkAnm == NULL) { return FALSE; } - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_S1); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_NOROI_S1_e); if (!i_this->mpCurseStartBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -4286,7 +4286,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpCurseEndBrkAnm == NULL) { return FALSE; } - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_E1); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_NOROI_E1_e); if (!i_this->mpCurseEndBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -4294,7 +4294,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpDefaultBrkAnm == NULL) { return FALSE; } - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_DEFAULT_e); if (!i_this->mpDefaultBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } @@ -4395,7 +4395,7 @@ static BOOL kantera_useHeapInit(fopAc_ac_c* a_this) { bpw_class* i_this = (bpw_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("BPW", BPW_BDL_BPW_KAN1), NULL, NULL, NULL, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422 + (J3DModelData*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BDL_BPW_KAN1_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422 ); if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) { return FALSE; @@ -4409,7 +4409,7 @@ static BOOL kantera_useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpLanternGlowBrkAnm == NULL) { return FALSE; } - J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_BPW_KAN1); + J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_BPW_KAN1_e); if (!i_this->mpLanternGlowBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } @@ -4468,7 +4468,7 @@ static BOOL fire_useHeapInit(fopAc_ac_c* a_this) { bpw_class* i_this = (bpw_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("BPW", BPW_BDL_BPW_KAN1), NULL, NULL, NULL, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422 + (J3DModelData*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BDL_BPW_KAN1_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422 ); if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) { return FALSE; @@ -4522,10 +4522,10 @@ static BOOL tori_useHeapInit(fopAc_ac_c* a_this) { bpw_class* i_this = (bpw_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("BPW", BPW_BDL_BPW), + (J3DModelData*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BDL_BPW_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("BPW", BPW_BCK_TORITUKI1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BCK_TORITUKI1_e), J3DFrameCtrl::EMode_RESET, 1.0f, 0, @@ -4657,7 +4657,7 @@ static cPhs_State daBPW_Create(fopAc_ac_c* a_this) { fopAcM_OnStatus(a_this, fopAcStts_UNK4000_e); if ((dComIfGp_getStartStageName()[0] != 'X') && (REG0_S(9) != 0 || (!dComIfGs_isStageBossDemo()))) { i_this->m3E7 = 1; - anm_init(i_this, BPW_BCK_OPENING_KAN1, REG18_F(4), J3DFrameCtrl::EMode_NONE, 0.0f, -1); + anm_init(i_this, dRes_INDEX_BPW_BCK_OPENING_KAN1_e, REG18_F(4), J3DFrameCtrl::EMode_NONE, 0.0f, -1); } i_this->m498 = 0.0f; i_this->m49C = 200.0f; diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 77a1cba40..80fd17ae3 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_branch.h" -#include "d/res/res_kwood_00.h" +#include "res/Object/Kwood_00.h" #include "JSystem/JUtility/JUTAssert.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -13,9 +13,9 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" static u16 anim_table[] = { - KWOOD_00_BCK_SWING02, KWOOD_00_BAS_SWING02, - KWOOD_00_BCK_SWING, KWOOD_00_BAS_SWING, - KWOOD_00_BCK_BREAK, KWOOD_00_BAS_BREAK, + dRes_ID_KWOOD_00_BCK_SWING02_e, dRes_ID_KWOOD_00_BAS_SWING02_e, + dRes_ID_KWOOD_00_BCK_SWING_e, dRes_ID_KWOOD_00_BAS_SWING_e, + dRes_ID_KWOOD_00_BCK_BREAK_e, dRes_ID_KWOOD_00_BAS_BREAK_e, }; char daBranch_c::m_arcname[] = "Kwood_00"; @@ -39,12 +39,12 @@ void daBranch_c::set_mtx() { } /* 00000128-000001E4 .text set_anim__10daBranch_cFiii */ -void daBranch_c::set_anim(int i_animIdx, int i_bckIdx, int i_basIdx) { - if (i_bckIdx > 0 && i_basIdx > 0) { +void daBranch_c::set_anim(int i_animIdx, int i_bckId, int i_basId) { + if (i_bckId > 0 && i_basId > 0) { mAnims[i_animIdx]->setAnm( - static_cast(dComIfG_getObjectIDRes(m_arcname, i_bckIdx)), + static_cast(dComIfG_getObjectIDRes(m_arcname, i_bckId)), -1, 0.0f, 1.0f, 0.0f, -1.0f, - dComIfG_getObjectIDRes(m_arcname, i_basIdx) + dComIfG_getObjectIDRes(m_arcname, i_basId) ); } } @@ -55,7 +55,8 @@ void daBranch_c::demoPlay(mDoExt_McaMorf* morf) { this, dDemo_actor_c::ENABLE_ANM_e, morf, m_arcname, - ARRAY_SIZE(anim_table) / 2, anim_table + ARRAY_SIZE(anim_table) / 2, + anim_table ); } @@ -67,9 +68,9 @@ BOOL daBranch_c::solidHeapCB(fopAc_ac_c* i_this) { /* 00000248-0000049C .text CreateHeap__10daBranch_cFv */ BOOL daBranch_c::CreateHeap() { - int bmd[] = { KWOOD_00_BMD_WS, KWOOD_00_BMD_WB }; - int bck[] = { KWOOD_00_BCK_SWING02, KWOOD_00_BCK_BREAK }; - int bas[] = { KWOOD_00_BAS_SWING02, KWOOD_00_BAS_BREAK }; + int bmd[] = { dRes_ID_KWOOD_00_BMD_WS_e, dRes_ID_KWOOD_00_BMD_WB_e }; + int bck[] = { dRes_ID_KWOOD_00_BCK_SWING02_e, dRes_ID_KWOOD_00_BCK_BREAK_e }; + int bas[] = { dRes_ID_KWOOD_00_BAS_SWING02_e, dRes_ID_KWOOD_00_BAS_BREAK_e }; BOOL status = TRUE; diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index edd2ba756..b19143f8e 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/src/d/actor/d_a_bridge.cpp @@ -9,7 +9,7 @@ #include "d/d_cc_d.h" #include "d/d_path.h" #include "d/d_com_inf_game.h" -#include "d/res/res_bridge.h" +#include "res/Object/Bridge.h" #include "d/d_bg_w_sv.h" #include "d/d_s_play.h" #include "d/d_cc_uty.h" @@ -1314,7 +1314,7 @@ void CreateInit(fopAc_ac_c* a_this) { /* 00003E00-00004310 .text CallbackCreateHeap__FP10fopAc_ac_c */ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { - static const s32 bridge_bmd[] = { BRIDGE_BDL_OBM_BRIDGE, BRIDGE_BDL_OBM_BRIDGE2 }; + static const s32 bridge_bmd[] = { dRes_INDEX_BRIDGE_BDL_OBM_BRIDGE_e, dRes_INDEX_BRIDGE_BDL_OBM_BRIDGE2_e }; bridge_class* i_this = (bridge_class*)a_this; @@ -1328,7 +1328,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { J3DModelData* modelData2; if (modelNum == 1) { - modelData2 = (J3DModelData*)dComIfG_getObjectRes("Bridge", BRIDGE_BDL_OBM_CHAIN1); + modelData2 = (J3DModelData*)dComIfG_getObjectRes("Bridge", dRes_INDEX_BRIDGE_BDL_OBM_CHAIN1_e); JUT_ASSERT(DEMO_SELECT(2340, 2342), modelData2 != NULL); } @@ -1360,9 +1360,9 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { BOOL res; if (i_this->mTypeBits & 8) { - res = pBr->mLineMat1.init(4, 5, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXM_ROPE1), 1); + res = pBr->mLineMat1.init(4, 5, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXM_ROPE1_e), 1); } else { - res = pBr->mLineMat1.init(4, 5, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 1); + res = pBr->mLineMat1.init(4, 5, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1); } if (!res) { @@ -1374,9 +1374,9 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { if (i == 0) { BOOL res; if (i_this->mTypeBits & 8) { - res = i_this->mLineMat.init(2, 14, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXM_ROPE1), 0); + res = i_this->mLineMat.init(2, 14, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXM_ROPE1_e), 0); } else { - res = i_this->mLineMat.init(2, 14, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 0); + res = i_this->mLineMat.init(2, 14, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 0); } if (!res) { @@ -1411,7 +1411,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { } if ((i_this->mTypeBits & 1) == 1) { - cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Bridge", BRIDGE_DZB_MBRDG2); + cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Bridge", dRes_INDEX_BRIDGE_DZB_MBRDG2_e); #if VERSION == VERSION_DEMO i_this->mpBgW->Set(cBgD, 0); #else @@ -1420,7 +1420,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { } #endif } else { - cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Bridge", BRIDGE_DZB_MBRDG); + cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Bridge", dRes_INDEX_BRIDGE_DZB_MBRDG_e); #if VERSION == VERSION_DEMO i_this->mpBgW->Set(cBgD, 0); #else diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index 741e82efa..5d510c486 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -12,7 +12,7 @@ #include "d/d_cc_uty.h" #include "d/d_meter.h" #include "d/d_snap.h" -#include "d/res/res_bst.h" +#include "res/Object/Bst.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera.h" @@ -47,12 +47,12 @@ static fpc_ProcID msg; static s8 msg_end; static u8 hio_set; static daBst_HIO_c l_HIO; -static u16 set_bdl_d[3] = {BST_BDL_BST, BST_BDL_LHAND, BST_BDL_RHAND}; -static u16 set_za_bdl[3] = {BST_BDL_MUNE, BST_BDL_UDEL, BST_BDL_UDER}; -static u16 set_bck_d[3] = {BST_BCK_BST_SLEEP, BST_BCK_LH_SLEEP, BST_BCK_RH_SLEEP}; -static u16 fly_bck_d[] = {BST_BCK_BST_FLY, BST_BCK_LH_FLY, BST_BCK_RH_FLY}; -static u16 damage_bck_d[] = {BST_BCK_BST_FLY, BST_BCK_LH_DAMAGE, BST_BCK_RH_DAMAGE}; -static u16 down_bck_d[] = {BST_BCK_BST_FLY, BST_BCK_LH_DOWN, BST_BCK_RH_DOWN}; +static u16 set_bdl_d[3] = {dRes_INDEX_BST_BDL_BST_e, dRes_INDEX_BST_BDL_LHAND_e, dRes_INDEX_BST_BDL_RHAND_e}; +static u16 set_za_bdl[3] = {dRes_INDEX_BST_BDL_MUNE_e, dRes_INDEX_BST_BDL_UDEL_e, dRes_INDEX_BST_BDL_UDER_e}; +static u16 set_bck_d[3] = {dRes_INDEX_BST_BCK_BST_SLEEP_e, dRes_INDEX_BST_BCK_LH_SLEEP_e, dRes_INDEX_BST_BCK_RH_SLEEP_e}; +static u16 fly_bck_d[] = {dRes_INDEX_BST_BCK_BST_FLY_e, dRes_INDEX_BST_BCK_LH_FLY_e, dRes_INDEX_BST_BCK_RH_FLY_e}; +static u16 damage_bck_d[] = {dRes_INDEX_BST_BCK_BST_FLY_e, dRes_INDEX_BST_BCK_LH_DAMAGE_e, dRes_INDEX_BST_BCK_RH_DAMAGE_e}; +static u16 down_bck_d[] = {dRes_INDEX_BST_BCK_BST_FLY_e, dRes_INDEX_BST_BCK_LH_DOWN_e, dRes_INDEX_BST_BCK_RH_DOWN_e}; /* 00000110-00000174 .text message_set__FP9bst_classUl */ static BOOL message_set(bst_class* i_this, unsigned long msg_no) { @@ -243,8 +243,8 @@ static void pos_move(bst_class* i_this, u8 param_2) { actor->current.pos += actor->speed; } -static u16 start_bck_d[] = {BST_BCK_BST_START, BST_BCK_LH_START, BST_BCK_RH_START}; -static u16 start2_bck_d[] = {0, BST_BCK_LH_START2, BST_BCK_RH_START2}; +static u16 start_bck_d[] = {dRes_INDEX_BST_BCK_BST_START_e, dRes_INDEX_BST_BCK_LH_START_e, dRes_INDEX_BST_BCK_RH_START_e}; +static u16 start2_bck_d[] = {0, dRes_INDEX_BST_BCK_LH_START2_e, dRes_INDEX_BST_BCK_RH_START2_e}; static u16 start_smoke_name[] = {dPa_name::ID_AK_ST_BSTSTARTSMOKEHEAD00, dPa_name::ID_AK_ST_BSTSTARTSMOKELHAND00, dPa_name::ID_AK_ST_BSTSTARTSMOKERHAND00}; /* 00000B1C-00000E58 .text stay__FP9bst_class */ @@ -307,10 +307,10 @@ static void stay(bst_class* i_this) { } } -static u16 fly_btk_d[] = {BST_BTK_BST, BST_BTK_LHAND, BST_BTK_RHAND}; -static u16 fly_brk_d[] = {BST_BRK_BST, BST_BRK_LHAND, BST_BRK_RHAND}; -static u16 damage_btk_d[] = {BST_BTK_BST_DAMAGE, BST_BTK_LH_DAMAGE, BST_BTK_RH_DAMAGE}; -static u16 damage_brk_d[] = {BST_BRK_BST_DAMAGE, BST_BRK_LH_DAMAGE, BST_BRK_RH_DAMAGE}; +static u16 fly_btk_d[] = {dRes_INDEX_BST_BTK_BST_e, dRes_INDEX_BST_BTK_LHAND_e, dRes_INDEX_BST_BTK_RHAND_e}; +static u16 fly_brk_d[] = {dRes_INDEX_BST_BRK_BST_e, dRes_INDEX_BST_BRK_LHAND_e, dRes_INDEX_BST_BRK_RHAND_e}; +static u16 damage_btk_d[] = {dRes_INDEX_BST_BTK_BST_DAMAGE_e, dRes_INDEX_BST_BTK_LH_DAMAGE_e, dRes_INDEX_BST_BTK_RH_DAMAGE_e}; +static u16 damage_brk_d[] = {dRes_INDEX_BST_BRK_BST_DAMAGE_e, dRes_INDEX_BST_BRK_LH_DAMAGE_e, dRes_INDEX_BST_BRK_RH_DAMAGE_e}; /* 00000E58-000014E8 .text fly__FP9bst_class */ static void fly(bst_class* i_this) { @@ -409,7 +409,7 @@ static void fly(bst_class* i_this) { } } -static u16 downa_bck_d[] = {BST_BCK_BST_FLY, BST_BCK_LH_GOO, BST_BCK_RH_GOO}; +static u16 downa_bck_d[] = {dRes_INDEX_BST_BCK_BST_FLY_e, dRes_INDEX_BST_BCK_LH_GOO_e, dRes_INDEX_BST_BCK_RH_GOO_e}; /* 000014E8-00001C14 .text down_attack__FP9bst_class */ static void down_attack(bst_class* i_this) { @@ -520,7 +520,7 @@ static void down_attack(bst_class* i_this) { } } -static u16 paa_bck_d[] = {0, BST_BCK_LH_PAA, BST_BCK_RH_PAA}; +static u16 paa_bck_d[] = {0, dRes_INDEX_BST_BCK_LH_PAA_e, dRes_INDEX_BST_BCK_RH_PAA_e}; /* 00001C14-000023C8 .text paa_attack__FP9bst_class */ static void paa_attack(bst_class* i_this) { @@ -652,7 +652,7 @@ static void paa_attack(bst_class* i_this) { } } -static u16 awasu_bck_d[] = {0, BST_BCK_LH_AWASE, BST_BCK_RH_AWASU}; +static u16 awasu_bck_d[] = {0, dRes_INDEX_BST_BCK_LH_AWASE_e, dRes_INDEX_BST_BCK_RH_AWASU_e}; /* 00002404-00002E08 .text kumi_attack__FP9bst_class */ static void kumi_attack(bst_class* i_this) { @@ -875,8 +875,8 @@ static void harai_attack(bst_class* i_this) { pos_move(i_this, cVar3); } -static u16 sleep_btk_d[] = {BST_BCK_BST_SLEEP, BST_BTK_LH_END, BST_BTK_RH_END}; -static u16 sleep_brk_d[] = {BST_BRK_BST, BST_BRK_LH_END, BST_BRK_RH_END}; +static u16 sleep_btk_d[] = {dRes_INDEX_BST_BCK_BST_SLEEP_e, dRes_INDEX_BST_BTK_LH_END_e, dRes_INDEX_BST_BTK_RH_END_e}; +static u16 sleep_brk_d[] = {dRes_INDEX_BST_BRK_BST_e, dRes_INDEX_BST_BRK_LH_END_e, dRes_INDEX_BST_BRK_RH_END_e}; /* 0000318C-00003470 .text sleep__FP9bst_class */ static void sleep(bst_class* i_this) { @@ -964,13 +964,13 @@ static void beam_attack(bst_class* i_this) { switch (i_this->mDamage) { case 0: i_this->mDamage++; - anm_init(i_this, BST_BCK_BEAM_MAE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_BEAM_MAE_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_OPEN, 0); break; case 1: if (i_this->m02B8->isStop()) { i_this->mDamage++; - anm_init(i_this, BST_BCK_BEAM_TAME, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_BEAM_TAME_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m10FC[0] = 0x2d; for (s32 i = 0; i < 2; i++) { i_this->m2ED8[i] = dComIfGp_particle_set(charge_e_name[i], &actor->current.pos); @@ -988,7 +988,7 @@ static void beam_attack(bst_class* i_this) { } } i_this->mDamage++; - anm_init(i_this, BST_BCK_BEAM, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_BEAM_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m10FC[0] = REG0_S(4) + 50; } break; @@ -1122,9 +1122,9 @@ static void head_damage(bst_class* i_this) { i_this->m10FC[0] = 40; actor->speedF = 0.0f; actor->speed.y = 0.0f; - J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_BST_END); + J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_BST_END_e); i_this->mpTevRegAnimator->init(i_this->m02B8->getModel()->getModelData(), key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_BST_END); + J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_BST_END_e); i_this->mpTexMtxAnimator->init(i_this->m02B8->getModel()->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); fopAcM_seStart(actor, JA_SE_CM_BST_HEAD_EYE_CLOSE, 0); mDoAud_bgmStart(JA_BGM_UNK_123); @@ -1151,7 +1151,7 @@ static void head_damage(bst_class* i_this) { i_this->m112A = REG0_S(7) + 4; mDoAud_seStart(JA_SE_CM_BST_HEAD_FALL, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); mDoAud_seStart(JA_SE_CM_BST_MOUTH_OPEN, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); - anm_init(i_this, BST_BCK_KUTI_OPEN, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_KUTI_OPEN_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamage++; actor->speed.y = 0.0f; } @@ -1159,7 +1159,7 @@ static void head_damage(bst_class* i_this) { break; case 2: if (i_this->m02B8->isStop()) { - anm_init(i_this, BST_BCK_KUTI_OPEN_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_KUTI_OPEN_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m10FC[0] = 300; i_this->mDamage++; } @@ -1192,7 +1192,7 @@ static void head_damage(bst_class* i_this) { if (i_this->m10FC[0] != 0) { break; } - anm_init(i_this, BST_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_BOM_NOMI_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamage++; i_this->m2EE0[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTBOMBFLASH00, &actor->current.pos); fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_CLOSE, 0); @@ -1220,7 +1220,7 @@ static void head_damage(bst_class* i_this) { i_this->m2E9A = 50; i_this->mActionType = bst_class::ACTION_END_DEMO_e; i_this->mDamage = 0; - anm_init(i_this, BST_BCK_BST_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_BST_DEAD_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); hand[0]->mActionType = bst_class::ACTION_END_DEMO_e; hand[0]->mDamage = 10; hand[1]->mActionType = bst_class::ACTION_END_DEMO_e; @@ -1229,7 +1229,7 @@ static void head_damage(bst_class* i_this) { mDoAud_bgmStop(30); mDoAud_bgmStreamPrepare(JA_STRM_BST_CLEAR); } else { - anm_init(i_this, BST_BCK_BOM_BAKUHATU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_BOM_BAKUHATU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamage++; } fopAcM_seStart(actor, JA_SE_CM_BST_EXPLODE, 0); @@ -1552,7 +1552,7 @@ static void hana_demo(bst_class* i_this) { i_this->m10FC[0] = 40; actor->speedF = 0.0f; actor->speed.y = 0.0f; - anm_init(i_this, BST_BCK_HANA_DEMO, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_HANA_DEMO_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m2E9A = 1; fopAcM_seStartCurrent(actor, JA_SE_CM_BST_HAND_STRAIN, 0); // fallthrough @@ -1620,7 +1620,7 @@ static void end_demo(bst_class* i_this) { } break; case 2: - anm_init(i_this, BST_BCK_BST_HIRAKU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_BST_HIRAKU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamage++; i_this->m2EF4 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTHALO00, &actor->current.pos); if (i_this->m2EF4 != NULL) { @@ -1789,17 +1789,17 @@ static void main_cont(bst_class* i_this) { hand[1]->mDamage = 0; hand[0]->mDamage = 0; i_this->m2E7C = 10; - J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDEL); + J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDEL_e); hand[0]->mpBrkAnm->init(hand[0]->m02C8->getModelData(), key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDEL); + J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDEL_e); hand[0]->mpBtkAnm->init(hand[0]->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDER); + key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDER_e); hand[1]->mpBrkAnm->init(hand[1]->m02C8->getModelData(), key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDER); + srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDER_e); hand[1]->mpBtkAnm->init(hand[1]->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_MUNE); + key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_MUNE_e); boss->mpBrkAnm->init(boss->m02C8->getModelData(), key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_MUNE); + srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_MUNE_e); boss->mpBtkAnm->init(boss->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); i_this->mBombArrowDropTimer = 400; i_this->m2FE0->setPlaySpeed(1.0f); @@ -2003,29 +2003,29 @@ static void beam_move(bst_class* i_this) { /* 00007CF0-0000815C .text end_brkbtk_set__FP9bst_class */ static void end_brkbtk_set(bst_class* i_this) { - J3DAnmTevRegKey* tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_LH_END); + J3DAnmTevRegKey* tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_LH_END_e); hand[0]->mpTevRegAnimator->init(hand[0]->m02B8->getModel()->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_LH_END); + J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_LH_END_e); hand[0]->mpTexMtxAnimator->init(hand[0]->m02B8->getModel()->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_RH_END); + tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_RH_END_e); hand[1]->mpTevRegAnimator->init(hand[1]->m02B8->getModel()->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_RH_END); + srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_RH_END_e); hand[1]->mpTexMtxAnimator->init(hand[1]->m02B8->getModel()->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_BST_END); + tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_BST_END_e); boss->mpTevRegAnimator->init(boss->m02B8->getModel()->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_BST_END); + srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_BST_END_e); boss->mpTexMtxAnimator->init(boss->m02B8->getModel()->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDEL_END); + tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDEL_END_e); hand[0]->mpBrkAnm->init(hand[0]->m02C8->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDEL_END); + srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDEL_END_e); hand[0]->mpBtkAnm->init(hand[0]->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDER_END); + tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDER_END_e); hand[1]->mpBrkAnm->init(hand[1]->m02C8->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDER_END); + srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDER_END_e); hand[1]->mpBtkAnm->init(hand[1]->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_MUNE_END); + tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_MUNE_END_e); boss->mpBrkAnm->init(boss->m02C8->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); - srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_MUNE_END); + srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_MUNE_END_e); boss->mpBtkAnm->init(boss->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE); } @@ -2263,17 +2263,17 @@ void demo_camera(bst_class* i_this) { i_this->m2EA0.x -= REG0_F(1) + 500.0f; i_this->m2EA0.y += REG0_F(2) + 100.0f; i_this->m2EC8 = REG0_F(4) + 75.0f; - pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDEL); + pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDEL_e); hand[0]->mpBrkAnm->init(hand[0]->m02C8->getModelData(), pJVar7, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDEL); + pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDEL_e); hand[0]->mpBtkAnm->init(hand[0]->m02C8->getModelData(), pJVar8, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDER); + pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDER_e); hand[1]->mpBrkAnm->init(hand[1]->m02C8->getModelData(), pJVar7, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDER); + pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDER_e); hand[1]->mpBtkAnm->init(hand[1]->m02C8->getModelData(), pJVar8, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_MUNE); + pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_MUNE_e); boss->mpBrkAnm->init(boss->m02C8->getModelData(), pJVar7, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); - pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_MUNE); + pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_MUNE_e); boss->mpBtkAnm->init(boss->m02C8->getModelData(), pJVar8, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); i_this->mBombArrowDropTimer = 500; } @@ -2490,7 +2490,7 @@ void demo_camera(bst_class* i_this) { break; case 56: if (i_this->msFrameCount == REG0_S(4) + 50) { - anm_init(i_this, BST_BCK_HANA_DEMO, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BST_BCK_HANA_DEMO_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); mDoAud_seStart(JA_SE_CM_BST_HAND_STRAIN, &actor->current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); #if VERSION > VERSION_DEMO i_this->m2E98 = 1; @@ -2817,10 +2817,10 @@ static BOOL daBst_Delete(bst_class* i_this) { return TRUE; } -static u16 set_btk_d[3] = {BST_BTK_BST_START, BST_BTK_LH_START, BST_BTK_RH_START}; -static u16 set_brk_d[3] = {BST_BRK_BST_START, BST_BRK_LH_START, BST_BRK_RH_START}; -static u16 set_za_btk_d[3] = {BST_BTK_MUNE_START, BST_BTK_UDEL_START, BST_BTK_UDER_START}; -static u16 set_za_brk_d[3] = {BST_BRK_MUNE_START, BST_BRK_UDEL_START, BST_BRK_UDER_START}; +static u16 set_btk_d[3] = {dRes_INDEX_BST_BTK_BST_START_e, dRes_INDEX_BST_BTK_LH_START_e, dRes_INDEX_BST_BTK_RH_START_e}; +static u16 set_brk_d[3] = {dRes_INDEX_BST_BRK_BST_START_e, dRes_INDEX_BST_BRK_LH_START_e, dRes_INDEX_BST_BRK_RH_START_e}; +static u16 set_za_btk_d[3] = {dRes_INDEX_BST_BTK_MUNE_START_e, dRes_INDEX_BST_BTK_UDEL_START_e, dRes_INDEX_BST_BTK_UDER_START_e}; +static u16 set_za_brk_d[3] = {dRes_INDEX_BST_BRK_MUNE_START_e, dRes_INDEX_BST_BRK_UDEL_START_e, dRes_INDEX_BST_BRK_UDER_START_e}; /* 0000AADC-0000B2D0 .text useHeapInit__FP10fopAc_ac_c */ static BOOL useHeapInit(fopAc_ac_c* a_this) { @@ -2883,14 +2883,14 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } J3DModelData* modelData; if (i_this->mBstPartType == bst_class::Type_HEAD_e) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", BST_BDL_TAMA); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BDL_TAMA_e); for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m0390); i++) { i_this->m0390[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->m0390[i] == NULL) { return FALSE; } } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", BST_BDL_HBSITA1); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BDL_HBSITA1_e); i_this->m2FD0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->m2FD0 == NULL) { return FALSE; @@ -2899,7 +2899,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i_this->m2FD4 == NULL) { return FALSE; } - res = i_this->m2FD4->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_HBSITA1), TRUE, J3DFrameCtrl::EMode_LOOP); + res = i_this->m2FD4->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_HBSITA1_e), TRUE, J3DFrameCtrl::EMode_LOOP); if (res == 0) { return FALSE; } @@ -2908,12 +2908,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } res = i_this->m2FD8->init( - modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_HBSITA1), TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, false, FALSE + modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_HBSITA1_e), TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, false, FALSE ); if (res == 0) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", BST_BDL_HBYOKO1); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BDL_HBYOKO1_e); i_this->m2FDC = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->m2FDC == NULL) { return FALSE; @@ -2923,7 +2923,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } res = i_this->m2FE0->init( - modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_HBYOKO1), TRUE, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, false, FALSE + modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_HBYOKO1_e), TRUE, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, false, FALSE ); if (res == 0) { return FALSE; diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index aedddf981..769daa1cc 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -13,7 +13,7 @@ #include "d/actor/d_a_kui.h" #include "d/actor/d_a_btd.h" #include "d/actor/d_a_ykgr.h" -#include "d/res/res_btd.h" +#include "res/Object/Btd.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" #include "d/d_cc_d.h" @@ -316,8 +316,8 @@ static void hahen_set2(btd_class* i_this) { /* 00000C14-00000D84 .text hahen_set_s__FP9btd_classP4cXyzP5csXyz */ static void hahen_set_s(btd_class* i_this, cXyz* param_2, csXyz* param_3) { fopAc_ac_c* actor = &i_this->actor; - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI)); - J3DAnmTexPattern* anmTexPattern = static_cast(dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPI_KOISHI_e)); + J3DAnmTexPattern* anmTexPattern = static_cast(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTP_MPI_KOISHI_e)); JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_M_BTDMODELROCK00, param_2, param_3); if (emitter != NULL) { JGeometry::TVec3 scale(4.0f, 4.0f, 4.0f); @@ -387,7 +387,7 @@ static void startdemo(btd_class* i_this) { break; case 1: i_this->mKankyoState = 8; - anm_init(i_this, BTD_BCK_SSTART, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_SSTART_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); actor->current.pos.y = actor->home.pos.y; i_this->mGohmaState = 2; fopAcM_monsSeStart(actor, JA_SE_CV_BTD_ENTER, 0); @@ -481,16 +481,16 @@ static void damage_check(btd_class* i_this) { i_this->mGohmaState = 10; i_this->mTotalDamage = 0; } else { - u32 anm = BTD_BCK_HIT_M; + u32 anm = dRes_INDEX_BTD_BCK_HIT_M_e; if (atInfo.mResultingAttackType == 1) { s16 angle = fopAcM_searchPlayerAngleY(actor); angle = angle - actor->current.angle.y; if ((angle > -0x100) && (angle < 0x100)) { - anm = BTD_BCK_HIT_M; + anm = dRes_INDEX_BTD_BCK_HIT_M_e; } else if (angle > 0) { - anm = BTD_BCK_HIT_R; + anm = dRes_INDEX_BTD_BCK_HIT_R_e; } else { - anm = BTD_BCK_HIT_L; + anm = dRes_INDEX_BTD_BCK_HIT_L_e; } } anm_init(i_this, anm, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); @@ -571,7 +571,7 @@ static void damage(btd_class* i_this) static s32 damage(btd_class* i_this) #endif { - static s32 hibi_brk[] = {BTD_BRK_HIBI01, BTD_BRK_HIBI02, BTD_BRK_HIBI03}; + static s32 hibi_brk[] = {dRes_INDEX_BTD_BRK_HIBI01_e, dRes_INDEX_BTD_BRK_HIBI02_e, dRes_INDEX_BTD_BRK_HIBI03_e}; static u16 hibi_eff_name[] = {dPa_name::ID_AK_SN_BTDCRACKSHELL00, dPa_name::ID_AK_SN_BTDCRACKSHELL01, dPa_name::ID_AK_SN_BTDCRACKSHELL02}; static u16 hahen_eff_name[] = { dPa_name::ID_AK_SN_BTDBREAKSHELLARML, @@ -614,11 +614,11 @@ static s32 damage(btd_class* i_this) #endif switch (i_this->mGohmaState) { case 0: - anm_init(i_this, BTD_BCK_DAMAGE1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_DAMAGE1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; case 1: if (morf->isStop()) { - anm_init(i_this, BTD_BCK_DAMAGE2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_DAMAGE2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mStunTimer = l_HIO.m0C; i_this->mGohmaState++; } @@ -632,12 +632,12 @@ static s32 damage(btd_class* i_this) break; case 3: if (morf->isStop()) { - anm_init(i_this, BTD_BCK_DAMAGE2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_DAMAGE2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mGohmaState = 2; } break; case 10: - anm_init(i_this, BTD_BCK_DAMAGE3, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_DAMAGE3_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; fopAcM_monsSeStart(actor, JA_SE_CV_BTD_AFT_DAMAGE, 0); case 0xb: @@ -648,13 +648,13 @@ static s32 damage(btd_class* i_this) } break; case 0x14: - anm_init(i_this, BTD_BCK_SIZUMU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_SIZUMU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; i_this->m6E7C = 0.0f; break; case 0x15: if (morf->isStop()) { - anm_init(i_this, BTD_BCK_SIZUMU2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_SIZUMU2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02EC[0] = (REG0_S(7) + 0x14) * 5; i_this->mGohmaState++; @@ -691,7 +691,7 @@ static s32 damage(btd_class* i_this) if (i_this->m6190 >= 3) { i_this->mGohmaState = 0x28; } else { - anm_init(i_this, BTD_BCK_SIZUMU3, 15.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_SIZUMU3_e, 15.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; static_center_pos.setall(0.0f); mDoAud_seStart(JA_SE_CM_BTD_INTO_MAGMA_N, &static_center_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -713,7 +713,7 @@ static s32 damage(btd_class* i_this) case 0x1e: i_this->m6E88 = 0; if (i_this->m02EC[0] == 0) { - anm_init(i_this, BTD_BCK_MOTIAGE1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_MOTIAGE1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; i_this->m02F6 = 0; mDoAud_seStart(JA_SE_CM_BTD_ENT_BLAST, &static_center_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -731,7 +731,7 @@ static s32 damage(btd_class* i_this) i_this->m6E7C = 0.0f; } if (morf->isStop()) { - anm_init(i_this, BTD_BCK_MOTIAGE2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_MOTIAGE2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; mDoAud_seStart(JA_SE_CM_BTD_LIFT_UP, &static_center_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); i_this->m6E7C = 0.0f; @@ -740,7 +740,7 @@ static s32 damage(btd_class* i_this) case 0x20: i_this->m6E88 = 0; if (morf->isStop()) { - anm_init(i_this, BTD_BCK_MOTIAGE3, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_MOTIAGE3_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); dr2_class* tmp = (dr2_class*)dr2; mDoAud_seStart(JA_SE_CM_BTD_JUMP_DOWN, &tmp->unk_4A8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDSPLASHMAGMA00, &actor->current.pos, &actor->current.angle); @@ -761,7 +761,7 @@ static s32 damage(btd_class* i_this) } break; case 0x28: - anm_init(i_this, BTD_BCK_WARERU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_WARERU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; fopAcM_seStart(actor, JA_SE_CM_BTD_FALL_FWD, 0); mDoAud_bgmStop(30); @@ -817,7 +817,7 @@ static s32 damage(btd_class* i_this) fopAcM_seStart(actor, JA_SE_CM_BTD_BRK_SHIELD_L, 0); fopAcM_monsSeStart(actor, JA_SE_CV_BTD_AFT_DAMAGE, 0); i_this->m02E0 = 1; - anm_init(i_this, BTD_BCK_WARERU2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_WARERU2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; } break; @@ -877,7 +877,7 @@ static void end(btd_class* i_this) { mDoAud_bgmStop(30); } else { i_this->mGohmaState = 0x33; - anm_init(i_this, BTD_BCK_DEAD, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_DEAD_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m6E16 = 100; i_this->m6E1A = 0; i_this->m6E18 = 0; @@ -885,13 +885,13 @@ static void end(btd_class* i_this) { mDoAud_bgmStop(20); mDoAud_bgmStreamPrepare(JA_STRM_BOSS_CLEAR); model = morf->getModel(); - J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Btd", BTD_BMT_DEADA); + J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMT_DEADA_e); model->getModelData()->setMaterialTable(bmt, J3DMatCopyFlag_Material); i_this->brkS->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_DEADA), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0 + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_DEADA_e), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0 ); i_this->btkS->init( - model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_DEADA), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0 + model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_DEADA_e), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0 ); wave_set(i_this); } @@ -950,11 +950,11 @@ static void end(btd_class* i_this) { if (i_this->m02EC[0] == 0xf1) { model = morf->getModel(); i_this->brkS->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_DEADB), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0 + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_DEADB_e), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0 ); i_this->btkS->init( model->getModelData(), - (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_DEADB), + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_DEADB_e), true, J3DFrameCtrl::EMode_NONE, 1.0f, @@ -1085,7 +1085,7 @@ static void wait(btd_class* i_this) { } switch (i_this->mGohmaState) { case 0: - anm_init(i_this, BTD_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_WAIT1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mGohmaState++; case 1: if ((uVar5 < 0x1800) && (i_this->m02EC[0] == 0)) { @@ -1133,7 +1133,7 @@ static void wait(btd_class* i_this) { i_this->m5E94 = 0x100; if ((uVar5 >= 0x6000) && (i_this->m02EC[1] == 0)) { i_this->mGohmaState = 2; - anm_init(i_this, BTD_BCK_KYORO, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_KYORO_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02EC[0] = 0x96; } else if (bVar8) { if ((kui != NULL) && (kui->health == 3)) { @@ -1152,7 +1152,7 @@ static void wait(btd_class* i_this) { } break; case 10: - anm_init(i_this, BTD_BCK_UEMUKI_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_UEMUKI_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mGohmaState++; i_this->m02EC[0] = 300; i_this->m02EC[1] = (s16)(cM_rndF(80.0f) + 90.0f); @@ -1175,7 +1175,7 @@ static void wait(btd_class* i_this) { } break; case 0x14: - anm_init(i_this, BTD_BCK_YOKO_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_YOKO_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mGohmaState++; i_this->m02EC[0] = 0x96; case 0x15: @@ -1192,7 +1192,7 @@ static void wait(btd_class* i_this) { } } -static s32 jab_bck[] = {BTD_BCK_RJAB1, BTD_BCK_RJAB2, BTD_BCK_RJAB3, 0, 0, BTD_BCK_LJAB1, BTD_BCK_LJAB2, BTD_BCK_LJAB3}; +static s32 jab_bck[] = {dRes_INDEX_BTD_BCK_RJAB1_e, dRes_INDEX_BTD_BCK_RJAB2_e, dRes_INDEX_BTD_BCK_RJAB3_e, 0, 0, dRes_INDEX_BTD_BCK_LJAB1_e, dRes_INDEX_BTD_BCK_LJAB2_e, dRes_INDEX_BTD_BCK_LJAB3_e}; /* 00003BCC-00003E64 .text jab_attack__FP9btd_class */ static void jab_attack(btd_class* i_this) { @@ -1238,16 +1238,16 @@ static void jab_attack(btd_class* i_this) { } static s32 punch_bck[] = { - BTD_BCK_RATTACK1, - BTD_BCK_RATTACK2, - BTD_BCK_RATTACK3, - BTD_BCK_RATTACK4, - BTD_BCK_RATTACK5, - BTD_BCK_LATTACK1, - BTD_BCK_LATTACK2, - BTD_BCK_LATTACK3, - BTD_BCK_LATTACK4, - BTD_BCK_LATTACK5 + dRes_INDEX_BTD_BCK_RATTACK1_e, + dRes_INDEX_BTD_BCK_RATTACK2_e, + dRes_INDEX_BTD_BCK_RATTACK3_e, + dRes_INDEX_BTD_BCK_RATTACK4_e, + dRes_INDEX_BTD_BCK_RATTACK5_e, + dRes_INDEX_BTD_BCK_LATTACK1_e, + dRes_INDEX_BTD_BCK_LATTACK2_e, + dRes_INDEX_BTD_BCK_LATTACK3_e, + dRes_INDEX_BTD_BCK_LATTACK4_e, + dRes_INDEX_BTD_BCK_LATTACK5_e }; /* 00003E64-00004418 .text punch_attack__FP9btd_class */ @@ -1423,7 +1423,7 @@ static void fire_attack(btd_class* i_this) { i_this->m5E86 = 2; switch (i_this->mGohmaState) { case 0: - anm_init(i_this, BTD_BCK_FATTACK1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; i_this->m02EC[0] = 0x28; i_this->m6E7C = 0.0f; @@ -1436,7 +1436,7 @@ static void fire_attack(btd_class* i_this) { fopAcM_monsSeStart(actor, JA_SE_CV_BTD_BEF_FIRE, 0); } if (morf->isStop()) { - anm_init(i_this, BTD_BCK_FATTACK2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; } break; @@ -1444,10 +1444,10 @@ static void fire_attack(btd_class* i_this) { if (morf->isStop()) { if (i_this->m02E0 != 0) { i_this->mGohmaState = 6; - anm_init(i_this, BTD_BCK_HASAMI_ATTACK, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_HASAMI_ATTACK_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_monsSeStart(actor, JA_SE_CM_MAGTAIL_ATTACK, 0); } else { - anm_init(i_this, BTD_BCK_FATTACK3, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK3_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02EC[0] = l_HIO.m2C * 9; i_this->mGohmaState = 3; } @@ -1462,11 +1462,11 @@ static void fire_attack(btd_class* i_this) { i_this->m6028[0] = REG0_S(6) + 0x14; if (i_this->m02EC[0] == 0) { if (i_this->m02E0 != 0) { - anm_init(i_this, BTD_BCK_HASAMI_ATTACK, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_HASAMI_ATTACK_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState = 5; fopAcM_monsSeStart(actor, JA_SE_CM_MAGTAIL_ATTACK, 0); } else { - anm_init(i_this, BTD_BCK_FATTACK4, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK4_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; i_this->m02EC[0] = REG0_S(3) + 0x19; mDoAud_seStart(JA_SE_CM_BTD_WIND_BEF_FIRE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -1508,7 +1508,7 @@ static void fire_attack(btd_class* i_this) { case 5: i_this->m5E84 = 3; if (morf->isStop()) { - anm_init(i_this, BTD_BCK_FATTACK4, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK4_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState = 4; i_this->m02EC[0] = REG0_S(3) + 0x19; mDoAud_seStart(JA_SE_CM_BTD_WIND_BEF_FIRE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -1517,7 +1517,7 @@ static void fire_attack(btd_class* i_this) { case 6: i_this->m5E84 = 3; if (morf->isStop()) { - anm_init(i_this, BTD_BCK_FATTACK3, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK3_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02EC[0] = (s16)(l_HIO.m2C << 2); i_this->mGohmaState = 3; } @@ -1538,13 +1538,13 @@ static void up_fire_attack(btd_class* i_this) { i_this->m5E86 = 3; switch (i_this->mGohmaState) { case 0: - anm_init(i_this, BTD_BCK_UE_KAEN1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_UE_KAEN1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; i_this->m02EC[0] = 0x28; break; case 1: if (morf->isStop()) { - anm_init(i_this, BTD_BCK_UE_KAEN2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_UE_KAEN2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02EC[0] = l_HIO.m2C * 9; i_this->mGohmaState++; } @@ -1555,7 +1555,7 @@ static void up_fire_attack(btd_class* i_this) { i_this->m6028[1] = 1; i_this->m6028[0] = REG0_S(6) + 0x14; if (i_this->m02EC[0] == 0) { - anm_init(i_this, BTD_BCK_UE_KAEN3, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_UE_KAEN3_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; i_this->m02EC[0] = REG0_S(3) + 0x19; mDoAud_seStart(JA_SE_CM_BTD_WIND_BEF_FIRE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -1608,13 +1608,13 @@ static void yoko_fire_attack(btd_class* i_this) { i_this->m5E86 = 1; switch (i_this->mGohmaState) { case 0: - anm_init(i_this, BTD_BCK_YOKO_KAEN1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_YOKO_KAEN1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; i_this->m02EC[0] = 0x28; break; case 1: if (morf->isStop()) { - anm_init(i_this, BTD_BCK_YOKO_KAEN2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_YOKO_KAEN2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02EC[0] = l_HIO.m2C * 7; i_this->mGohmaState++; } @@ -1625,7 +1625,7 @@ static void yoko_fire_attack(btd_class* i_this) { i_this->m6028[1] = 1; i_this->m6028[0] = REG0_S(6) + 0x14; if (i_this->m02EC[0] == 0) { - anm_init(i_this, BTD_BCK_YOKO_KAEN3, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BTD_BCK_YOKO_KAEN3_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mGohmaState++; i_this->m02EC[0] = REG0_S(3) + 0x19; mDoAud_seStart(JA_SE_CM_BTD_WIND_BEF_FIRE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -2620,10 +2620,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { btd_class* i_this = (btd_class*)a_this; i_this->mpPhase1Morf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_BTD), + (J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_BTD_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Btd", BTD_BCK_WAIT1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BCK_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -2645,7 +2645,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { pModel = i_this->mpPhase1Morf->getModel(); i_this->btk = new mDoExt_btkAnm(); JUT_ASSERT(DEMO_SELECT(5327, 5370), i_this->btk); - pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_BTD); + pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_BTD_e); #if VERSION == VERSION_DEMO i_this->btk->init(pModel->getModelData(), pBtk, true, J3DFrameCtrl::EMode_LOOP); #else @@ -2655,7 +2655,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { #endif i_this->brk = new mDoExt_brkAnm(); JUT_ASSERT(DEMO_SELECT(5337, 5390), i_this->brk); - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_BTD); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_BTD_e); #if VERSION == VERSION_DEMO i_this->brk->init(pModel->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP); #else @@ -2664,10 +2664,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } #endif i_this->mpPhase2Morf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_SOTAI), + (J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_SOTAI_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Btd", BTD_BCK_WAIT1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BCK_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -2689,7 +2689,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { pModel = i_this->mpPhase2Morf->getModel(); i_this->btkS = new mDoExt_btkAnm(); JUT_ASSERT(DEMO_SELECT(5370, 5432), i_this->btkS); - pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_DEADA); + pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_DEADA_e); #if VERSION == VERSION_DEMO i_this->btkS->init(pModel->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE); #else @@ -2697,11 +2697,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } #endif - pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_SOTAI); + pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_SOTAI_e); i_this->btkS->init(pModel->getModelData(), pBtk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0); i_this->brkS = new mDoExt_brkAnm(); JUT_ASSERT(DEMO_SELECT(5390, 5463), i_this->brkS); - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_DEADA); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_DEADA_e); #if VERSION == VERSION_DEMO i_this->brkS->init(pModel->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE); #else @@ -2709,10 +2709,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } #endif - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_SOTAI); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_SOTAI_e); i_this->brkS->init(pModel->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0); i_this->mpDeadHeadMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_NAMAKUBI), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203 + (J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_NAMAKUBI_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203 ); if ((i_this->mpDeadHeadMorf == NULL) || (i_this->mpDeadHeadMorf->getModel() == NULL)) { return FALSE; @@ -2722,7 +2722,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpDeadHeadBtkAnm == NULL) { return FALSE; } - pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_NAMAKUBI); + pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_NAMAKUBI_e); if (!i_this->mpDeadHeadBtkAnm->init(pModel->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -2730,12 +2730,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpDeadHeadBrkAnm == NULL) { return FALSE; } - pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_NAMAKUBI); + pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_NAMAKUBI_e); if (!i_this->mpDeadHeadBrkAnm->init(pModel->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } - modelDataA = (J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_HAHENA); - modelDataB = (J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_KAMENA); + modelDataA = (J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_HAHENA_e); + modelDataB = (J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_KAMENA_e); JUT_ASSERT(DEMO_SELECT(5460, 5544), modelDataA && modelDataB); for (s32 i = 0; i < ARRAY_SSIZE(i_this->hahen); i++) { if (i < 5) { diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index 79792ed25..834da80df 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -13,7 +13,7 @@ #include "d/d_s_play.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_snap.h" -#include "d/res/res_bwd.h" +#include "res/Object/Bwd.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_graphic.h" #include "JSystem/JUtility/JUTReport.h" @@ -439,7 +439,7 @@ void wait(bwd_class* i_this) { i_this->m18B0++; case 1: if (i_this->m18CC[0] == 0) { - anm_init(i_this, BWD_BCK_BWD_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m18B0++; mDoAud_seStart(JA_SE_CM_BWD_OUT_SAND_2, &i_this->m3954, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } else { @@ -512,7 +512,7 @@ void sita_hit(bwd_class* i_this) { i_this->m17C4 = 200; switch (i_this->m18B0) { case 0: - anm_init(i_this, BWD_BCK_BWD_NUKARERU, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_NUKARERU_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m18B0++; i_this->m1BAC = 1.0f; // fallthrough @@ -520,7 +520,7 @@ void sita_hit(bwd_class* i_this) { if (!i_this->mpHeadMorf->isStop()) { break; } - anm_init(i_this, BWD_BCK_BWD_NUKARERU_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_NUKARERU_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m18B0++; break; case 2: @@ -558,7 +558,7 @@ void sita_hit(bwd_class* i_this) { #if VERSION > VERSION_DEMO dScnPly_ply_c::setPauseTimer(4); #endif - anm_init(i_this, BWD_BCK_BWD_DAMAGE1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DAMAGE1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m18B0++; i_this->m1BB1 = 0; i_this->m1BB4 = 0; @@ -569,7 +569,7 @@ void sita_hit(bwd_class* i_this) { if (!i_this->mpHeadMorf->isStop()) { break; } - anm_init(i_this, BWD_BCK_BWD_DAMAGE2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DAMAGE2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m18B0++; i_this->m18CC[0] = 300; i_this->m3954.x = actor->current.pos.x; @@ -681,7 +681,7 @@ void eat_attack(bwd_class* i_this) { bVar2 = false; switch (i_this->m18B0) { case 0: - anm_init(i_this, BWD_BCK_BWD_ATTACK, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_ATTACK_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m18B0++; i_this->m3954.x = actor->current.pos.x; i_this->m3954.z = actor->current.pos.z; @@ -711,7 +711,7 @@ void eat_attack(bwd_class* i_this) { } } if (bVar2) { - anm_init(i_this, BWD_BCK_BWD_ATTACK_EAT, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_ATTACK_EAT_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m18B0 = 5; i_this->m18CC[0] = 0x96; i_this->m3C1E++; @@ -731,7 +731,7 @@ void eat_attack(bwd_class* i_this) { mDoAud_seStart(JA_SE_CM_BWD_MOUTH_CLOSE_2, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } else { if (i_this->mpHeadMorf->isStop()) { - anm_init(i_this, BWD_BCK_BWD_ATTACK_SHIPPAI, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_ATTACK_SHIPPAI_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); mDoAud_seStart(JA_SE_CM_BWD_MOUTH_CLOSE_2, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); i_this->m18B0++; } @@ -813,7 +813,7 @@ void fly(bwd_class* i_this) { switch (i_this->m18B0) { case 0: if (i_this->m18CC[1] == 0) { - anm_init(i_this, BWD_BCK_BWD_FLY, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_FLY_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m18B0 = 1; i_this->m18B4.x = actor->current.pos.x; i_this->m18B4.y = l_HIO.m28 + (cM_rndFX(800.0f) + 2000.0f); @@ -859,14 +859,14 @@ void fly(bwd_class* i_this) { if (i_this->m18CC[1] == 0) { i_this->m18B0 = 2; i_this->m18CC[0] = 0x96; - anm_init(i_this, BWD_BCK_BWD_JATTACK1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); mDoAud_seStart(JA_SE_CV_BWD_GO_UNDER_G, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } break; case 2: mDoAud_seStart(JA_SE_CM_BWD_FLYING, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); if (i_this->mpHeadMorf->isStop()) { - anm_init(i_this, BWD_BCK_BWD_JATTACK2, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK2_e, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->m18B4 = player->eyePos; local_48 = i_this->m18B4 - actor->current.pos; @@ -874,7 +874,7 @@ void fly(bwd_class* i_this) { i_this->m18B0 = 3; i_this->m18B4.y -= 10000.0f; i_this->m18CC[0] = 200; - anm_init(i_this, BWD_BCK_BWD_JATTACK3, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK3_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } cLib_addCalc2(&i_this->m18C4, REG0_F(15) + 800.0f, 1.0f, 10.0f); break; @@ -912,7 +912,7 @@ void s_fly(bwd_class* i_this) { switch (i_this->m18B0) { case 0: if (i_this->m18CC[1] == 0) { - anm_init(i_this, BWD_BCK_BWD_FLY, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_FLY_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m18B0 = 1; i_this->m18B4.x = 0.0f; i_this->m18B4.y = l_HIO.m28 + 3000.0f; @@ -949,7 +949,7 @@ void s_fly(bwd_class* i_this) { if (i_this->m3C24 == 3) { i_this->m18B0 = 2; i_this->m18CC[0] = 0x96; - anm_init(i_this, BWD_BCK_BWD_JATTACK1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); mDoAud_seStart(JA_SE_CV_BWD_GO_UNDER_G, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } else { i_this->m18B4.x = target_x[i_this->m3C24]; @@ -965,7 +965,7 @@ void s_fly(bwd_class* i_this) { case 2: mDoAud_seStart(JA_SE_CM_BWD_FLYING, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); if (i_this->mpHeadMorf->isStop()) { - anm_init(i_this, BWD_BCK_BWD_JATTACK2, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK2_e, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->m18B4.x = 0.0f; i_this->m18B4.y = 800.0f; @@ -975,7 +975,7 @@ void s_fly(bwd_class* i_this) { i_this->m18B0 = 3; i_this->m18B4.y -= 10000.0f; i_this->m18CC[0] = 200; - anm_init(i_this, BWD_BCK_BWD_JATTACK3, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK3_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } cLib_addCalc2(&i_this->m18C4, REG0_F(15) + 800.0f, 1.0f, 10.0f); break; @@ -1033,7 +1033,7 @@ void end(bwd_class* i_this) { #if VERSION != VERSION_DEMO && VERSION != VERSION_USA mDoAud_bgmStreamPrepare(JA_STRM_BWD_CLEAR); #endif - anm_init(i_this, BWD_BCK_BWD_DEAD1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DEAD1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m18B0 = 1; i_this->m3C1E = 100; actor->current.angle.y = 0; @@ -1073,7 +1073,7 @@ void end(bwd_class* i_this) { #if VERSION == VERSION_USA mDoAud_bgmStreamPrepare(JA_STRM_BWD_CLEAR); #endif - anm_init(i_this, BWD_BCK_BWD_DEAD2, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DEAD2_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); actor->current.pos.y = -2000.0f; for (int i = 0; i < ARRAY_SSIZE(i_this->m0508); i++) { i_this->m0508[i] = actor->current.pos; @@ -1125,7 +1125,7 @@ void end(bwd_class* i_this) { case 23: i_this->m1BB6 = 2; if (i_this->m18CC[0] == 0x14) { - anm_init(i_this, BWD_BCK_BWD_DEAD3, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DEAD3_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C8 = 1.0f; } if (((i_this->m18CC[0] == 0) && ((i_this->m18AC & 3) == 0)) && (i_this->m0414 < 0x14)) { @@ -2077,13 +2077,13 @@ static BOOL daBwd_Execute(bwd_class* i_this) { } } if (i_this->m17E6[i] == 0xb4) { - pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", BWD_BTK_TAKI_WAIT); + pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BTK_TAKI_WAIT_e); i_this->m17F4[i]->init(i_this->m17EC[i]->getModelData(), pBtk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0); i_this->m17E4[i] = 3; } break; case 4: - pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", BWD_BTK_TAKI_END); + pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BTK_TAKI_END_e); if (i_this->m17F4[i]->init(i_this->m17EC[i]->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0) == 1) { i_this->m17E4[i] = 5; i_this->m17E6[i] = 0; @@ -2233,20 +2233,20 @@ static BOOL daBwd_Delete(bwd_class* i_this) { /* 00008E0C-000096D8 .text useHeapInit__FP10fopAc_ac_c */ static BOOL useHeapInit(fopAc_ac_c* a_this) { - static int taki_bdl[] = {BWD_BDL_HTAKI1, BWD_BDL_HTAKI2}; - static int s_bdl[] = {BWD_BDL_GSP00, BWD_BDL_GSP01}; - static int s_btk[] = {BWD_BTK_GSP00, BWD_BTK_GSP01}; - static int s_brk[] = {BWD_BRK_GSP00, BWD_BRK_GSP01}; - static int s_bck[] = {BWD_BCK_GSP00, BWD_BCK_GSP01}; + static int taki_bdl[] = {dRes_INDEX_BWD_BDL_HTAKI1_e, dRes_INDEX_BWD_BDL_HTAKI2_e}; + static int s_bdl[] = {dRes_INDEX_BWD_BDL_GSP00_e, dRes_INDEX_BWD_BDL_GSP01_e}; + static int s_btk[] = {dRes_INDEX_BWD_BTK_GSP00_e, dRes_INDEX_BWD_BTK_GSP01_e}; + static int s_brk[] = {dRes_INDEX_BWD_BRK_GSP00_e, dRes_INDEX_BWD_BRK_GSP01_e}; + static int s_bck[] = {dRes_INDEX_BWD_BCK_GSP00_e, dRes_INDEX_BWD_BCK_GSP01_e}; bwd_class* i_this = (bwd_class*)a_this; J3DModelData* modelData; u16 fileIndex; i_this->mpHeadMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BWD), + (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BWD_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bwd", BWD_BCK_BWD_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BCK_BWD_WAIT_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -2266,7 +2266,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { i_this->mpHeadBrkAnm = new mDoExt_brkAnm(); if (!i_this->mpHeadBrkAnm->init( i_this->mpHeadMorf->getModel()->getModelData(), - (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", BWD_BRK_BWD), + (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BRK_BWD_e), true, J3DFrameCtrl::EMode_NONE, 1.0f, @@ -2278,22 +2278,22 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BERO); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BERO_e); for (int i = 0; i < 30; i++) { if (i == 29) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BERO_SAKI); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BERO_SAKI_e); } i_this->mTongueSegments[i].m00 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->mTongueSegments[i].m00 == 0) { return FALSE; } } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BWD_SHIPPOA); - fileIndex = BWD_BRK_BWD_SHIPPOA; + modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BWD_SHIPPOA_e); + fileIndex = dRes_INDEX_BWD_BRK_BWD_SHIPPOA_e; for (int i = 0; i < 20; i++) { if (i == 0x13) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BWD_SHIPPOB); - fileIndex = BWD_BRK_BWD_SHIPPOB; + modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BWD_SHIPPOB_e); + fileIndex = dRes_INDEX_BWD_BRK_BWD_SHIPPOB_e; } i_this->mpBodyModel[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->mpBodyModel[i] == 0) { @@ -2308,7 +2308,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } } - modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_HTRYF1); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_HTRYF1_e); JUT_ASSERT(VERSION_SELECT(4466, 4524, 4548, 4548), modelData != NULL); i_this->mpTriforcePlatformModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->mpTriforcePlatformModel == NULL) { @@ -2318,7 +2318,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpBgW2 == NULL) { return FALSE; } - if (i_this->mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes("Bwd", BWD_DZB_HTRYF1), dBgW::MOVE_BG_e, &i_this->mBgwMtx2) == 1) { + if (i_this->mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_DZB_HTRYF1_e), dBgW::MOVE_BG_e, &i_this->mBgwMtx2) == 1) { return FALSE; } i_this->mpBgW2->SetCrrFunc(dBgS_MoveBGProc_Typical); @@ -2327,7 +2327,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i_this->mpBgW1[i] == 0) { return FALSE; } - if (i_this->mpBgW1[i]->Set((cBgD_t*)dComIfG_getObjectRes("Bwd", BWD_DZB_HTAKI1), dBgW::MOVE_BG_e, &i_this->mBgwMtx1[i]) == 1) { + if (i_this->mpBgW1[i]->Set((cBgD_t*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_DZB_HTAKI1_e), dBgW::MOVE_BG_e, &i_this->mBgwMtx1[i]) == 1) { return FALSE; } i_this->mpBgW1[i]->SetCrrFunc(dBgS_MoveBGProc_Typical); @@ -2341,7 +2341,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i_this->m17F4[i] == 0) { return FALSE; } - if (!i_this->m17F4[i]->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", BWD_BTK_TAKI_START), true, J3DFrameCtrl::EMode_NONE)) { + if (!i_this->m17F4[i]->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BTK_TAKI_START_e), true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } } diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index 5835dbcd6..da0cfb3d6 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bwdg.h" -#include "d/res/res_bwdg.h" +#include "res/Object/Bwdg.h" #include "d/d_bg_w_hf.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_bwd.h" @@ -207,8 +207,8 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } if (!i_this->mpBgW->Set( - (cBgD_t*)dComIfG_getObjectRes("Bwdg", BWDG_DZB_HSAND1), - (u16*)dComIfG_getObjectRes("Bwdg", BWDG_DAT_GRIDIDX), + (cBgD_t*)dComIfG_getObjectRes("Bwdg", dRes_INDEX_BWDG_DZB_HSAND1_e), + (u16*)dComIfG_getObjectRes("Bwdg", dRes_INDEX_BWDG_DAT_GRIDIDX_e), 130.0f, 0x40, 0x40, 0 )) { return TRUE; diff --git a/src/d/actor/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp index df66a326b..abb6c5798 100644 --- a/src/d/actor/d_a_bwds.cpp +++ b/src/d/actor/d_a_bwds.cpp @@ -10,8 +10,8 @@ #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "m_Do/m_Do_mtx.h" -#include "d/res/res_bwds.h" -#include "d/res/res_bwd.h" +#include "res/Object/Bwds.h" +#include "res/Object/Bwd.h" #include "d/actor/d_a_player.h" enum ActionStatus { @@ -231,7 +231,7 @@ static void ug_move(bwds_class* i_this) { s16 sVar5 = 0; switch (i_this->m02F8) { case -10: - anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1); i_this->m02F8 = 3; i_this->m030C = REG0_F(3) + 3000.0f; actor->speedF = l_HIO.m010; @@ -253,7 +253,7 @@ static void ug_move(bwds_class* i_this) { fopAcM_seStart(actor, JA_SE_CV_BWD_C_ATTACK, 0); break; case 0: - anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 2.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 2.0f, 0, 1.0f, -1); actor->current.pos.y = i_this->m0504; i_this->m02F8++; actor->shape_angle.z = 0; @@ -276,7 +276,7 @@ static void ug_move(bwds_class* i_this) { sVar5 = fVar1 * cM_ssin(i_this->m02F4 * (REG0_S(3) + 0x514)); if (fVar8 < 600.0f + REG0_F(12)) { - anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1); i_this->m02F8++; actor->speedF = l_HIO.m010; actor->speed.y = REG0_F(13) + 50.0f; @@ -375,7 +375,7 @@ static void hook_on(bwds_class* i_this) { i_this->m031E = 3; switch (i_this->m02F8) { case 0: - anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 2.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 2.0f, 0, 1.0f, -1); i_this->m02F8++; local_34 = player->eyePos - actor->eyePos; @@ -398,7 +398,7 @@ static void hook_chance(bwds_class* i_this) { i_this->m0670[0].OnCoSetBit(); switch (i_this->m02F8) { case 0: - anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1); i_this->m02F8++; i_this->m0314[0] = l_HIO.m014; // FALL-THROUGH @@ -419,9 +419,9 @@ static void hook_chance(bwds_class* i_this) { i_this->m0502 = cM_rndFX(REG0_F(5) + 2500.0f); if (cM_rndF(1.0f) < 0.5f) { if (cM_rndF(1.0f) < 0.5f) { - anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 5.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 5.0f, 0, 1.0f, -1); } else { - anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 5.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 5.0f, 2, 1.0f, -1); } } } @@ -832,48 +832,48 @@ static BOOL daBwds_Delete(bwds_class* i_this) { return TRUE; } static u16 body_bdl[] = { - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_BODY, - BWDS_BDL_KOBOSS_SHIPPO, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e, + dRes_INDEX_BWDS_BDL_KOBOSS_SHIPPO_e, }; /* 00003278-00003634 .text useHeapInit__FP10fopAc_ac_c */ static BOOL useHeapInit(fopAc_ac_c* i_actor) { static u32 s_bdl[] = { - BWD_BDL_GSP00, - BWD_BDL_GSP01, + dRes_INDEX_BWD_BDL_GSP00_e, + dRes_INDEX_BWD_BDL_GSP01_e, }; static u32 s_btk[] = { - BWD_BTK_GSP00, - BWD_BTK_GSP01, + dRes_INDEX_BWD_BTK_GSP00_e, + dRes_INDEX_BWD_BTK_GSP01_e, }; static u32 s_brk[] = { - BWD_BRK_GSP00, - BWD_BRK_GSP01, + dRes_INDEX_BWD_BRK_GSP00_e, + dRes_INDEX_BWD_BRK_GSP01_e, }; static u32 s_bck[] = { - BWD_BCK_GSP00, - BWD_BCK_GSP01, + dRes_INDEX_BWD_BCK_GSP00_e, + dRes_INDEX_BWD_BCK_GSP01_e, }; J3DModelData* modelData; J3DModel* model; bwds_class* i_this = (bwds_class*)i_actor; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Bwds", BWDS_BDL_KOBOSS_HEAD), + (J3DModelData*)dComIfG_getObjectRes("Bwds", dRes_INDEX_BWDS_BDL_KOBOSS_HEAD_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Bwds", BWDS_BCK_KOBOSS_CLOSE), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Bwds", dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e), J3DFrameCtrl::EMode_NONE, 1.0f, 0, diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index a1a83d921..7c4bd8578 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/src/d/actor/d_a_canon.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_sea.h" -#include "d/res/res_bomber.h" +#include "res/Object/Bomber.h" #include "m_Do/m_Do_ext.h" #include "d/d_2dnumber.h" #include "d/d_kankyo.h" @@ -496,7 +496,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) { /* 00001A38-00001E04 .text CreateHeap__9daCanon_cFv */ BOOL daCanon_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, BOMBER_INDEX_BDL_VCANK); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_BOMBER_BDL_VCANK_e); JUT_ASSERT(823, modelData != NULL); mpModel1 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -504,7 +504,7 @@ BOOL daCanon_c::CreateHeap() { return FALSE; } - J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(M_arcname, BOMBER_INDEX_BMD_AISI); + J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_BOMBER_BMD_AISI_e); JUT_ASSERT(831, modelData2 != NULL); s8 cVar10 = modelData->getJointName()->getIndex("canon"); @@ -515,8 +515,8 @@ BOOL daCanon_c::CreateHeap() { return FALSE; } - ResTIMG* pRVar3 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BOMB_01); - ResTIMG* pRVar4 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BOMB_02); + ResTIMG* pRVar3 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BOMB_01_e); + ResTIMG* pRVar4 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BOMB_02_e); for (s32 i = 0; i < ARRAY_SSIZE(m584); i++) { m584[i] = new dDlst_2DObject_c(); @@ -529,8 +529,8 @@ BOOL daCanon_c::CreateHeap() { } } - ResTIMG* pRVar5 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_SHIP_NODAMAGE); - ResTIMG* pRVar6 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_HUNE_DAMAGE); + ResTIMG* pRVar5 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_SHIP_NODAMAGE_e); + ResTIMG* pRVar6 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_HUNE_DAMAGE_e); // Bug: m5AC only has 5 elements, copy-paste mistake. for (s32 i = 0; i < ARRAY_SSIZE(m584); i++) { @@ -544,10 +544,10 @@ BOOL daCanon_c::CreateHeap() { } } - ResTIMG* pRVar7 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_RULE); - ResTIMG* pRVar8 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BATTERY); - ResTIMG* pRVar9 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BATTERY_BASE); - ResTIMG* pRVar10 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_RUPY_NUM_DEGREE); + ResTIMG* pRVar7 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_RULE_e); + ResTIMG* pRVar8 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BATTERY_e); + ResTIMG* pRVar9 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BATTERY_BASE_e); + ResTIMG* pRVar10 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_RUPY_NUM_DEGREE_e); m5C0 = new dDlst_2DBattery_c(); if (m5C0 == NULL) { diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 02ad8625a..dfc9e4c32 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_bomb2.h" -#include "d/res/res_cc.h" +#include "res/Object/Cc.h" #include "d/d_s_play.h" #include "d/d_snap.h" #include "d/d_com_inf_game.h" @@ -182,7 +182,7 @@ static BOOL daCC_Draw(cc_class* i_this) { if (i_this->m2F9 == 0) { f32 fVar2 = 36.0f; - if ((i_this->m320 == CC_BCK_TACHI2HUSE) || (i_this->m320 == CC_BCK_HUSE_WALK)) { + if ((i_this->m320 == dRes_INDEX_CC_BCK_TACHI2HUSE_e) || (i_this->m320 == dRes_INDEX_CC_BCK_HUSE_WALK_e)) { fVar2 = 50.0f; } @@ -763,9 +763,9 @@ void action_nomal_move(cc_class* i_this) { i_this->mCyl.OffTgSetBit(); i_this->mCyl.ClrCoSet(); i_this->mCyl.ClrTgHit(); - anm_init(i_this, CC_BCK_START, 0.0f, 0, 0.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 0.0f, -1); if (i_this->mBehaviorType == 0) { - anm_init(i_this, CC_BCK_TSTART01, 0.0f, 0, 0.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_TSTART01_e, 0.0f, 0, 0.0f, -1); } i_this->m2F5++; @@ -773,11 +773,11 @@ void action_nomal_move(cc_class* i_this) { if (fopAcM_searchPlayerDistance(&i_this->actor) < i_this->mNoticeRange) { fopAcM_OnStatus(&i_this->actor, fopAcStts_SHOWMAP_e); if (i_this->mBehaviorType == 1) { - anm_init(i_this, CC_BCK_TSTART01, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_TSTART01_e, 0.0f, 0, 1.0f, -1); i_this->m2F5 = 2; } else { fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_ENTER_GND, 0); - anm_init(i_this, CC_BCK_START, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 1.0f, -1); i_this->m2F9 = 0; i_this->actor.gravity = -3.0f; i_this->m2F5 = 3; @@ -802,7 +802,7 @@ void action_nomal_move(cc_class* i_this) { cc_eff_set(i_this, 1); i_this->actor.shape_angle.x = 0; i_this->actor.speed.y = 0.0f; - anm_init(i_this, CC_BCK_TSTART02, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_TSTART02_e, 0.0f, 0, 1.0f, -1); i_this->m2F5 = 3; i_this->mCyl.OnTgSetBit(); i_this->actor.attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; @@ -831,8 +831,8 @@ void action_nomal_move(cc_class* i_this) { i_this->m34E[0] += i_this->m34E[1]; denki_start(i_this); - if (i_this->m320 != CC_BCK_TACHI_WALK) { - anm_init(i_this, CC_BCK_TACHI_WALK, 2.0f, 2, 1.0f, -1); + if (i_this->m320 != dRes_INDEX_CC_BCK_TACHI_WALK_e) { + anm_init(i_this, dRes_INDEX_CC_BCK_TACHI_WALK_e, 2.0f, 2, 1.0f, -1); } fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_MOVE_STAND, 0); @@ -873,7 +873,7 @@ void action_nomal_move(cc_class* i_this) { AT_TYPE_LIGHT_ARROW | AT_TYPE_LIGHT | AT_TYPE_GRAPPLING_HOOK ); i_this->mCyl.OffCoSetBit(); - anm_init(i_this, CC_BCK_TACHI2HUSE, 2.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_TACHI2HUSE_e, 2.0f, 0, 1.0f, -1); i_this->m2F5++; break; @@ -888,7 +888,7 @@ void action_nomal_move(cc_class* i_this) { break; } - anm_init(i_this, CC_BCK_HUSE_WALK, 0.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_HUSE_WALK_e, 0.0f, 2, 1.0f, -1); i_this->m2F5++; case 8: @@ -911,7 +911,7 @@ void action_nomal_move(cc_class* i_this) { case 10: i_this->mCyl.SetTgType(~(AT_TYPE_UNK400000 | AT_TYPE_UNK20000 | AT_TYPE_WATER)); - anm_init(i_this, CC_BCK_HUSE2TACHI, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_HUSE2TACHI_e, 0.0f, 0, 1.0f, -1); fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_LIE_TO_STAND, 0); i_this->m2F5++; break; @@ -969,8 +969,8 @@ void action_oyogu(cc_class* i_this) { fopAcM_seStart(a_this, JA_SE_CM_CC_STAND_TO_LIE, 0); - if (i_this->m320 != CC_BCK_TACHI2HUSE) { - anm_init(i_this, CC_BCK_TACHI2HUSE, 2.0f, 0, 1.0f, -1); + if (i_this->m320 != dRes_INDEX_CC_BCK_TACHI2HUSE_e) { + anm_init(i_this, dRes_INDEX_CC_BCK_TACHI2HUSE_e, 2.0f, 0, 1.0f, -1); } a_this->speedF = 0.0f; @@ -983,9 +983,9 @@ void action_oyogu(cc_class* i_this) { i_this->m2F5++; case 0x15: - if (i_this->m320 == CC_BCK_TACHI2HUSE) { + if (i_this->m320 == dRes_INDEX_CC_BCK_TACHI2HUSE_e) { if (i_this->m2B4->isStop()) { - anm_init(i_this, CC_BCK_HUSE_WALK, 0.0, 2, 1.0, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_HUSE_WALK_e, 0.0, 2, 1.0, -1); } } @@ -1056,7 +1056,7 @@ void action_attack_move(cc_class* i_this) { i_this->mCyl.OnCoSetBit(); fopAcM_monsSeStart(&i_this->actor, JA_SE_CV_CC_ATTACK, 0); i_this->m306 = 0; - anm_init(i_this, CC_BCK_ATACK01, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_ATACK01_e, 0.0f, 0, 1.0f, -1); i_this->m2F5++; case 0x1F: @@ -1071,7 +1071,7 @@ void action_attack_move(cc_class* i_this) { i_this->actor.current.angle.y = fopAcM_searchPlayerAngleY(&i_this->actor); i_this->mCyl.OnAtSPrmBit(cCcD_AtSPrm_Set_e); i_this->mCyl.OnAtHitBit(); - anm_init(i_this, CC_BCK_ATACK02, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_ATACK02_e, 0.0f, 0, 1.0f, -1); fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_ATTACK, 0); i_this->actor.speedF = 18.0f; i_this->actor.gravity = -3.0f; @@ -1097,7 +1097,7 @@ void action_attack_move(cc_class* i_this) { cc_eff_set(i_this, 1); i_this->actor.speedF = 0.0f; - anm_init(i_this, CC_BCK_ATACK03, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_ATACK03_e, 0.0f, 0, 1.0f, -1); i_this->m2F5++; } break; @@ -1165,7 +1165,7 @@ void action_damage_move(cc_class* i_this) { } denki_end(i_this); - anm_init(i_this, CC_BCK_TACHI2HUSE, 0.0f, 0, 0.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_TACHI2HUSE_e, 0.0f, 0, 0.0f, -1); i_this->mCyl.SetTgType(~(AT_TYPE_UNK400000 | AT_TYPE_UNK20000 | AT_TYPE_WATER)); @@ -1199,7 +1199,7 @@ void action_damage_move(cc_class* i_this) { case 4: case 9: - anm_init(i_this, CC_BCK_MAHI, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_MAHI_e, 0.0f, 0, 1.0f, -1); dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &a_this->attention_info.position); i_this->m32C = 0.0f; i_this->m330 = 0.0f; @@ -1291,7 +1291,7 @@ void action_damage_move(cc_class* i_this) { case 0x2b: if (i_this->m34E[4] <= 1) { - anm_init(i_this, CC_BCK_HUKKATSU, 0.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_HUKKATSU_e, 0.0f, 2, 1.0f, -1); i_this->m34E[4] = 0x3c; i_this->m34E[4] += REG8_S(6); i_this->m2F5++; @@ -1310,7 +1310,7 @@ void action_damage_move(cc_class* i_this) { case 0x2d: i_this->m301 = 1; - i_this->m2D8->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", CC_BCK_CC_PTCL), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL); + i_this->m2D8->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BCK_CC_PTCL_e), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL); pJVar6 = dComIfGp_particle_set(dPa_name::ID_AK_SN_CCSPLIT00, &a_this->attention_info.position, &a_this->current.angle); if (pJVar6 != NULL) { @@ -1338,7 +1338,7 @@ void action_damage_move(cc_class* i_this) { i_this->m301 = 0; i_this->mStts.SetWeight(0x32); i_this->mCyl.SetTgType(~(AT_TYPE_UNK400000 | AT_TYPE_UNK20000 | AT_TYPE_WATER)); - anm_init(i_this, CC_BCK_HUSE2TACHI, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_HUSE2TACHI_e, 0.0f, 0, 1.0f, -1); fopAcM_seStart(a_this, JA_SE_CM_CC_LIE_TO_STAND, 0); a_this->shape_angle.y = fopAcM_searchPlayerAngleY(a_this); @@ -1409,7 +1409,7 @@ void action_dead_move(cc_class* i_this) { fopAcM_seStart(a_this, JA_SE_CM_CC_DIE_SWING, 0); fopAcM_monsSeStart(a_this, JA_SE_CV_CC_DIE, 0); - i_this->m2BC->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", CC_BCK_CC_BETA), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL); + i_this->m2BC->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BCK_CC_BETA_e), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL); a_this->speedF = 0.0f; a_this->speed.x = 0.0f; a_this->speed.y = 0.0f; @@ -1536,7 +1536,7 @@ void deku_ret_demo(cc_class* i_this) { case 3: if (i_this->m34E[5] == 0) { - anm_init(i_this, CC_BCK_START, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 1.0f, -1); DEMO_RET_START_FLAG = 2; i_this->m34E[5] = 0x50; if (DEMO_SHORT_CUT_FLAG != 0) { @@ -1585,13 +1585,13 @@ void action_noboru(cc_class* i_this) { i_this->m3BA = -0x4000; i_this->m2FB = 0; a_this->attention_info.flags = 0; - anm_init(i_this, CC_BCK_DEKU_START, 0.0f, 0, 0.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_DEKU_START_e, 0.0f, 0, 0.0f, -1); i_this->m2F5++; case 0x3d: if (i_this->m2FB >= 1) { fopAcM_seStart(a_this, JA_SE_CM_CC_ENTER_GND, 0); - anm_init(i_this, CC_BCK_DEKU_START, 0.0, 0, 1.0, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_DEKU_START_e, 0.0, 0, 1.0, -1); i_this->m2F5++; } break; @@ -1601,7 +1601,7 @@ void action_noboru(cc_class* i_this) { break; } i_this->m344 = cM_rndF(43.0f); - anm_init(i_this, CC_BCK_TACHI_WALK, 1.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_TACHI_WALK_e, 1.0f, 2, 1.0f, -1); i_this->m2F5++; case 0x3f: @@ -1613,7 +1613,7 @@ void action_noboru(cc_class* i_this) { break; } - anm_init(i_this, CC_BCK_ATACK01, 0.0, 0, 1.0, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_ATACK01_e, 0.0, 0, 1.0, -1); i_this->m2F5 = i_this->m2F5 + 1; case 0x40: @@ -1627,7 +1627,7 @@ void action_noboru(cc_class* i_this) { case 0x41: fopAcM_monsSeStart(a_this, JA_SE_CV_CC_ATTACK, 0); - anm_init(i_this, CC_BCK_ATACK02, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_ATACK02_e, 0.0f, 0, 1.0f, -1); i_this->m3BA = 0; a_this->current.angle.x = 0; a_this->current.angle.y = 0; @@ -1638,7 +1638,7 @@ void action_noboru(cc_class* i_this) { a_this->shape_angle.z = a_this->current.angle.z; i_this->m2FB = 3; - anm_init(i_this, CC_BCK_ATACK02, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_ATACK02_e, 0.0f, 0, 1.0f, -1); fopAcM_seStart(a_this, JA_SE_CM_CC_ATTACK, 0); a_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; @@ -1656,7 +1656,7 @@ void action_noboru(cc_class* i_this) { case 0x42: if (i_this->mAcch.ChkGroundHit()) { - anm_init(i_this, CC_BCK_ATACK03, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_ATACK03_e, 0.0f, 0, 1.0f, -1); fopAcM_seStart(a_this, JA_SE_CM_CC_LANDING, dComIfG_Bgsp()->GetMtrlSndId(i_this->mAcch.m_gnd)); cc_eff_set(i_this, 1); @@ -1687,8 +1687,8 @@ void action_noboru(cc_class* i_this) { DEMO_SELECT(i_this->m368, i_this->m390).remove(); a_this->attention_info.flags = 0; - if (i_this->m320 != CC_BCK_TACHI_WALK) { - anm_init(i_this, CC_BCK_TACHI2HUSE, 0.0f, 0, 0.0f, -1); + if (i_this->m320 != dRes_INDEX_CC_BCK_TACHI_WALK_e) { + anm_init(i_this, dRes_INDEX_CC_BCK_TACHI2HUSE_e, 0.0f, 0, 0.0f, -1); } fopAcM_seStart(a_this, JA_SE_CM_CC_STAND_TO_LIE, 0); @@ -1725,7 +1725,7 @@ void action_noboru(cc_class* i_this) { if (i_this->m2FD != 0) { i_this->m34E[0] = 0x3c; } - anm_init(i_this, CC_BCK_START, 0.0f, 0, 0.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 0.0f, -1); i_this->m2FB = 4; i_this->m3BA = -0x4000; i_this->m2F5++; @@ -1734,7 +1734,7 @@ void action_noboru(cc_class* i_this) { if (DEMO_RET_START_FLAG == 2) { fopAcM_seStart(a_this, JA_SE_CM_CC_LIE_TO_STAND, 0); i_this->m334 = 1.0; - anm_init(i_this, CC_BCK_START, 0.0f, 0, 1.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 1.0f, -1); i_this->m2F5 = 0x3e; } @@ -1748,8 +1748,8 @@ void action_noboru(cc_class* i_this) { case 0x47: deku_ret_demo(i_this); - if (DEMO_RET_START_FLAG >= 2 && i_this->m320 == CC_BCK_START && i_this->m2B4->isStop()) { - anm_init(i_this, CC_BCK_TACHI_WALK, 1.0f, 2, 1.0f, -1); + if (DEMO_RET_START_FLAG >= 2 && i_this->m320 == dRes_INDEX_CC_BCK_START_e && i_this->m2B4->isStop()) { + anm_init(i_this, dRes_INDEX_CC_BCK_TACHI_WALK_e, 1.0f, 2, 1.0f, -1); } } @@ -1770,7 +1770,7 @@ void action_up_check(cc_class* i_this) { i_this->mCyl.OnTgShield(); i_this->mCyl.OnTgSetBit(); i_this->mCyl.SetTgType(~(AT_TYPE_UNK400000 | AT_TYPE_UNK20000 | AT_TYPE_WATER)); - anm_init(i_this, CC_BCK_MAHI, 0.0f, 0, 0.0f, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_MAHI_e, 0.0f, 0, 0.0f, -1); #if VERSION > VERSION_DEMO i_this->m2F9 = 0; #endif @@ -2055,7 +2055,7 @@ void action_tubo_search(cc_class* i_this) { i_this->mCyl.OnAtVsBitSet(cCcD_TgSPrm_IsOther_e); i_this->mCyl.OffAtVsBitSet(cCcD_TgSPrm_IsPlayer_e); - anm_init(i_this, CC_BCK_HUSE2TACHI, 0.0, 0, 1.0, -1); + anm_init(i_this, dRes_INDEX_CC_BCK_HUSE2TACHI_e, 0.0, 0, 1.0, -1); fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_LIE_TO_STAND, 0); denki_start(i_this); i_this->actor.gravity = -3.0; @@ -2316,7 +2316,7 @@ static BOOL daCC_Execute(cc_class* i_this) { i_this->mCyl.SetC(i_this->actor.current.pos); f32 fVar8 = 100.0f; - if (i_this->m320 == CC_BCK_HUSE_WALK) { + if (i_this->m320 == dRes_INDEX_CC_BCK_HUSE_WALK_e) { fVar8 = 30.0f; } i_this->mCyl.SetH(fVar8); @@ -2365,15 +2365,15 @@ static BOOL daCC_Delete(cc_class* i_this) { static BOOL useHeapInit(fopAc_ac_c* a_this) { cc_class* i_this = (cc_class*)a_this; - s32 fileIndex = CC_BCK_START; + s32 fileIndex = dRes_INDEX_CC_BCK_START_e; if (i_this->mBehaviorType == 1) { - fileIndex = CC_BCK_TSTART01; + fileIndex = dRes_INDEX_CC_BCK_TSTART01_e; } else if (i_this->mBehaviorType == 2) { - fileIndex = CC_BCK_HUSE2TACHI; + fileIndex = dRes_INDEX_CC_BCK_HUSE2TACHI_e; } i_this->m2B4 = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("CC", CC_BMD_CC), + (J3DModelData*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BMD_CC_e), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("CC", fileIndex), @@ -2406,14 +2406,14 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2B8->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC), true, J3DFrameCtrl::EMode_NONE + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BRK_CC_e), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; } i_this->m2C4 = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("CC", CC_BDL_CC_IWA), NULL, NULL, NULL, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0, 0x11020203 + (J3DModelData*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BDL_CC_IWA_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0, 0x11020203 ); if (i_this->m2C4 == NULL || i_this->m2C4->getModel() == NULL) { @@ -2427,7 +2427,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2C8->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_IWA01), true, J3DFrameCtrl::EMode_NONE + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BRK_CC_IWA01_e), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; @@ -2439,7 +2439,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2CC->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_IWA02), true, J3DFrameCtrl::EMode_NONE + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BRK_CC_IWA02_e), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; @@ -2451,7 +2451,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2D0->init( - model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", CC_BTK_CC_IWA01), true, J3DFrameCtrl::EMode_NONE + model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BTK_CC_IWA01_e), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; @@ -2463,14 +2463,14 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2D4->init( - model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", CC_BTK_CC_IWA02), true, J3DFrameCtrl::EMode_NONE + model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BTK_CC_IWA02_e), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; } i_this->m2BC = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("CC", CC_BDL_CC_BETA), NULL, NULL, NULL, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0, 0x11020203 + (J3DModelData*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BDL_CC_BETA_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0, 0x11020203 ); if (i_this->m2BC == NULL || i_this->m2BC->getModel() == NULL) { @@ -2484,17 +2484,17 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2C0->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_BETA), true, J3DFrameCtrl::EMode_NONE + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BRK_CC_BETA_e), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; } i_this->m2D8 = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("CC", CC_BDL_CC_PTCL), + (J3DModelData*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BDL_CC_PTCL_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("CC", CC_BCK_CC_PTCL), + (J3DAnmTransform*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BCK_CC_PTCL_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1, diff --git a/src/d/actor/d_a_coming3.cpp b/src/d/actor/d_a_coming3.cpp index 321c44832..a7ef0364c 100644 --- a/src/d/actor/d_a_coming3.cpp +++ b/src/d/actor/d_a_coming3.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_obj_barrel2.h" -#include "d/res/res_always.h" +#include "res/Object/Always.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_wtr_chk.h" @@ -334,8 +334,8 @@ void daComing3::Act_c::eff_break_tsubo() { J3DAnmTexPattern* texPattern; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPM_TUBO); - texPattern = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", ALWAYS_BTP_MPM_TUBO); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPM_TUBO_e); + texPattern = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTP_MPM_TUBO_e); JPABaseEmitter* baseEmitter = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_AK_JN_M_TUBOHAHEN, &sp1C, NULL, &sp34); if (baseEmitter != NULL) { @@ -422,7 +422,7 @@ BOOL daComing3::Act_c::solidHeapCB(fopAc_ac_c* a_this) { /* 00001804-000018CC .text create_heap__Q29daComing35Act_cFv */ bool daComing3::Act_c::create_heap() { - J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, ALWAYS_BDL_OBM_KOTUBO1); + J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_ALWAYS_BDL_OBM_KOTUBO1_e); JUT_ASSERT(846, mdl_data != NULL); unk_440 = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203); diff --git a/src/d/actor/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp index 406479f7f..90520e811 100644 --- a/src/d/actor/d_a_dai.cpp +++ b/src/d/actor/d_a_dai.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_dai.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_dai_item.h" -#include "d/res/res_fdai.h" +#include "res/Object/Fdai.h" #include "d/d_item.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -63,7 +63,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) { /* 000000E4-000001A0 .text CreateHeap__7daDai_cFv */ BOOL daDai_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, FDAI_BDL_FDAI); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_FDAI_BDL_FDAI_e); JUT_ASSERT(415, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index 577f386aa..ecce612c5 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/src/d/actor/d_a_dai_item.cpp @@ -8,37 +8,37 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_kankyo_wether.h" #include "d/d_s_play.h" -#include "d/res/res_fdai.h" -#include "d/res/res_cloth.h" +#include "res/Object/Fdai.h" +#include "res/Object/Cloth.h" const char daStandItem_c::m_arcname[] = "Fdai"; const s16 daStandItem_c::m_bmdidx[] = { - FDAI_BDL_FOBJ00, /* dItemNo_TOWN_FLOWER_e */ - FDAI_BDL_FOBJ01, /* dItemNo_SEA_FLOWER_e */ - FDAI_BDL_FOBJ02, /* dItemNo_EXOTIC_FLOWER_e */ - FDAI_BDL_FOBJ03, /* dItemNo_HEROS_FLAG_e */ - FDAI_BDL_FOBJ04, /* dItemNo_BIG_CATCH_FLAG_e */ - FDAI_BDL_FOBJ05, /* dItemNo_BIG_SALE_FLAG_e */ - FDAI_BDL_FOBJ06, /* dItemNo_PINWHEEL_e */ - FDAI_BDL_FOBJ07, /* dItemNo_SICKLE_MOON_FLAG_e */ - FDAI_BDL_FOBJ08, /* dItemNo_SKULL_TOWER_IDOL_e */ - FDAI_BDL_FOBJ09, /* dItemNo_FOUNTAIN_IDOL_e */ - FDAI_BDL_FOBJ10, /* dItemNo_POSTMAN_STATUE_e */ - FDAI_BDL_FOBJ11, /* dItemNo_SHOP_GURU_STATUE_e */ + dRes_INDEX_FDAI_BDL_FOBJ00_e, /* dItemNo_TOWN_FLOWER_e */ + dRes_INDEX_FDAI_BDL_FOBJ01_e, /* dItemNo_SEA_FLOWER_e */ + dRes_INDEX_FDAI_BDL_FOBJ02_e, /* dItemNo_EXOTIC_FLOWER_e */ + dRes_INDEX_FDAI_BDL_FOBJ03_e, /* dItemNo_HEROS_FLAG_e */ + dRes_INDEX_FDAI_BDL_FOBJ04_e, /* dItemNo_BIG_CATCH_FLAG_e */ + dRes_INDEX_FDAI_BDL_FOBJ05_e, /* dItemNo_BIG_SALE_FLAG_e */ + dRes_INDEX_FDAI_BDL_FOBJ06_e, /* dItemNo_PINWHEEL_e */ + dRes_INDEX_FDAI_BDL_FOBJ07_e, /* dItemNo_SICKLE_MOON_FLAG_e */ + dRes_INDEX_FDAI_BDL_FOBJ08_e, /* dItemNo_SKULL_TOWER_IDOL_e */ + dRes_INDEX_FDAI_BDL_FOBJ09_e, /* dItemNo_FOUNTAIN_IDOL_e */ + dRes_INDEX_FDAI_BDL_FOBJ10_e, /* dItemNo_POSTMAN_STATUE_e */ + dRes_INDEX_FDAI_BDL_FOBJ11_e, /* dItemNo_SHOP_GURU_STATUE_e */ }; const s16 daStandItem_c::m_bckidx[] = { - FDAI_BCK_FOBJ00, /* dItemNo_TOWN_FLOWER_e */ - FDAI_BCK_FOBJ01, /* dItemNo_SEA_FLOWER_e */ - FDAI_BCK_FOBJ02, /* dItemNo_EXOTIC_FLOWER_e */ + dRes_INDEX_FDAI_BCK_FOBJ00_e, /* dItemNo_TOWN_FLOWER_e */ + dRes_INDEX_FDAI_BCK_FOBJ01_e, /* dItemNo_SEA_FLOWER_e */ + dRes_INDEX_FDAI_BCK_FOBJ02_e, /* dItemNo_EXOTIC_FLOWER_e */ -1, /* dItemNo_HEROS_FLAG_e */ -1, /* dItemNo_BIG_CATCH_FLAG_e */ - FDAI_BCK_FOBJ05, /* dItemNo_BIG_SALE_FLAG_e */ + dRes_INDEX_FDAI_BCK_FOBJ05_e, /* dItemNo_BIG_SALE_FLAG_e */ -1, /* dItemNo_PINWHEEL_e */ - FDAI_BCK_FOBJ07, /* dItemNo_SICKLE_MOON_FLAG_e */ - FDAI_BCK_FOBJ08, /* dItemNo_SKULL_TOWER_IDOL_e */ - FDAI_BCK_FOBJ09, /* dItemNo_FOUNTAIN_IDOL_e */ - FDAI_BCK_FOBJ10, /* dItemNo_POSTMAN_STATUE_e */ - FDAI_BCK_FOBJ11, /* dItemNo_SHOP_GURU_STATUE_e */ + dRes_INDEX_FDAI_BCK_FOBJ07_e, /* dItemNo_SICKLE_MOON_FLAG_e */ + dRes_INDEX_FDAI_BCK_FOBJ08_e, /* dItemNo_SKULL_TOWER_IDOL_e */ + dRes_INDEX_FDAI_BCK_FOBJ09_e, /* dItemNo_FOUNTAIN_IDOL_e */ + dRes_INDEX_FDAI_BCK_FOBJ10_e, /* dItemNo_POSTMAN_STATUE_e */ + dRes_INDEX_FDAI_BCK_FOBJ11_e, /* dItemNo_SHOP_GURU_STATUE_e */ }; const u16 daStandItem_c::m_heapsize[] = { 0x2000, /* dItemNo_TOWN_FLOWER_e */ @@ -263,10 +263,10 @@ BOOL daStandItem_c::CreateHeap() { }; u32 clothTimgRes[] = { - FDAI_BTI_FTEX03, - FDAI_BTI_FTEX04, - FDAI_BTI_FTEX05, - FDAI_BTI_FTEX07, + dRes_INDEX_FDAI_BTI_FTEX03_e, + dRes_INDEX_FDAI_BTI_FTEX04_e, + dRes_INDEX_FDAI_BTI_FTEX05_e, + dRes_INDEX_FDAI_BTI_FTEX07_e, }; switch (mItemNo) { @@ -286,7 +286,7 @@ BOOL daStandItem_c::CreateHeap() { } ResTIMG* clothTimg = (ResTIMG*)dComIfG_getObjectRes(m_arcname, clothTimgRes[mClothType]); - ResTIMG* clothToonTimg = (ResTIMG*)dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON); + ResTIMG* clothToonTimg = (ResTIMG*)dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e); mpCloth = clothFunc[mClothType](clothTimg, clothToonTimg, &tevStr, VobjFlagPosTbl[mClothType]); if (mpCloth == NULL) return FALSE; diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index c420aebb0..690810652 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -15,7 +15,7 @@ #include "d/d_lib.h" #include "d/d_s_play.h" #include "d/d_snap.h" -#include "d/res/res_daiocta.h" +#include "res/Object/Daiocta.h" static daDaiocta_HIO_c l_HIO; @@ -268,16 +268,16 @@ BOOL daDaiocta_c::createAwaHeap() { J3DAnmTextureSRTKey* btk; J3DAnmTevRegKey* brk; - modelData = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_GAWA00)); + modelData = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BDL_GAWA00_e)); JUT_ASSERT(516, modelData != NULL); - bck = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BCK_GAWA00)); + bck = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BCK_GAWA00_e)); JUT_ASSERT(520, bck != NULL); - btk = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_GAWA00)); + btk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_GAWA00_e)); JUT_ASSERT(524, btk != NULL); - brk = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_GAWA00)); + brk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_GAWA00_e)); JUT_ASSERT(528, brk != NULL); @@ -309,7 +309,7 @@ BOOL daDaiocta_c::createAwaHeap() { /* 000009B8-00000ABC .text createSuikomiHeap__11daDaiocta_cFv */ BOOL daDaiocta_c::createSuikomiHeap() { - J3DModelData* modelData = (J3DModelData * ) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_GDO_SUI00); + J3DModelData* modelData = (J3DModelData * ) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BDL_GDO_SUI00_e); JUT_ASSERT(551, modelData != NULL); // "suikomi" translates to suction @@ -319,8 +319,8 @@ BOOL daDaiocta_c::createSuikomiHeap() { return FALSE; } - if (!dLib_brkInit(modelData, &mBrkAnm2, m_arc_name, DAIOCTA_BRK_GDO_SUI00) || - !dLib_btkInit(modelData, &mBtkAnm, m_arc_name, DAIOCTA_BTK_GDO_SUI00)) { + if (!dLib_brkInit(modelData, &mBrkAnm2, m_arc_name, dRes_INDEX_DAIOCTA_BRK_GDO_SUI00_e) || + !dLib_btkInit(modelData, &mBtkAnm, m_arc_name, dRes_INDEX_DAIOCTA_BTK_GDO_SUI00_e)) { return FALSE; } @@ -329,10 +329,10 @@ BOOL daDaiocta_c::createSuikomiHeap() { /* 00000ABC-00000C04 .text createBodyHeap__11daDaiocta_cFv */ BOOL daDaiocta_c::createBodyHeap() { - J3DModelData* modelData = (J3DModelData *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_DO_MAIN1); + J3DModelData* modelData = (J3DModelData *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BDL_DO_MAIN1_e); JUT_ASSERT(579, modelData != NULL); - if (!dLib_brkInit(modelData, &mBrkAnm1, m_arc_name, DAIOCTA_BRK_WAIT1)) { + if (!dLib_brkInit(modelData, &mBrkAnm1, m_arc_name, dRes_INDEX_DAIOCTA_BRK_WAIT1_e)) { return FALSE; } @@ -1069,10 +1069,10 @@ void daDaiocta_c::modeDemoInit() { setEffect(dPa_name::ID_IT_SN_DO_SUIKOMIC00); J3DModelData* model_data_p = mpSuikomiModel->getModelData(); - J3DAnmTevRegKey* brk = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_GDO_SUI00)); + J3DAnmTevRegKey* brk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_GDO_SUI00_e)); JUT_ASSERT(VERSION_SELECT(1334, 1340, 1350, 1350), brk != NULL); - J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_GDO_SUI00)); + J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_GDO_SUI00_e)); JUT_ASSERT(VERSION_SELECT(1337, 1343, 1353, 1353), btk != NULL); mBrkAnm2.init( @@ -1349,13 +1349,13 @@ void daDaiocta_c::setAnm() { } static const s32 a_brk_anm_idx_tbl[] = { - DAIOCTA_BRK_WAIT1, - DAIOCTA_BRK_DAMAGE1, - DAIOCTA_BRK_DAMAGE2, - DAIOCTA_BRK_DEATH1, - DAIOCTA_BRK_SUIKOMU1, - DAIOCTA_BRK_DEATH2, - DAIOCTA_BRK_HAKIDASU1 + dRes_INDEX_DAIOCTA_BRK_WAIT1_e, + dRes_INDEX_DAIOCTA_BRK_DAMAGE1_e, + dRes_INDEX_DAIOCTA_BRK_DAMAGE2_e, + dRes_INDEX_DAIOCTA_BRK_DEATH1_e, + dRes_INDEX_DAIOCTA_BRK_SUIKOMU1_e, + dRes_INDEX_DAIOCTA_BRK_DEATH2_e, + dRes_INDEX_DAIOCTA_BRK_HAKIDASU1_e }; static const s32 a_brk_anm_prm_tbl[] = { diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index b96c14ba6..1b13ce619 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -11,7 +11,7 @@ #include "d/d_bg_s_func.h" #include "d/d_cc_d.h" #include "d/d_lib.h" -#include "d/res/res_daiocta.h" +#include "res/Object/Daiocta.h" const s32 daDaiocta_Eye_c::m_heapsize = 2848; const char daDaiocta_Eye_c::m_arc_name[] = "daiocta"; @@ -115,7 +115,7 @@ BOOL daDaiocta_Eye_c::_createHeap() { } }; - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_DO_EYE1)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BDL_DO_EYE1_e)); JUT_ASSERT(0xE9, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222); @@ -126,7 +126,7 @@ BOOL daDaiocta_Eye_c::_createHeap() { mpModel->setUserArea((u32)this); - mpBrk = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_A1)); + mpBrk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_DAMAGE_EYE_A1_e)); if (!mpBrk) { return FALSE; @@ -142,7 +142,7 @@ BOOL daDaiocta_Eye_c::_createHeap() { return FALSE; } - mpBtk = static_cast(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_A1)); + mpBtk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_DAMAGE_EYE_A1_e)); if (!mpBtk) { return FALSE; @@ -291,13 +291,13 @@ void daDaiocta_Eye_c::modeDamageInit() { mbIsDamaged = true; J3DModelData* model_data_p = mpModel->getModelData(); - mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_A1); + mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_DAMAGE_EYE_A1_e); mBrkAnm.init( model_data_p, mpBrk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE ); - mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_A1); + mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_DAMAGE_EYE_A1_e); mBtkAnm.init( model_data_p, mpBtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, @@ -336,13 +336,13 @@ void daDaiocta_Eye_c::modeDeathInit() { mMode = MODE_DEATH; mbIsDamaged = true; mEyeScale.setall(1.0f); - mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_B1); + mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_DAMAGE_EYE_B1_e); mBrkAnm.init( mpModel->getModelData(), mpBrk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE ); - mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_B1); + mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_DAMAGE_EYE_B1_e); mBtkAnm.init( mpModel->getModelData(), mpBtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index e96657dd7..cab252241 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_deku_item.h" -#include "d/res/res_deku.h" +#include "res/Object/Deku.h" #include "d/d_com_inf_game.h" const char daDekuItem_c::m_arcname[] = "Deku"; @@ -59,7 +59,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000000F0-000002C8 .text CreateHeap__12daDekuItem_cFv */ BOOL daDekuItem_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, DEKU_BDL_VLFDM); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_DEKU_BDL_VLFDM_e); JUT_ASSERT(0xF4, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U); @@ -68,14 +68,14 @@ BOOL daDekuItem_c::CreateHeap() { return FALSE; } - J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDK); + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_DEKU_BCK_VLFDK_e); JUT_ASSERT(0x103, pbck != NULL); if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } - pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDM); + pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_DEKU_BCK_VLFDM_e); JUT_ASSERT(0x110, pbck != NULL); if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE)) { diff --git a/src/d/actor/d_a_demo_dk.cpp b/src/d/actor/d_a_demo_dk.cpp index 531dfdde4..6319be1ad 100644 --- a/src/d/actor/d_a_demo_dk.cpp +++ b/src/d/actor/d_a_demo_dk.cpp @@ -8,7 +8,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" -#include "d/res/res_demo_dk.h" +#include "res/Object/Demo_Dk.h" /* 00000078-000000E8 .text daDEMO_DK_Draw__FP13demo_dk_class */ static BOOL daDEMO_DK_Draw(demo_dk_class* i_this) { @@ -39,10 +39,10 @@ void mode_wait(demo_dk_class* i_this) { } if (i_this->unk_2C0 == 0 && cM_rnd() < tmp) { - anm_init(i_this, DEMO_DK_BCK_DK_L_AKUBI1, 5.0f, 0, 1.0f, 0); + anm_init(i_this, dRes_INDEX_DEMO_DK_BCK_DK_L_AKUBI1_e, 5.0f, 0, 1.0f, 0); i_this->unk_2B6 = 1; } else { - anm_init(i_this, DEMO_DK_BCK_DK_L_WAIT1, 0.0f, 0, 1.0f, 0); + anm_init(i_this, dRes_INDEX_DEMO_DK_BCK_DK_L_WAIT1_e, 0.0f, 0, 1.0f, 0); } } } @@ -50,7 +50,7 @@ void mode_wait(demo_dk_class* i_this) { /* 000002EC-00000378 .text mode_akubi__FP13demo_dk_class */ void mode_akubi(demo_dk_class* i_this) { if (i_this->mpMorf->isStop()) { - anm_init(i_this, DEMO_DK_BCK_DK_L_WAIT1, 5.0f, 0, 2.0f, 0); + anm_init(i_this, dRes_INDEX_DEMO_DK_BCK_DK_L_WAIT1_e, 5.0f, 0, 2.0f, 0); i_this->unk_2C0 = 3; i_this->unk_2B6 = 0; } @@ -109,9 +109,9 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { demo_dk_class* i_this = (demo_dk_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("DEMO_DK", DEMO_DK_BMD_DK_L), + (J3DModelData*)dComIfG_getObjectRes("DEMO_DK", dRes_INDEX_DEMO_DK_BMD_DK_L_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("DEMO_DK", DEMO_DK_BCK_DK_L_WAIT1), + (J3DAnmTransform*)dComIfG_getObjectRes("DEMO_DK", dRes_INDEX_DEMO_DK_BCK_DK_L_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0, 0x11020203); if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) { @@ -141,7 +141,7 @@ static cPhs_State daDEMO_DK_Create(fopAc_ac_c* a_this) { a_this->scale.x = 1.0f; a_this->scale.y = 1.0f; a_this->scale.z = 1.0f; - anm_init(i_this, DEMO_DK_BCK_DK_L_WAIT1, 0.0f, 0, 1.0f, 0); + anm_init(i_this, dRes_INDEX_DEMO_DK_BCK_DK_L_WAIT1_e, 0.0f, 0, 1.0f, 0); } return ret; } diff --git a/src/d/actor/d_a_demo_kmm.cpp b/src/d/actor/d_a_demo_kmm.cpp index dfdc75a13..a87f31647 100644 --- a/src/d/actor/d_a_demo_kmm.cpp +++ b/src/d/actor/d_a_demo_kmm.cpp @@ -8,7 +8,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" -#include "d/res/res_demo_kmm.h" +#include "res/Object/Demo_Kmm.h" const char daDemo_Kmm_c::M_arcname[] = "Demo_Kmm"; @@ -19,11 +19,11 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) { /* 00000098-00000190 .text CreateHeap__12daDemo_Kmm_cFv */ BOOL daDemo_Kmm_c::CreateHeap() { - mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectIDRes(M_arcname, DEMO_KMM_BMD_KA), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203); + mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectIDRes(M_arcname, dRes_ID_DEMO_KMM_BMD_KA_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203); if (mpMorf == NULL || mpMorf->getModel() == NULL) { return FALSE; } - setAnime(DEMO_KMM_BCK_KA_WAIT1, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f); + setAnime(dRes_ID_DEMO_KMM_BCK_KA_WAIT1_e, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f); return TRUE; } @@ -37,8 +37,8 @@ void daDemo_Kmm_c::calcMtx() { } /* 00000228-000002D0 .text setAnime__12daDemo_Kmm_cFiiff */ -void daDemo_Kmm_c::setAnime(int animIdx, int loopMode, float morf, float playSpeed) { - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, animIdx), loopMode, morf, playSpeed, 0.0f, -1.0f, NULL); +void daDemo_Kmm_c::setAnime(int animId, int loopMode, f32 morf, f32 playSpeed) { + mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, animId), loopMode, morf, playSpeed, 0.0f, -1.0f, NULL); } /* 000002D0-00000308 .text CreateInit__12daDemo_Kmm_cFv */ diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index 01c377b8f..075e2222f 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_dk.h" -#include "d/res/res_dk.h" +#include "res/Object/Dk.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "m_Do/m_Do_ext.h" @@ -311,10 +311,10 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { dk_class* a_this = (dk_class*)i_this; mDoExt_McaMorf* morf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectIDRes("Dk", DK_BDL_DK), + (J3DModelData*)dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectIDRes("Dk", DK_BCK_FLY1), + (J3DAnmTransform*)dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BCK_FLY1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -337,7 +337,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { } a_this->field_0x2B8->getModel()->setUserArea((u32) a_this); - J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", DK_BDL_DK_KAMEN); + J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_KAMEN_e); a_this->mpModelKamen = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020002); #if VERSION > VERSION_DEMO if (a_this->mpModelKamen == NULL) { @@ -345,7 +345,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { } #endif - modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", DK_BDL_DK_TAIL); + modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_TAIL_e); JUT_ASSERT(DEMO_SELECT(817, 819), modelData != NULL); for (s32 i = 0; i < 4; i++) { diff --git a/src/d/actor/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp index fb4e5a562..314989595 100644 --- a/src/d/actor/d_a_door10.cpp +++ b/src/d/actor/d_a_door10.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_door10.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/res/res_doorbs.h" +#include "res/Object/DoorBs.h" /* 00000078-000000C8 .text chkMakeKey__10daDoor10_cFv */ s32 daDoor10_c::chkMakeKey() { @@ -302,9 +302,9 @@ BOOL daDoor10_c::CreateHeap() { cBgD_t* cBgD; if (m364 != 0) { if (m364 == 4) { - cBgD = (cBgD_t*)dComIfG_getObjectRes("DoorBs", DOORBS_DZB_DOOR20_D); + cBgD = (cBgD_t*)dComIfG_getObjectRes("DoorBs", dRes_INDEX_DOORBS_DZB_DOOR20_D_e); } else { - cBgD = (cBgD_t*)dComIfG_getObjectRes("DoorBs", DOORBS_DZB_DOOR20_K); + cBgD = (cBgD_t*)dComIfG_getObjectRes("DoorBs", dRes_INDEX_DOORBS_DZB_DOOR20_K_e); } } else { cBgD = (cBgD_t*)dComIfG_getStageRes("Stage", getDzbName()); diff --git a/src/d/actor/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp index 1d0a9dbef..d06211e59 100644 --- a/src/d/actor/d_a_door12.cpp +++ b/src/d/actor/d_a_door12.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door12.h" #include "d/actor/d_a_player.h" -#include "d/res/res_door12.h" +#include "res/Object/door12.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -319,7 +319,7 @@ char* daDoor12_c::getArcName() { /* 000009B0-000009E0 .text getBdlLf__10daDoor12_cFv */ s32 daDoor12_c::getBdlLf() { static s32 bldLf_table[] = { - DOOR12_BDL_DOOR12_GL, DOOR12_BDL_DOOR12M_L, DOOR12_BDL_DOOR12B_L, DOOR12_BDL_DOOR12_GR, DOOR12_BDL_DOOR12M_R, DOOR12_BDL_DOOR12B_R + dRes_INDEX_DOOR12_BDL_DOOR12_GL_e, dRes_INDEX_DOOR12_BDL_DOOR12M_L_e, dRes_INDEX_DOOR12_BDL_DOOR12B_L_e, dRes_INDEX_DOOR12_BDL_DOOR12_GR_e, dRes_INDEX_DOOR12_BDL_DOOR12M_R_e, dRes_INDEX_DOOR12_BDL_DOOR12B_R_e }; return bldLf_table[getShapeType()]; } @@ -327,7 +327,7 @@ s32 daDoor12_c::getBdlLf() { /* 000009E0-00000A10 .text getBdlRt__10daDoor12_cFv */ s32 daDoor12_c::getBdlRt() { static s32 bldRf_table[] = { - DOOR12_BDL_DOOR12_GR, DOOR12_BDL_DOOR12M_R, DOOR12_BDL_DOOR12B_R, DOOR12_BDL_DOOR12_GL, DOOR12_BDL_DOOR12M_L, DOOR12_BDL_DOOR12B_L + dRes_INDEX_DOOR12_BDL_DOOR12_GR_e, dRes_INDEX_DOOR12_BDL_DOOR12M_R_e, dRes_INDEX_DOOR12_BDL_DOOR12B_R_e, dRes_INDEX_DOOR12_BDL_DOOR12_GL_e, dRes_INDEX_DOOR12_BDL_DOOR12M_L_e, dRes_INDEX_DOOR12_BDL_DOOR12B_L_e }; return bldRf_table[getShapeType()]; } @@ -336,16 +336,16 @@ s32 daDoor12_c::getBdlRt() { s32 daDoor12_c::getDzb() { switch (getShapeType()) { case 2: - return DOOR12_DZB_DOOR12_B; + return dRes_INDEX_DOOR12_DZB_DOOR12_B_e; case 3: case 4: - return DOOR12_DZB_DOOR12_G; + return dRes_INDEX_DOOR12_DZB_DOOR12_G_e; case 5: - return DOOR12_DZB_DOOR12_B; + return dRes_INDEX_DOOR12_DZB_DOOR12_B_e; } - return DOOR12_DZB_DOOR12_G; + return dRes_INDEX_DOOR12_DZB_DOOR12_G_e; } /* 00000A6C-00000ACC .text openWide__10daDoor12_cFv */ diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 82944d090..1408877ac 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_dr.h" -#include "d/res/res_dr.h" +#include "res/Object/Dr.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -71,14 +71,14 @@ static void move(dr_class* i_this) { switch (i_this->mMode) { case 0: isIdle = true; - anm_init(i_this, DR_BCK_DR_WAIT1, l_HIO.mWait1Morf, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_DR_BCK_DR_WAIT1_e, l_HIO.mWait1Morf, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode++; 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::EMode_NONE, 1.0f, DR_BAS_AKUBI1); + anm_init(i_this, dRes_INDEX_DR_BCK_DR_AKUBI1_e, l_HIO.mAkubi1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_DR_BAS_AKUBI1_e); i_this->mMode++; } break; @@ -89,7 +89,7 @@ static void move(dr_class* i_this) { } break; case 10: - anm_init(i_this, DR_BCK_DR_BIKU1, l_HIO.mBiku1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_BIKU1); + anm_init(i_this, dRes_INDEX_DR_BCK_DR_BIKU1_e, l_HIO.mBiku1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_DR_BAS_BIKU1_e); i_this->mMode++; i_this->mCountDownTimers[0] = l_HIO.m0E; i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINBIKU00, &i_this->current.pos); @@ -109,11 +109,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::EMode_NONE, 1.0f, DR_BAS_ABARE1); + anm_init(i_this, dRes_INDEX_DR_BCK_DR_ABARE1_e, l_HIO.mAbare1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_DR_BAS_ABARE1_e); i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINABARE00, &i_this->current.pos); i_this->mCountDownTimers[1] = 500; } else { - anm_init(i_this, DR_BCK_DR_ABARE2, l_HIO.mAbare2Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_ABARE2); + anm_init(i_this, dRes_INDEX_DR_BCK_DR_ABARE2_e, l_HIO.mAbare2Morf, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_DR_BAS_ABARE2_e); cXyz rootPos; cXyz offset(0.0f, 0.0f, 0.0f); @@ -126,7 +126,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_DR_BCK_DR_HO1_e, l_HIO.mHo1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINHO00, &i_this->current.pos); i_this->mMode++; } @@ -226,11 +226,11 @@ static BOOL createHeap(fopAc_ac_c* i_actor) { dr_class* i_this = (dr_class*)i_actor; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Dr", DR_BMD_DR1), + (J3DModelData*)dComIfG_getObjectRes("Dr", dRes_INDEX_DR_BMD_DR1_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr", DR_BCK_DR_BIKU1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr", dRes_INDEX_DR_BCK_DR_BIKU1_e), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Dr", DR_BAS_BIKU1), + dComIfG_getObjectRes("Dr", dRes_INDEX_DR_BAS_BIKU1_e), 0x00000000, 0x11020203 ); diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index 3f211ffe9..bf669e8ce 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_dr2.h" -#include "d/res/res_dr2.h" +#include "res/Object/Dr2.h" #include "m_Do/m_Do_ext.h" #include "d/d_bg_w.h" #include "d/d_s_play.h" @@ -530,7 +530,7 @@ void dr_move(dr2_class* i_this) { case 0: if (i_this->unk_50C) { i_this->unk_4C6 = 0; - J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Dr2", DR2_BCK_DR_BOSS_DEMO1); + J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BCK_DR_BOSS_DEMO1_e); i_this->mpMorf2->setAnm(pAnimRes, 0, 1.0f, 1.0f, 0.0f, -1.0f, NULL); i_this->unk_4C4 = 1; } @@ -649,7 +649,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { dr2_class* i_this = (dr2_class*)a_this; i_this->mpMorf1 = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_DR_SIPPO), + (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_DR_SIPPO_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203 ); @@ -662,7 +662,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } i_this->mpMorf1->getModel()->setUserArea((u32)i_this); - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BDL_IWA00); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BDL_IWA00_e); JUT_ASSERT(DEMO_SELECT(1347, 1361), modelData != NULL); i_this->unk_418 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -670,7 +670,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_GAN_MAGMA); + modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_GAN_MAGMA_e); JUT_ASSERT(DEMO_SELECT(1356, 1370), modelData != NULL); i_this->unk_41C = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -683,7 +683,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_GAN_MAGMA); + J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_GAN_MAGMA_e); BOOL init = i_this->unk_420->init(i_this->unk_41C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE); #if VERSION > VERSION_DEMO if (!init) { @@ -701,15 +701,15 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } } - i_this->mpMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_DR), - NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr2", DR2_BCK_DR_BOSS_DEMO1), + i_this->mpMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_DR_e), + NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BCK_DR_BOSS_DEMO1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203); if (i_this->mpMorf2 == NULL || i_this->mpMorf2->getModel() == NULL) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO1); + modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_MBYO1_e); JUT_ASSERT(DEMO_SELECT(1405, 1429), modelData != NULL); i_this->unk_428 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -717,7 +717,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO2); + modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_MBYO2_e); JUT_ASSERT(DEMO_SELECT(1412, 1436), modelData != NULL); i_this->unk_42C = mDoExt_J3DModel__create(modelData,0,0x11020203); @@ -730,7 +730,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_MBYO1); + srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_MBYO1_e); if (!i_this->unk_430->init(i_this->unk_428->getModelData(), srtKey, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } @@ -740,7 +740,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_MBYO2); + srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_MBYO2_e); if (!i_this->unk_434->init(i_this->unk_42C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -750,7 +750,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dr2", DR2_BRK_MBYO2); + J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BRK_MBYO2_e); if (!i_this->unk_438->init(i_this->unk_42C->getModelData(), tevRegKey, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -765,11 +765,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", DR2_DZB_MBYO1); + cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_DZB_MBYO1_e); i_this->mpBgW1->Set(cBgD, dBgW::MOVE_BG_e, &i_this->unk_440); i_this->mpBgW1->SetCrrFunc(dBgS_MoveBGProc_Typical); - cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", DR2_DZB_MBYO2); + cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_DZB_MBYO2_e); i_this->mpBgW2->Set(cBgD, dBgW::MOVE_BG_e, &i_this->unk_470); i_this->mpBgW2->SetCrrFunc(dBgS_MoveBGProc_Typical); diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 5d507f989..7abc4fe40 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ep.h" -#include "d/res/res_ep.h" +#include "res/Object/Ep.h" #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" @@ -508,9 +508,9 @@ static BOOL daEp_CreateHeap(fopAc_ac_c* a_this) { J3DModelData* modelData; if (i_this->mbHasObm == 0) { - modelData = static_cast(dComIfG_getObjectRes("Ep", EP_BDL_VKTSD)); + modelData = static_cast(dComIfG_getObjectRes("Ep", dRes_INDEX_EP_BDL_VKTSD_e)); } else { - modelData = static_cast(dComIfG_getObjectRes("Ep", EP_BDL_OBM_SHOKUDAI1)); + modelData = static_cast(dComIfG_getObjectRes("Ep", dRes_INDEX_EP_BDL_OBM_SHOKUDAI1_e)); } JUT_ASSERT(DEMO_SELECT(996, 997), modelData != NULL); @@ -524,7 +524,7 @@ static BOOL daEp_CreateHeap(fopAc_ac_c* a_this) { } if (i_this->mbHasGa != 0) { - modelData = static_cast(dComIfG_getObjectRes("Ep", EP_BDL_EP_GA)); + modelData = static_cast(dComIfG_getObjectRes("Ep", dRes_INDEX_EP_BDL_EP_GA_e)); JUT_ASSERT(DEMO_SELECT(1007, 1010), modelData != NULL); for (s32 i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index 13d44f58e..0002b65ce 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/src/d/actor/d_a_esa.cpp @@ -12,7 +12,7 @@ #include "d/d_s_play.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_func.h" -#include "d/res/res_link.h" +#include "res/Object/Link.h" #include "f_op/f_op_actor_mng.h" /* 800E7E60-800E7EA8 .text daEsa_Draw__FP9esa_class */ @@ -226,7 +226,7 @@ static BOOL daEsa_Delete(esa_class* i_this) { static BOOL daEsa_CreateHeap(fopAc_ac_c* i_actor) { esa_class* i_this = static_cast(i_actor); - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Link", LINK_BDL_ESA)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_ESA_e)); JUT_ASSERT(0x1E8, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); diff --git a/src/d/actor/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp index 70fb21271..204339402 100644 --- a/src/d/actor/d_a_fallrock.cpp +++ b/src/d/actor/d_a_fallrock.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_fallrock.h" -#include "d/res/res_always.h" +#include "res/Object/Always.h" #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" @@ -53,7 +53,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-00000140 .text CreateHeap__12daFallRock_cFv */ BOOL daFallRock_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_KROCK_00); + J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BDL_KROCK_00_e); JUT_ASSERT(DEMO_SELECT(159, 161), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000,0x11020002); @@ -255,9 +255,9 @@ void daFallRock_c::setParticle(int param_1, cXyz* pos) { ); J3DModelData* modelData = (J3DModelData*) - dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_MPI_KOISHI); + dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BDL_MPI_KOISHI_e); J3DAnmTexPattern* anmTexPattern = (J3DAnmTexPattern*) - dComIfG_getObjectRes(m_arcname, ALWAYS_BTP_MPI_KOISHI); + dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BTP_MPI_KOISHI_e); JPABaseEmitter* emitter = (JPABaseEmitter*)dComIfGp_particle_set( dPa_name::ID_IT_JN_M_STS_HAHEN, diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 34b02d276..be8112f17 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -5,9 +5,9 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_fan.h" -#include "d/res/res_hsen1.h" -#include "d/res/res_hsen3.h" -#include "d/res/res_yaflw00.h" +#include "res/Object/Hsen1.h" +#include "res/Object/Hsen3.h" +#include "res/Object/Yaflw00.h" #include "f_op/f_op_kankyo_mng.h" #include "d/d_com_inf_game.h" #include "d/d_level_se.h" @@ -16,8 +16,8 @@ const char* daFan_c::m_arcname[3] = { "Hsen1", "Hsen1", "Hsen3", }; const char daFan_c::m_arcname2[8] = "Yaflw00"; -const s16 daFan_c::m_bdlidx[3] = { HSEN1_BDL_HSEN1, HSEN1_BDL_HSEN1, HSEN3_BDL_HSEN3, }; -const s16 daFan_c::m_dzbidx[3] = { HSEN1_DZB_HSEN1, HSEN1_DZB_HSEN1, HSEN3_DZB_HSEN3, }; +const s16 daFan_c::m_bdlidx[3] = { dRes_INDEX_HSEN1_BDL_HSEN1_e, dRes_INDEX_HSEN1_BDL_HSEN1_e, dRes_INDEX_HSEN3_BDL_HSEN3_e, }; +const s16 daFan_c::m_dzbidx[3] = { dRes_INDEX_HSEN1_DZB_HSEN1_e, dRes_INDEX_HSEN1_DZB_HSEN1_e, dRes_INDEX_HSEN3_DZB_HSEN3_e, }; const f32 daFan_c::m_wind_length[3] = { 1600.0f, 1600.0f, 1220.0f, }; const f32 daFan_c::m_wind_r[3] = { 120.0f, 120.0f, 780.0f, }; const Vec daFan_c::m_wind_model_scale[3] = { { 1.0f, 1.6f, 1.0f, }, { 1.0f, 1.6f, 1.0f, }, { 3.0f, 2.9f, 3.0f, }, }; @@ -78,23 +78,23 @@ BOOL daFan_c::CreateHeap() { return FALSE; mModel->setUserArea((u32)this); - modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BDL_YAFLW00); + modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BDL_YAFLW00_e); JUT_ASSERT(0x17f, modelData != NULL); mWindModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222); if (mWindModel == NULL) return FALSE; - J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_01); + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BTK_YAFLW00_01_e); JUT_ASSERT(400, pbtk != NULL); 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); + pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BTK_YAFLW00_02_e); JUT_ASSERT(0x19c, pbtk != NULL); 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); + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BCK_YAFLW00_e); JUT_ASSERT(0x1a9, pbck != NULL); if (!mWindBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,-1, false)) return FALSE; diff --git a/src/d/actor/d_a_ff.cpp b/src/d/actor/d_a_ff.cpp index 9ceffa234..206a1f51c 100644 --- a/src/d/actor/d_a_ff.cpp +++ b/src/d/actor/d_a_ff.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "m_Do/m_Do_lib.h" -#include "d/res/res_ff.h" +#include "res/Object/Ff.h" static s32 ff_count = 0; @@ -250,8 +250,8 @@ static BOOL daFf_Delete(ff_class* i_this) { /* 000011AC-0000138C .text useHeapInit__FP10fopAc_ac_c */ static BOOL useHeapInit(fopAc_ac_c* i_this) { - static u32 ho_bmd[] = {FF_BMD_HO, FF_BMD_HOP}; - static u32 ho_brk[] = {FF_BRK_HO, FF_BRK_HOP}; + static u32 ho_bmd[] = {dRes_INDEX_FF_BMD_HO_e, dRes_INDEX_FF_BMD_HOP_e}; + static u32 ho_brk[] = {dRes_INDEX_FF_BRK_HO_e, dRes_INDEX_FF_BRK_HOP_e}; ff_class* a_this = (ff_class*)i_this; for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 794b89e19..8a37c9efa 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -15,8 +15,8 @@ #include "d/d_meter.h" #include "d/d_s_play.h" #include "d/d_snap.h" -#include "d/res/res_fganon.h" -#include "d/res/res_pgsw.h" +#include "res/Object/Fganon.h" +#include "res/Object/Pgsw.h" #include "f_op/f_op_camera.h" fganon_class* master; @@ -102,9 +102,9 @@ static BOOL daFganon_Draw(fganon_class* i_this) { /* Appear Animation 1 */ void deru_brk(fganon_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; - J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN1); + J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_MAIN1_e); 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); + ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_KEN1_e); i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); fopAcM_seStart(a_this, JA_SE_CM_PG_APPEAR, 0); i_this->mbIsMaterialized = TRUE; @@ -116,12 +116,12 @@ void kieru_brk(fganon_class* i_this, unsigned char param_2) { fopAc_ac_c* a_this = &i_this->actor; J3DAnmTevRegKey* ptrkAnm; if ((param_2 == 0) || (param_2 == 1)) { - ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_KIERU_MAIN1); + ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_KIERU_MAIN1_e); i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); fopAcM_seStart(a_this, JA_SE_CM_PG_DISAPPEAR, 0); } if ((param_2 == 0) || (param_2 == 2)) { - ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Pgsw", PGSW_BRK_KIERU_KEN1); + ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Pgsw", dRes_INDEX_PGSW_BRK_KIERU_KEN1_e); i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); } i_this->mbIsMaterialized = FALSE; @@ -131,9 +131,9 @@ void kieru_brk(fganon_class* i_this, unsigned char param_2) { /* Appear Animation 2 */ void deru_brk2(fganon_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; - J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN2); + J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_MAIN2_e); 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); + ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_KEN2_e); i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); fopAcM_seStart(a_this, JA_SE_CM_PG_APPEAR, 0); i_this->mbIsMaterialized = TRUE; @@ -144,9 +144,9 @@ void deru_brk2(fganon_class* i_this) { void kieru_brk2(fganon_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; J3DAnmTevRegKey* ptrkAnm; - ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_KIERU_MAIN2); + ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_KIERU_MAIN2_e); 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); + ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_KIERU_KEN2_e); i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); fopAcM_seStart(a_this, JA_SE_CM_PG_DISAPPEAR, 0); i_this->mbIsMaterialized = FALSE; @@ -203,18 +203,18 @@ void fly(fganon_class* i_this) { a_this->current.pos.y = player->current.pos.y + l_HIO.m10; a_this->shape_angle.y = fopAcM_searchPlayerAngleY(a_this); i_this->mMode = 1; - anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode++; 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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } cMtx_YrotS(*calc_mtx, i_this->m398); cXyz offset; @@ -261,7 +261,7 @@ void shot(fganon_class* i_this) { if (i_this->m408) { break; } - anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_TAME1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode++; i_this->m3A4[0] = 40; fopAcM_monsSeStart(a_this, JA_SE_CV_PG_EBALL_MAKE_S, 0); @@ -275,7 +275,7 @@ void shot(fganon_class* i_this) { fopAcM_seStart(a_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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_NAGERU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode++; fopAcM_monsSeStart(a_this, JA_SE_CV_PG_EBALL_FIRE_S, 0); fopAcM_seStart(a_this, JA_SE_CM_PG_EBALL_FIRE_S, 0); @@ -290,7 +290,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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode++; } // Fall-through @@ -301,10 +301,10 @@ void shot(fganon_class* i_this) { if (local_34.abs() < DEMO_SELECT(REG6_F(1), REG0_F(1)) + (i_this->m404 * (DEMO_SELECT(REG6_F(0), 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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_TENNISLR1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } else { - anm_init(i_this, FGANON_BCK_TENNISRL1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_TENNISRL1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } i_this->mMode++; fopAcM_monsSeStart(a_this, JA_SE_CV_PG_REFLECT_EBALL, 0); @@ -329,7 +329,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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode = 3; } // Fall-through @@ -371,7 +371,7 @@ void spinattack(fganon_class* i_this) { linChk.Set(&player->eyePos, &a_this->current.pos, a_this); if (!dComIfG_Bgsp()->LineCross(&linChk)) { a_this->current.pos.y -= 100.0f; - anm_init(i_this, FGANON_BCK_WAIT1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode = 2; i_this->m3A4[0] = 30; deru_brk(i_this); @@ -384,7 +384,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_KAITEN1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode = 3; a_this->speedF = 0.0f; fopAcM_monsSeStart(a_this, JA_SE_CV_PG_EBALL_FIRE_S, 0); @@ -439,18 +439,18 @@ void fly2(fganon_class* i_this) { a_this->current.pos.y = player->current.pos.y + l_HIO.m18; a_this->shape_angle.y = fopAcM_searchPlayerAngleY(a_this); i_this->mMode = 1; - anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode++; 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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } cMtx_YrotS(*calc_mtx, i_this->m398); cXyz offset; @@ -583,7 +583,7 @@ void shot2(fganon_class* i_this) { int frame = i_this->mpMorf->getFrame(); switch(i_this->mMode) { case 0: { - anm_init(i_this, FGANON_BCK_TAME_S1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_TAME_S1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); #if VERSION > VERSION_DEMO for (int i = 0; i < 2; i++) { if (i_this->mEmitters2[i] != NULL) { @@ -606,7 +606,7 @@ void shot2(fganon_class* i_this) { } } if (i_this->mpMorf->isStop()) { - anm_init(i_this, FGANON_BCK_TAME_S2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_TAME_S2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m3A4[0] = l_HIO.m3C; i_this->mMode++; for (int i = 0; i < 2; i++) { @@ -627,7 +627,7 @@ void shot2(fganon_class* i_this) { if (i_this->m3A4[0] != 0) { break; } - anm_init(i_this, FGANON_BCK_NAGERU_S1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_NAGERU_S1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode++; i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGTHROWDARKBALLL00, &a_this->current.pos, NULL); i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGTHROWDARKBALLR00, &a_this->current.pos, NULL); @@ -667,7 +667,7 @@ void shot2(fganon_class* i_this) { } case 4: { if (i_this->m68A == 1) { - anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } if (i_this->m3A4[0] == 0) { i_this->mAction = 9; @@ -710,7 +710,7 @@ void spinattack2(fganon_class* i_this) { cXyz transformedPos; MtxPosition(&offset, &transformedPos); a_this->current.pos = player->current.pos + transformedPos; - anm_init(i_this, FGANON_BCK_KAITEN_S1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_KAITEN_S1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode = 2; deru_brk(i_this); i_this->m38C = player->current.pos; @@ -723,7 +723,7 @@ void spinattack2(fganon_class* i_this) { cXyz local_e4; local_e4 = i_this->m38C - a_this->current.pos; if (local_e4.abs() < l_HIO.m38) { - anm_init(i_this, FGANON_BCK_KAITEN1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_KAITEN1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode = 3; a_this->speedF = 0.0f; fopAcM_monsSeStart(a_this, JA_SE_CV_PG_EBALL_FIRE_S, 0); @@ -743,7 +743,7 @@ void spinattack2(fganon_class* i_this) { if (i_this->m68F == 0) { i_this->mMode = 4; i_this->m3A4[0] = 40; - anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } else { i_this->mAction = 2; @@ -769,7 +769,7 @@ void down(fganon_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; switch(i_this->mMode) { case 0: { - anm_init(i_this, FGANON_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode++; a_this->speed.y = 0.0f; } @@ -778,7 +778,7 @@ void down(fganon_class* i_this) { if (i_this->mAcch.ChkGroundHit()) { if (i_this->mpMorf->isStop()) { i_this->mMode++; - anm_init(i_this, FGANON_BCK_TYAKUTI1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_TYAKUTI1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } } i_this->m3A4[0] = l_HIO.m48; @@ -787,7 +787,7 @@ void down(fganon_class* i_this) { case 2: { if (i_this->mpMorf->isStop()) { i_this->mMode++; - anm_init(i_this, FGANON_BCK_DOWN1, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_DOWN1_e, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } break; } @@ -798,7 +798,7 @@ void down(fganon_class* i_this) { break; } case 10: { - anm_init(i_this, FGANON_BCK_DAMAGE2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_DAMAGE2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode = 2; } default: @@ -946,7 +946,7 @@ void fail(fganon_class* i_this) { case 0: { kieru_brk(i_this, 1); i_this->mMode = 1; - anm_init(i_this, FGANON_BCK_DAMAGE2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_DAMAGE2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; } case 1: { @@ -1120,7 +1120,7 @@ void start(fganon_class* i_this) { if (distXZ < i_this->m2BD * 10.0f) { i_this->mB54 = 1; i_this->mMode = 1; - anm_init(i_this, FGANON_BCK_WAIT1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); mDoAud_bgmAllMute(30); } break; @@ -1130,7 +1130,7 @@ void start(fganon_class* i_this) { break; } case 2: { - anm_init(i_this, FGANON_BCK_WARAU1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WARAU1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); fopAcM_monsSeStart(a_this, JA_SE_CV_PG_LAUGH_2, 0); i_this->mMode = 3; break; @@ -1138,7 +1138,7 @@ void start(fganon_class* i_this) { case 4: { i_this->mMode = 5; i_this->m3A4[0] = DEMO_SELECT(REG17_S(0), REG0_S(0)) + 0x50; - anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_TAME1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } case 5: { if (i_this->m3A4[0] == (s16)(DEMO_SELECT(REG17_S(0), REG0_S(0)) + 0x4B)) { @@ -1177,7 +1177,7 @@ void end(fganon_class* i_this) { switch(i_this->mMode) { case 0: { i_this->mMode = 1; - anm_init(i_this, FGANON_BCK_LAST_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_LAST_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mB54 = 50; dComIfGs_onEventBit(dSv_event_flag_c::UNK_3F20); // PG_DEFEATED? It appears further down in `energy_ball_move` break; @@ -1189,14 +1189,14 @@ void end(fganon_class* i_this) { } case 2: { deru_brk(i_this); - anm_init(i_this, FGANON_BCK_WARAU1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WARAU1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); fopAcM_monsSeStart(a_this, JA_SE_CV_PG_LAUGH_2, 0); i_this->mMode = 3; break; } case 4: { deru_brk(i_this); - anm_init(i_this, FGANON_BCK_SARU1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_SARU1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode = 5; a_this->speed.y = 0.0f; fopAcM_seStart(a_this, JA_SE_CM_PG_END_1, 0); @@ -1229,7 +1229,7 @@ void last_end(fganon_class* i_this) { switch(i_this->mMode) { case 0: { i_this->mMode = 1; - anm_init(i_this, FGANON_BCK_MOGAKU1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_MOGAKU1_e, 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; @@ -1397,7 +1397,7 @@ void damage_check(fganon_class* i_this) { if (atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == fpcNm_FGMAHOU_e)) { i_this->m670++; - anm_init(i_this, FGANON_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m3A4[0] = 60; @@ -2395,7 +2395,7 @@ static BOOL daFganon_Execute(fganon_class* i_this) { if (((((i_this->mAction == 5) || (i_this->mAction == 9)) || (i_this->mAction == 7)) || (i_this->mAction == 10)) && ((i_this->m68B != 0 && (i_this->m68A == 0)))) { i_this->m68B = 0; - anm_init(i_this, FGANON_BCK_WARAU1, 6.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_FGANON_BCK_WARAU1_e, 6.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m68A = 60; fopAcM_monsSeStart(a_this, JA_SE_CV_PG_LAUGH_3, 0); } @@ -2658,8 +2658,8 @@ static BOOL daFganon_Delete(fganon_class* i_this) { static BOOL useHeapInit(fopAc_ac_c* i_act) { fganon_class* i_this = (fganon_class*)i_act; - i_this->mpMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("Fganon", FGANON_BDL_BPG), NULL, NULL, - (J3DAnmTransformKey *)dComIfG_getObjectRes("Fganon", FGANON_BCK_WAIT1), + i_this->mpMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BDL_BPG_e), NULL, NULL, + (J3DAnmTransformKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BCK_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0, 0x11020203); if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) @@ -2671,7 +2671,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { int brk1_res = i_this->mpBrkAnm1->init( i_this->mpMorf->getModel()->getModelData(), - (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN1), + (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_MAIN1_e), TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, @@ -2684,7 +2684,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; J3DModelData* pModelData; - pModelData = (J3DModelData *)dComIfG_getObjectRes("Pgsw", PGSW_BDL_BPG_KEN1); + pModelData = (J3DModelData *)dComIfG_getObjectRes("Pgsw", dRes_INDEX_PGSW_BDL_BPG_KEN1_e); i_this->mpKenModel = mDoExt_J3DModel__create(pModelData, 0, 0x11020203); if (i_this->mpKenModel == NULL) return FALSE; @@ -2695,12 +2695,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; int brk2_res = i_this->mpBrkAnm2->init( - pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN1), TRUE, J3DFrameCtrl::EMode_NONE + pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_KEN1_e), TRUE, J3DFrameCtrl::EMode_NONE ); if (brk2_res == 0) return FALSE; - pModelData = (J3DModelData *)dComIfG_getObjectRes("Fganon", FGANON_BDL_YDKBL00); + pModelData = (J3DModelData *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BDL_YDKBL00_e); i_this->mpEnergySphereModel = mDoExt_J3DModel__create(pModelData, 0, 0x11020203); if (i_this->mpEnergySphereModel == NULL) return FALSE; @@ -2710,7 +2710,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; int btk_res = i_this->mpBtkAnm->init( - pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKBL00), TRUE, J3DFrameCtrl::EMode_LOOP + pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BTK_YDKBL00_e), TRUE, J3DFrameCtrl::EMode_LOOP ); if (btk_res == 0) return FALSE; @@ -2720,7 +2720,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; int brk3_res = i_this->mpBrkAnm3->init( - pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKBL00), TRUE, J3DFrameCtrl::EMode_NONE + pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_YDKBL00_e), TRUE, J3DFrameCtrl::EMode_NONE ); if (brk3_res == 0) return FALSE; diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp index f3ffd9ad7..461ae7628 100644 --- a/src/d/actor/d_a_fgmahou.cpp +++ b/src/d/actor/d_a_fgmahou.cpp @@ -9,7 +9,7 @@ #include "d/d_s_play.h" #include "d/d_particle_name.h" #include "d/actor/d_a_fganon.h" -#include "d/res/res_fganon.h" +#include "res/Object/Fganon.h" /* 00000078-000000E4 .text daFgmahou_Draw__FP13fgmahou_class */ static BOOL daFgmahou_Draw(fgmahou_class* i_this) { @@ -302,7 +302,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { fgmahou_class* i_this = static_cast(a_this); i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Fganon", FGANON_BDL_YDKSP00), + (J3DModelData*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BDL_YDKSP00_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, @@ -321,7 +321,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if(i_this->mpBtk == NULL) { return FALSE; } - if(!i_this->mpBtk->init(pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKSP00), true, J3DFrameCtrl::EMode_LOOP)) { + if(!i_this->mpBtk->init(pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BTK_YDKSP00_e), true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } @@ -329,7 +329,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if(i_this->mpBrk == NULL) { return FALSE; } - if(!i_this->mpBrk->init(pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKSP00), true, J3DFrameCtrl::EMode_NONE)) { + if(!i_this->mpBrk->init(pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_YDKSP00_e), true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } i_this->mpBrk->setFrame(6.999f); diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index 370476038..95d9edd58 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/src/d/actor/d_a_floor.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_floor.h" -#include "d/res/res_hhyu1.h" +#include "res/Object/Hhyu1.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "m_Do/m_Do_mtx.h" @@ -35,7 +35,7 @@ BOOL daFloor_c::Delete() { /* 0000012C-000001E8 .text CreateHeap__9daFloor_cFv */ BOOL daFloor_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HHYU1_BDL_HHYU1); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HHYU1_BDL_HHYU1_e); JUT_ASSERT(0xc1, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); if (mpModel == NULL) @@ -62,7 +62,7 @@ cPhs_State daFloor_c::_create() { cPhs_State rt = dComIfG_resLoad(&mPhs, m_arcname); if (rt == cPhs_COMPLEATE_e) { - if (!MoveBGCreate(m_arcname, HHYU1_DZB_HHYU1, NULL, 0x8A0)) + if (!MoveBGCreate(m_arcname, dRes_INDEX_HHYU1_DZB_HHYU1_e, NULL, 0x8A0)) return cPhs_ERROR_e; } return rt; diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index eff68df93..3a932962e 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -17,7 +17,7 @@ #include "d/actor/d_a_npc_md.h" #include "d/d_s_play.h" #include "d/d_a_obj.h" -#include "d/res/res_fm.h" +#include "res/Object/fm.h" #include "d/actor/d_a_player_main_data.h" @@ -366,7 +366,7 @@ BOOL daFm_c::_createHeap() { /* 00000718-0000086C .text holeCreateHeap__6daFm_cFv */ bool daFm_c::holeCreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, FM_BDL_YPIT00)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BDL_YPIT00_e)); JUT_ASSERT(0x2C7, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x19001222); @@ -374,7 +374,7 @@ bool daFm_c::holeCreateHeap() { return false; } - J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, FM_BTK_YPIT00)); + J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BTK_YPIT00_e)); JUT_ASSERT(0x2D0, btk != NULL); if(!mBtkAnm.init(modelData, btk, TRUE, J3DFrameCtrl::EMode_LOOP)) { @@ -386,7 +386,7 @@ bool daFm_c::holeCreateHeap() { /* 0000086C-000009CC .text bodyCreateHeap__6daFm_cFv */ bool daFm_c::bodyCreateHeap() { - J3DModelData* fmModelData = static_cast(dComIfG_getObjectRes(m_arc_name, FM_BDL_FM)); + J3DModelData* fmModelData = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BDL_FM_e)); JUT_ASSERT(0x2DD, fmModelData != NULL); mpMorf = new mDoExt_McaMorf( @@ -397,7 +397,7 @@ bool daFm_c::bodyCreateHeap() { NULL, J3DFrameCtrl::EMode_NULL, #else - static_cast(dComIfG_getObjectRes(m_arc_name, FM_BCK_MODORU)), + static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BCK_MODORU_e)), J3DFrameCtrl::EMode_LOOP, #endif @@ -2478,19 +2478,19 @@ void daFm_c::modeProc(daFm_c::Proc_e proc, int newMode) { /* 00006D8C-00006DE8 .text setAnm__6daFm_cFScb */ void daFm_c::setAnm(s8 anmPrmIdx, bool param_2) { static const int a_anm_bcks_tbl[] = { - FM_BCK_WAIT, - FM_BCK_DERU, - FM_BCK_MODORU, - FM_BCK_TUKAMU, - FM_BCK_TUKAMU2WAIT, - FM_BCK_HIKIKOMU, - FM_BCK_DAMAGE, - FM_BCK_TUMAMIWAIT, - FM_BCK_ASITUKAMI, - FM_BCK_NAGERU, - FM_BCK_YAYU, - FM_BCK_MAHI, - FM_BCK_KUSIZASI + dRes_INDEX_FM_BCK_WAIT_e, + dRes_INDEX_FM_BCK_DERU_e, + dRes_INDEX_FM_BCK_MODORU_e, + dRes_INDEX_FM_BCK_TUKAMU_e, + dRes_INDEX_FM_BCK_TUKAMU2WAIT_e, + dRes_INDEX_FM_BCK_HIKIKOMU_e, + dRes_INDEX_FM_BCK_DAMAGE_e, + dRes_INDEX_FM_BCK_TUMAMIWAIT_e, + dRes_INDEX_FM_BCK_ASITUKAMI_e, + dRes_INDEX_FM_BCK_NAGERU_e, + dRes_INDEX_FM_BCK_YAYU_e, + dRes_INDEX_FM_BCK_MAHI_e, + dRes_INDEX_FM_BCK_KUSIZASI_e }; static const dLib_anm_prm_c a_anm_prm_tbl[] = { diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 6ccb59389..82b5ffc8d 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -5,13 +5,13 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ghostship.h" -#include "d/res/res_ayush.h" +#include "res/Object/Ayush.h" #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/d_kankyo_wether.h" -#include "d/res/res_cloth.h" +#include "res/Object/Cloth.h" const u32 daGhostship_c::m_heapsize = 0x1EA0; const char daGhostship_c::m_arc_name[] = "Ayush"; @@ -31,7 +31,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { /* 00000118-0000032C .text _createHeap__13daGhostship_cFv */ BOOL daGhostship_c::_createHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, AYUSH_BDL_AYUSH)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AYUSH_BDL_AYUSH_e)); JUT_ASSERT(DEMO_SELECT(80, 88), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -39,16 +39,16 @@ BOOL daGhostship_c::_createHeap() { return false; } - J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH)); + J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AYUSH_BTK_AYUSH_e)); JUT_ASSERT(DEMO_SELECT(87, 95), btk != NULL); if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP)) { return false; } - ResTIMG* res1 = static_cast(dComIfG_getObjectRes(m_arc_name, AYUSH_BTI_B_GSHIP_HATA)); - ResTIMG* res2 = static_cast(dComIfG_getObjectRes(m_arc_name, AYUSH_BTI_B_GSHIP_HO)); - ResTIMG* res3 = static_cast(dComIfG_getObjectRes(m_cloth_arc_name, CLOTH_BTI_CLOTHTOON)); + ResTIMG* res1 = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AYUSH_BTI_B_GSHIP_HATA_e)); + ResTIMG* res2 = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AYUSH_BTI_B_GSHIP_HO_e)); + ResTIMG* res3 = static_cast(dComIfG_getObjectRes(m_cloth_arc_name, dRes_INDEX_CLOTH_BTI_CLOTHTOON_e)); mpCloth = dCloth_packetXlu_create(res1, res3, 5, 5, 700.0f, 350.0f, &tevStr, 0); mpCloth2 = dCloth_packetXlu_create(res2, res3, 6, 6, 1800.0f, 1000.0f, &tevStr, 0); diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index 5dd16ec47..b3abd288c 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -11,9 +11,9 @@ #if VERSION == VERSION_DEMO #include "d/d_s_play.h" #endif -#include "d/res/res_cloth.h" -#include "d/res/res_gflag.h" -#include "d/res/res_tgflag.h" +#include "res/Object/Cloth.h" +#include "res/Object/Gflag.h" +#include "res/Object/Tgflag.h" #include "d/d_path.h" #include "assets/l_txa_dummy_hataTEX.h" @@ -138,8 +138,8 @@ void daGFlag_packet_c::setTexObj(u8 i_arcIdx) { "Tgflag" }; static const int index_tbl[] = { - GFLAG_BTI_B_FRAGGAIKOT, - TGFLAG_BTI_B_FRAGTORI + dRes_INDEX_GFLAG_BTI_B_FRAGGAIKOT_e, + dRes_INDEX_TGFLAG_BTI_B_FRAGTORI_e }; // index_tbl likely existed in this function but passing // an element of it into getObjectRes breaks the match @@ -170,7 +170,7 @@ void daGFlag_packet_c::setTexObj(u8 i_arcIdx) { /* 00000210-00000330 .text setToonTexObj__16daGFlag_packet_cFv */ void daGFlag_packet_c::setToonTexObj() { - ResTIMG* tex_info_p = (ResTIMG*) dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON); + ResTIMG* tex_info_p = (ResTIMG*) dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e); GXBool mipmap_cnt_over_one = GXBool(tex_info_p->mipmapCount > 1); GXInitTexObj( &mToonTexObj, diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 1433cc9f7..8f68837c5 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -14,7 +14,7 @@ #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" -#include "d/res/res_link.h" +#include "res/Object/Link.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" @@ -1766,21 +1766,21 @@ static int CallbackCreateHeap(fopAc_ac_c* i_this) { J3DModelData* modelData; himo2_class* a_this = (himo2_class*)i_this; - pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE); + pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e); if (!a_this->m1F30.init(1, 200, pRVar1, 0)) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Link", LINK_BDL_ROPEEND); + modelData = (J3DModelData*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_ROPEEND_e); JUT_ASSERT(DEMO_SELECT(3833, 3933), modelData != NULL); a_this->m24B0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (a_this->m24B0 == NULL) { return FALSE; } - pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE); + pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e); if (!a_this->m1F98.init(5, 0x20, pRVar1, 0)) { return FALSE; } - pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE); + pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e); if (!a_this->m1FD8.init(1, 16, pRVar1, 0)) { return FALSE; } diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp index 26ccb1e5c..1c22ac89c 100644 --- a/src/d/actor/d_a_himo3.cpp +++ b/src/d/actor/d_a_himo3.cpp @@ -6,12 +6,12 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_himo3.h" #include "d/actor/d_a_player.h" -#include "d/res/res_always.h" +#include "res/Object/Always.h" #if VERSION > VERSION_DEMO -#include "d/res/res_bgn.h" +#include "res/Object/Bgn.h" #endif -#include "d/res/res_link.h" -#include "d/res/res_himo3.h" +#include "res/Object/Link.h" +#include "res/Object/Himo3.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" @@ -614,18 +614,18 @@ static BOOL daHimo3_Delete(himo3_class* i_this) { /* 00001AE0-00001DD4 .text useHeapInit__FP11himo3_class */ cPhs_State useHeapInit(himo3_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - static int hook_bmd[] = {HIMO3_BMD_SLAMP_00, LINK_BDL_ROPEEND, HIMO3_BMD_SLAMP_00, HIMO3_BMD_SLAMP_00, HIMO3_BMD_SLAMP_00}; + static int hook_bmd[] = {dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_LINK_BDL_ROPEEND_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e}; #if VERSION == VERSION_DEMO - if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", i_this->m0298 == 0xf ? ALWAYS_BTI_TXM_ROPE1 : ALWAYS_BTI_ROPE), 0)) { + if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", i_this->m0298 == 0xf ? dRes_INDEX_ALWAYS_BTI_TXM_ROPE1_e : dRes_INDEX_ALWAYS_BTI_ROPE_e), 0)) { return cPhs_ERROR_e; } #else if (i_this->m0298 == 0xf) { - if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1), 0)) { + if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e), 0)) { return cPhs_ERROR_e; } - } else if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 0)) { + } else if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 0)) { return cPhs_ERROR_e; } #endif @@ -647,7 +647,7 @@ cPhs_State useHeapInit(himo3_class* i_this) { } if (i_this->m0298 == 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Himo3", HIMO3_BMD_H3_GA); + modelData = (J3DModelData*)dComIfG_getObjectRes("Himo3", dRes_INDEX_HIMO3_BMD_H3_GA_e); JUT_ASSERT(DEMO_SELECT(1264, 1298), modelData != NULL); s32 tmp = 0; diff --git a/src/d/actor/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp index bdd60341c..ea2ba404c 100644 --- a/src/d/actor/d_a_hmlif.cpp +++ b/src/d/actor/d_a_hmlif.cpp @@ -5,9 +5,9 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_hmlif.h" -#include "d/res/res_hmlif.h" -#include "d/res/res_hyuf1.h" -#include "d/res/res_hyuf2.h" +#include "res/Object/Hmlif.h" +#include "res/Object/Hyuf1.h" +#include "res/Object/Hyuf2.h" #include "d/d_path.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -31,10 +31,10 @@ const f32 daHmlif_c::m_speed[] = { 25.0f, 26.666666f, }; -const s16 daHmlif_c::m_bmdidx[] = {HMLIF_BDL_HMLIF, HYUF1_BDL_HYUF1, HYUF2_BDL_HYUF2}; -const s16 daHmlif_c::m_dzbidx[] = {HMLIF_DZB_HMLIF, HYUF1_DZB_HYUF1, HYUF2_DZB_HYUF2}; -const s16 daHmlif_c::m_btpidx[] = {-1, HYUF1_BTP_HYUF1, HYUF2_BTP_HYUF2}; -const s16 daHmlif_c::m_brkidx[] = {HMLIF_BRK_HMLIF, HYUF1_BRK_HYUF1, -1}; +const s16 daHmlif_c::m_bmdidx[] = {dRes_INDEX_HMLIF_BDL_HMLIF_e, dRes_INDEX_HYUF1_BDL_HYUF1_e, dRes_INDEX_HYUF2_BDL_HYUF2_e}; +const s16 daHmlif_c::m_dzbidx[] = {dRes_INDEX_HMLIF_DZB_HMLIF_e, dRes_INDEX_HYUF1_DZB_HYUF1_e, dRes_INDEX_HYUF2_DZB_HYUF2_e}; +const s16 daHmlif_c::m_btpidx[] = {-1, dRes_INDEX_HYUF1_BTP_HYUF1_e, dRes_INDEX_HYUF2_BTP_HYUF2_e}; +const s16 daHmlif_c::m_brkidx[] = {dRes_INDEX_HMLIF_BRK_HMLIF_e, dRes_INDEX_HYUF1_BRK_HYUF1_e, -1}; const f32 daHmlif_c::m_cull_box[][6] = { {-200.0f, -100.0f, -200.0f, 200.0f, 50.0f, 200.0f}, diff --git a/src/d/actor/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp index 914b0e94f..851ed74cd 100644 --- a/src/d/actor/d_a_hys.cpp +++ b/src/d/actor/d_a_hys.cpp @@ -5,18 +5,18 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_hys.h" -#include "d/res/res_hys.h" +#include "res/Object/Hys.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" const char* daHys_c::m_arcname[2] = {"Hys", "Hys"}; /* Model file indexes. */ -const s16 daHys_c::m_bdlidx[2] = {HYS_BDL_HYS, HYS_BDL_HYS}; +const s16 daHys_c::m_bdlidx[2] = {dRes_INDEX_HYS_BDL_HYS_e, dRes_INDEX_HYS_BDL_HYS_e}; /* Texture animation file indexes. */ -const s16 daHys_c::m_btpidx[2] = {HYS_BTP_HYS, HYS_BTP_HYS}; +const s16 daHys_c::m_btpidx[2] = {dRes_INDEX_HYS_BTP_HYS_e, dRes_INDEX_HYS_BTP_HYS_e}; /* Collision mesh file indexes. */ -const s16 daHys_c::m_dzbidx[2] = {HYS_DZB_HYS, HYS_DZB_HYS}; +const s16 daHys_c::m_dzbidx[2] = {dRes_INDEX_HYS_DZB_HYS_e, dRes_INDEX_HYS_DZB_HYS_e}; const u32 daHys_c::m_heapsize[2] = {0xA00, 0xA00}; const f32 daHys_c::m_tg_r[2] = {35.0f, 70.0f}; diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index e6ba0cd7f..17ab7df48 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -422,24 +422,24 @@ cPhs_State daIball_c::_daIball_create() { /* 800F489C-800F4B40 .text CreateHeap__9daIball_cFv */ BOOL daIball_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_IB); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BDL_IB_e); JUT_ASSERT(DEMO_SELECT(1133, 1135), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222); if (!mpModel) { return FALSE; } - J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, ALWAYS_BCK_START); + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BCK_START_e); JUT_ASSERT(DEMO_SELECT(1150, 1152), pbck != NULL); int ret = mBckAnm.init(modelData, pbck, 1, J3DFrameCtrl::EMode_NONE); if (!ret) { return FALSE; } - J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, ALWAYS_BTK_IB); + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BTK_IB_e); JUT_ASSERT(DEMO_SELECT(1162, 1164), pbtk != NULL); ret = mBtkAnm.init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP); if (!ret) { return FALSE; } int brkIds[ARRAY_SIZE(mBrkAnm)] = { - ALWAYS_BRK_IB_01, - ALWAYS_BRK_IB_02, + dRes_INDEX_ALWAYS_BRK_IB_01_e, + dRes_INDEX_ALWAYS_BRK_IB_02_e, }; J3DAnmTevRegKey* pbrk; for (int i = 0; i < (int)ARRAY_SIZE(mBrkAnm); i++) { diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index 851849efe..c6375cdfc 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ikari.h" -#include "d/res/res_ikari.h" +#include "res/Object/Ikari.h" #include "d/d_kankyo_wether.h" #include "d/d_s_play.h" #include "m_Do/m_Do_mtx.h" @@ -36,17 +36,17 @@ void daIkari_c::setMtx() { BOOL daIkari_c::_createHeap() { static int ikari_bdl[5] = { #if VERSION == VERSION_DEMO - IKARI_BMD_S_IKARI2, - IKARI_BMD_S_IKARI2, - IKARI_BMD_S_IKARI2, - IKARI_BMD_S_IKARI3, - IKARI_BMD_S_IKARI4, + dRes_INDEX_IKARI_BMD_S_IKARI2_e, + dRes_INDEX_IKARI_BMD_S_IKARI2_e, + dRes_INDEX_IKARI_BMD_S_IKARI2_e, + dRes_INDEX_IKARI_BMD_S_IKARI3_e, + dRes_INDEX_IKARI_BMD_S_IKARI4_e, #else - IKARI_BDL_S_IKARI2, - IKARI_BDL_S_IKARI2, - IKARI_BDL_S_IKARI2, - IKARI_BDL_S_IKARI3, - IKARI_BDL_S_IKARI4, + dRes_INDEX_IKARI_BDL_S_IKARI2_e, + dRes_INDEX_IKARI_BDL_S_IKARI2_e, + dRes_INDEX_IKARI_BDL_S_IKARI2_e, + dRes_INDEX_IKARI_BDL_S_IKARI3_e, + dRes_INDEX_IKARI_BDL_S_IKARI4_e, #endif }; diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp index ad9efb002..8726ec00a 100644 --- a/src/d/actor/d_a_jbo.cpp +++ b/src/d/actor/d_a_jbo.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_s_play.h" -#include "d/res/res_jbo.h" +#include "res/Object/Jbo.h" #include "f_op/f_op_actor_mng.h" #define JUMP_ANIMATION_TIME 70 @@ -76,7 +76,7 @@ void jbo_move(jbo_class* i_this) { switch (i_this->mMode) { case daJbo_Mode_IDLE_e: { if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK80_e) && i_this->mCoSph.ChkCoHit()) { - J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("JBO", JBO_BCK_IN1); + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BCK_IN1_e); i_this->mpMorf->setAnm(anm, J3DFrameCtrl::EMode_NONE, 0.0, 1.0, 0.0, -1.0, NULL); fopAcM_seStart(actor, JA_SE_OBJ_JFLOWER_IN, 0); dComIfGp_setItemMagicCount(4); @@ -93,7 +93,7 @@ void jbo_move(jbo_class* i_this) { player->onForceVomitJump(); } if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK80000000_e)) { - J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("JBO", JBO_BCK_OUT1); + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BCK_OUT1_e); i_this->mpMorf->setAnm(anm, J3DFrameCtrl::EMode_NONE, 0.0, 1.0, 0.0, -1.0, NULL); fopAcM_seStart(actor, JA_SE_OBJ_JFLOWER_OUT, 0); i_this->mAnimationSpeed = 0; @@ -161,10 +161,10 @@ static BOOL daJBO_Delete(jbo_class* i_this) { static BOOL useHeapInit(fopAc_ac_c* i_this) { jbo_class* a_this = (jbo_class*)i_this; mDoExt_McaMorf* morf = new mDoExt_McaMorf( - (J3DModelData *)dComIfG_getObjectRes("JBO", JBO_BMD_JH), + (J3DModelData *)dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BMD_JH_e), /*callback1=*/ NULL, /*callback2=*/ NULL, - (J3DAnmTransformKey *)dComIfG_getObjectRes("JBO", JBO_BCK_IN1), + (J3DAnmTransformKey *)dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BCK_IN1_e), J3DFrameCtrl::EMode_RESET, 0.0f, 0, @@ -241,7 +241,7 @@ static cPhs_State daJBO_Create(fopAc_ac_c* i_this) { a_this->mCoSph.ClrCoSet(); } if (a_this->mType == daJbo_Type_POPS_UP_e) { - J3DAnmTransform* pAnimRes = (J3DAnmTransform*) dComIfG_getObjectRes("JBO", JBO_BCK_UMARERU1); + J3DAnmTransform* pAnimRes = (J3DAnmTransform*) dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BCK_UMARERU1_e); a_this->mpMorf->setAnm(pAnimRes, J3DFrameCtrl::EMode_NONE, 0.0, 1.0, 0.0, -1.0, NULL); fopAcM_seStart(i_this, JA_SE_CM_BV_BASE_POPUP, 0); a_this->mMode = daJbo_Mode_SPAWN_e; diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index ccf78180b..bb9d1ee0b 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kaji.h" -#include "d/res/res_kaji.h" +#include "res/Object/Kaji.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "m_Do/m_Do_mtx.h" @@ -24,15 +24,15 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-000001F4 .text CreateHeap__8daKaji_cFv */ BOOL daKaji_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KAJI_INDEX_BDL_ASODA); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KAJI_BDL_ASODA_e); JUT_ASSERT(0x55, modelData != NULL); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Kaji", KAJI_INDEX_BCK_KJ_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Kaji", dRes_INDEX_KAJI_BCK_KJ_WAIT_e), J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, 1, - dComIfG_getObjectRes("Kaji", KAJI_INDEX_BAS_KJ_WAIT), + dComIfG_getObjectRes("Kaji", dRes_INDEX_KAJI_BAS_KJ_WAIT_e), 0x00080000, 0x11000002 ); diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp index 8be8e3bb3..1f458abe4 100644 --- a/src/d/actor/d_a_kamome.cpp +++ b/src/d/actor/d_a_kamome.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_kamome.h" #include "d/actor/d_a_esa.h" #include "d/actor/d_a_sea.h" -#include "d/res/res_kamome.h" +#include "res/Object/Kamome.h" #include "m_Do/m_Do_ext.h" #include "d/d_snap.h" #include "d/d_com_inf_game.h" @@ -46,9 +46,9 @@ static s32 ko_count; /* 000000EC-000001E4 .text anm_init__FP12kamome_classifUcfi */ void anm_init(kamome_class* i_this, int anmResIdx, float morf, unsigned char loopMode, float speed, int soundAnmResIdx) { if (REG0_S(3) == 0x23) { - anmResIdx = KAMOME_BCK_KA_LAND1; + anmResIdx = dRes_INDEX_KAMOME_BCK_KA_LAND1_e; } else if (REG0_S(3) == 0x24) { - anmResIdx = KAMOME_BCK_KA_FLY1; + anmResIdx = dRes_INDEX_KAMOME_BCK_KA_FLY1_e; } i_this->mpMorf->setAnm( (J3DAnmTransform*)dComIfG_getObjectRes("Kamome", anmResIdx), loopMode, morf, speed, 0.0f, -1.0f, dComIfG_getObjectRes("Kamome", soundAnmResIdx) @@ -320,7 +320,7 @@ void kamome_heisou_move(kamome_class* i_this) { frame = i_this->mpMorf->getFrame(); if ((i_this->mTimers[0] == 0) && (frame == REG0_S(0) + 9)) { i_this->mAnimState = 1; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; @@ -328,11 +328,11 @@ void kamome_heisou_move(kamome_class* i_this) { if ((i_this->mGlobalTimer & 0x3fU) == 0 && cM_rndF(1.0f) < 0.5f) { i_this->mGlobalTimer = (s16)cM_rndF(10000.0f); i_this->mAnimState = 2; - anm_init(i_this, KAMOME_BCK_KA_SING1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); } else if ((i_this->mTimers[0] == 0) && (a_this->current.pos.y < i_this->mTargetPos.y)) { i_this->mAnimState = 0; i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); } break; @@ -344,7 +344,7 @@ void kamome_heisou_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->mAnimState = 1; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; } @@ -437,7 +437,7 @@ void kamome_path_move(kamome_class* i_this) { if ((a_this->current.pos.y > i_this->mTargetPos.y) && (frame == REG0_S(0) + 9)) { i_this->mAnimState = 1; i_this->mTimers[0] = cM_rndF(200.0f) + 50.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; @@ -445,10 +445,10 @@ void kamome_path_move(kamome_class* i_this) { if (((i_this->mGlobalTimer & 0x3f) == 0) && cM_rndF(1.0) < 0.5f) { i_this->mGlobalTimer = (s16)cM_rndF(10000.0f); i_this->mAnimState = 2; - anm_init(i_this, KAMOME_BCK_KA_SING1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); } else if (a_this->current.pos.y <= i_this->mTargetPos.y) { i_this->mAnimState = 0; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); } break; @@ -461,7 +461,7 @@ void kamome_path_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->mAnimState = 1; i_this->mTimers[0] = cM_rndF(100.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; @@ -471,7 +471,7 @@ void kamome_path_move(kamome_class* i_this) { case 19: if (i_this->mpMorf->isStop()) { i_this->mAnimState = 0; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); } break; @@ -563,7 +563,7 @@ void kamome_path_move(kamome_class* i_this) { if (std::sqrtf(SQUARE(x) + SQUARE(y) + SQUARE(z)) < REG6_F(9) * 10.0f + 300.0f) { i_this->mMoveState = 0x14; - anm_init(i_this, KAMOME_BCK_KA_LAND1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_LAND1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_LAND1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_LAND1_e); i_this->mAnimState = 10; a_this->speed.y = 0.0f; i_this->m2FC = a_this->current.angle.y + (s16)cM_rndFX(15000.0f); @@ -592,7 +592,7 @@ void kamome_path_move(kamome_class* i_this) { } if (i_this->mpMorf->isStop()) { - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); } if (i_this->mTimers[2] == 0) { @@ -626,12 +626,12 @@ void kamome_path_move(kamome_class* i_this) { i_this->mTargetPos = pdVar8->m_position; if (pdVar8->mArg3 == 2) { i_this->mMoveState = 0x19; - anm_init(i_this, KAMOME_BCK_KA_FLY1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_FLY1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_FLY1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_FLY1_e); } else { i_this->mMoveState = 0x17; i_this->mRotVel = 2500.0f; i_this->mRotVelFade = 1.0f; - anm_init(i_this, KAMOME_BCK_KA_MOVE1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_MOVE1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_MOVE1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_MOVE1_e); } } i_this->mVelocityFwdTarget = 0.0f; @@ -663,11 +663,11 @@ void kamome_path_move(kamome_class* i_this) { pdVar8 += i_this->mCurPointIdx; if (cM_rndF(1.0f) < 0.5f) { i_this->mMoveState = 0x13; - anm_init(i_this, KAMOME_BCK_KA_SING2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); } else { i_this->mMoveState = 0x16; if (pdVar8->mArg3 == 3) { - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); i_this->mTimers[2] = cM_rndF(50.0f) + 50.0f; } } @@ -721,7 +721,7 @@ void kamome_auto_move(kamome_class* i_this) { frame = i_this->mpMorf->getFrame(); if ((i_this->mTimers[0] == 0) && (frame == REG0_S(0) + 9)) { i_this->mAnimState = 1; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; @@ -729,11 +729,11 @@ void kamome_auto_move(kamome_class* i_this) { if ((i_this->mGlobalTimer & 0x3f) == 0 && cM_rndF(1.0) < 0.5f) { i_this->mGlobalTimer = (s16)cM_rndF(10000.0f); i_this->mAnimState = 2; - anm_init(i_this, KAMOME_BCK_KA_SING1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); } else if ((i_this->mTimers[0] == 0) && (a_this->current.pos.y < i_this->mTargetPos.y)) { i_this->mAnimState = 0; i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); } break; @@ -745,7 +745,7 @@ void kamome_auto_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->mAnimState = 1; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; @@ -756,7 +756,7 @@ void kamome_auto_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->mAnimState = 0; i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); } case 20: @@ -815,7 +815,7 @@ void kamome_auto_move(kamome_class* i_this) { z = i_this->mTargetPos.z - a_this->current.pos.z; if (std::sqrtf(SQUARE(x) + SQUARE(y) + SQUARE(z)) < REG6_F(9) * 10.0f + 300.0f) { i_this->mMoveState = 0x14; - anm_init(i_this, KAMOME_BCK_KA_LAND1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_LAND1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_LAND1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_LAND1_e); i_this->mAnimState = 10; a_this->speed.y = 0.0f; i_this->m2FC = a_this->current.angle.y + (s16)cM_rndFX(15000.0f); @@ -847,7 +847,7 @@ void kamome_auto_move(kamome_class* i_this) { } if (i_this->mpMorf->isStop()) { - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); } if (i_this->mTimers[2] == 0) { @@ -860,7 +860,7 @@ void kamome_auto_move(kamome_class* i_this) { pfVar4 = search_esa(i_this); if (pfVar4 == NULL) { i_this->mMoveState = 0x19; - anm_init(i_this, KAMOME_BCK_KA_FLY1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_FLY1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_FLY1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_FLY1_e); } else { i_this->mEsaProcID = fopAcM_GetID(pfVar4); i_this->mMoveState = 0x16; @@ -878,10 +878,10 @@ void kamome_auto_move(kamome_class* i_this) { if (pfVar4 != NULL) { i_this->mTargetPos.x = pfVar4->current.pos.x; i_this->mTargetPos.z = pfVar4->current.pos.z; - anm_init(i_this, KAMOME_BCK_KA_MOVE1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_MOVE1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_MOVE1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_MOVE1_e); } else { i_this->mMoveState = 0x19; - anm_init(i_this, KAMOME_BCK_KA_FLY1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_FLY1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_FLY1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_FLY1_e); } } break; @@ -891,7 +891,7 @@ void kamome_auto_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->mMoveState = 0x15; i_this->mTimers[2] = cM_rndF(30.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); } i_this->mVelocityFwdTarget = 0.0f; a_this->speedF = 0.0f; @@ -913,13 +913,13 @@ void kamome_auto_move(kamome_class* i_this) { x = i_this->mTargetPos.x - a_this->current.pos.x; z = i_this->mTargetPos.z - a_this->current.pos.z; if (std::sqrtf(SQUARE(x) + SQUARE(z)) < 85.0f) { - anm_init(i_this, KAMOME_BCK_KA_EAT1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_EAT1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); i_this->mMoveState = 0x18; } if (i_this->mAcch.ChkWallHit()) { i_this->mMoveState = 0x19; - anm_init(i_this, KAMOME_BCK_KA_FLY1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_FLY1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_FLY1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_FLY1_e); } } break; @@ -939,11 +939,11 @@ void kamome_auto_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { if (cM_rndF(1.0f) < 0.2f) { i_this->mMoveState = 0x13; - anm_init(i_this, KAMOME_BCK_KA_SING2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); } else { i_this->mMoveState = 0x15; i_this->mTimers[2] = cM_rndF(20.0f); - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); } } break; @@ -993,7 +993,7 @@ void kamome_auto_move(kamome_class* i_this) { } i_this->mAnimState = 0; i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.5f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.5f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); if (i_this->mPathIdx != 0xff) { i_this->mbUsePathMovement = i_this->mPathIdx + 1; i_this->mTimers[3] = cM_rndF(250.0f) + 250.0f; @@ -1029,7 +1029,7 @@ void kamome_imouto_move(kamome_class* i_this) { frame = i_this->mpMorf->getFrame(); if ((i_this->mTimers[0] == 0) && (frame == REG0_S(0) + 9)) { i_this->mAnimState = 1; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; @@ -1037,11 +1037,11 @@ void kamome_imouto_move(kamome_class* i_this) { if ((i_this->mGlobalTimer & 0x3f) == 0 && (cM_rndF(1.0f) < 0.5f)) { i_this->mGlobalTimer = (s16)cM_rndF(10000.0f); i_this->mAnimState = 2; - anm_init(i_this, KAMOME_BCK_KA_SING1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); } else if ((i_this->mTimers[0] == 0) && (a_this->current.pos.y < i_this->mTargetPos.y)) { i_this->mAnimState = 0; i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); } break; @@ -1053,7 +1053,7 @@ void kamome_imouto_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->mAnimState = 1; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; @@ -1064,7 +1064,7 @@ void kamome_imouto_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->mAnimState = 0; i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); } break; case 20: @@ -1125,7 +1125,7 @@ void kamome_imouto_move(kamome_class* i_this) { f32 fVar10 = i_this->mTargetPos.z - a_this->current.pos.z; if (std::sqrtf(SQUARE(fVar11) + SQUARE(fVar9) + SQUARE(fVar10)) < REG6_F(9) * 10.0f + 300.0f) { i_this->mMoveState = 0x14; - anm_init(i_this, KAMOME_BCK_KA_LAND1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_LAND1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_LAND1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_LAND1_e); i_this->mAnimState = 10; a_this->speed.y = 0.0f; i_this->m2FC = a_this->current.angle.y + (s32)cM_rndFX(15000.0f); @@ -1156,7 +1156,7 @@ void kamome_imouto_move(kamome_class* i_this) { } if (i_this->mpMorf->isStop()) { - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); } if (i_this->mTimers[2] == 0) { @@ -1180,7 +1180,7 @@ void kamome_imouto_move(kamome_class* i_this) { i_this->mMoveState = 0x17; i_this->mTargetPos.x = i_this->mpTargetActor->current.pos.x + cM_rndFX(REG0_F(8) + 150.0f); i_this->mTargetPos.z = i_this->mpTargetActor->current.pos.z + cM_rndFX(REG0_F(8) + 150.0f); - anm_init(i_this, KAMOME_BCK_KA_MOVE1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_MOVE1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_MOVE1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_MOVE1_e); } break; @@ -1189,7 +1189,7 @@ void kamome_imouto_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->mMoveState = 0x15; i_this->mTimers[2] = cM_rndF(30.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); } i_this->mVelocityFwdTarget = 0.0f; a_this->speedF = 0.0f; @@ -1210,7 +1210,7 @@ void kamome_imouto_move(kamome_class* i_this) { f32 fVar11 = i_this->mTargetPos.x - a_this->current.pos.x; f32 fVar9 = i_this->mTargetPos.z - a_this->current.pos.z; if ((std::sqrtf(SQUARE(fVar11) + SQUARE(fVar9)) < 85.0f) || ((i_this->mAcch.ChkWallHit()) || i_this->mSph.ChkCoHit())) { - anm_init(i_this, KAMOME_BCK_KA_EAT1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_EAT1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); i_this->mMoveState = 0x18; } } @@ -1223,11 +1223,11 @@ void kamome_imouto_move(kamome_class* i_this) { if (i_this->mpMorf->isStop()) { if (cM_rndF(1.0f) < 0.2f) { i_this->mMoveState = 0x13; - anm_init(i_this, KAMOME_BCK_KA_SING2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); } else { i_this->mMoveState = 0x15; i_this->mTimers[2] = cM_rndF(20.0f); - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); } } break; @@ -1274,7 +1274,7 @@ void kamome_imouto_move(kamome_class* i_this) { i_this->mMoveState = 0; i_this->mAnimState = 0; i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 3.0, J3DFrameCtrl::EMode_LOOP, 1.5f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 3.0, J3DFrameCtrl::EMode_LOOP, 1.5f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); if (i_this->mPathIdx != 0xff) { i_this->mbUsePathMovement = i_this->mPathIdx + 1; @@ -1311,14 +1311,14 @@ void kamome_imouto2_move(kamome_class* i_this) { case 0: i_this->m2AB = 1; if (i_this->mTimers[1] == 0) { - anm_init(i_this, KAMOME_BCK_KA_EAT1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_EAT1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0); i_this->mMoveState++; } break; case 1: if (i_this->mpMorf->isStop()) { - anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0); i_this->mTimers[1] = cM_rndF(50.0f) + 50.0f; i_this->mMoveState--; } @@ -1356,7 +1356,7 @@ static BOOL daKamome_Execute(kamome_class* i_this) { if (i_this->mSwitchNo != 0) { if (dComIfGs_isSwitch(i_this->mSwitchNo - 1, fopAcM_GetRoomNo(&i_this->actor))) { i_this->mSwitchNo = 0; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 1.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.5f) + 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.5f) + 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); i_this->mTimers[0] = cM_rndF(60.0f) + 40.0f; i_this->mVelocityFwdTarget = 30.0f; i_this->actor.speedF = 30.0f; @@ -1427,16 +1427,16 @@ static BOOL createHeap(fopAc_ac_c* a_this) { kamome_class* i_this = (kamome_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Kamome", KAMOME_BDL_KA), + (J3DModelData*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BDL_KA_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("Kamome", KAMOME_BCK_KA_WAIT1), + (J3DAnmTransform*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BCK_KA_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Kamome", KAMOME_BAS_KA_WAIT1), + dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BAS_KA_WAIT1_e), 0x80000, 0x11000022 ); diff --git a/src/d/actor/d_a_kamome2.cpp b/src/d/actor/d_a_kamome2.cpp index 70d4ab0cb..8f13f8c14 100644 --- a/src/d/actor/d_a_kamome2.cpp +++ b/src/d/actor/d_a_kamome2.cpp @@ -1,6 +1,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kamome2.h" -#include "d/res/res_kamome.h" +#include "res/Object/Kamome.h" #include "m_Do/m_Do_ext.h" #include "d/d_camera.h" #include "d/d_meter.h" @@ -86,7 +86,7 @@ static void key_move(kamome2_class* i_this) { i_this->m2C0 = unused_4207[0]; if (!CPad_CHECK_HOLD_A(0) && iVar1 == REG0_S(0) + 9) { i_this->m2AC = 1; - anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, 2, 1.0f, KAMOME_BAS_KA_WAIT1); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e); } break; @@ -101,7 +101,7 @@ static void key_move(kamome2_class* i_this) { if (CPad_CHECK_HOLD_A(0)) { i_this->m2AC = 0; - anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, 2, 1.0f, KAMOME_BAS_KA_WAIT2); + anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, 2, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e); fopAcM_seStart(&i_this->actor, JA_SE_CV_KAMOME, 0); } break; @@ -263,16 +263,16 @@ static BOOL daKamome2_Delete(kamome2_class* i_this) { static BOOL useHeapInit(fopAc_ac_c* a_this) { kamome2_class* i_this = (kamome2_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Kamome", KAMOME_BDL_KA), + (J3DModelData*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BDL_KA_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("Kamome", KAMOME_BCK_KA_WAIT1), + (J3DAnmTransform*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BCK_KA_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0x1, - (void*)dComIfG_getObjectRes("Kamome", KAMOME_BAS_KA_WAIT1), + (void*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BAS_KA_WAIT1_e), 0x80000, 0x11000002 ); diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp index 5c5aad8c2..614cbec88 100644 --- a/src/d/actor/d_a_kanban.cpp +++ b/src/d/actor/d_a_kanban.cpp @@ -15,7 +15,7 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" #include "d/d_com_inf_game.h" -#include "d/res/res_kanban.h" +#include "res/Object/Kanban.h" class daKanban_HIO_c : public mDoHIO_entry_c { public: @@ -1008,17 +1008,17 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { for (s32 i = 0; i < 11; i++, uVar5 >>= 1) { if (!i_this->m290 || (uVar5 & 1)) { static s32 kanban_bdl[] = { - KANBAN_BDL_KANBAN, - KANBAN_BDL_KANBAN_01, - KANBAN_BDL_KANBAN_02, - KANBAN_BDL_KANBAN_03, - KANBAN_BDL_KANBAN_04, - KANBAN_BDL_KANBAN_05, - KANBAN_BDL_KANBAN_06, - KANBAN_BDL_KANBAN_07, - KANBAN_BDL_KANBAN_08, - KANBAN_BDL_KANBAN_09, - KANBAN_BDL_KANBAN_10, + dRes_INDEX_KANBAN_BDL_KANBAN_e, + dRes_INDEX_KANBAN_BDL_KANBAN_01_e, + dRes_INDEX_KANBAN_BDL_KANBAN_02_e, + dRes_INDEX_KANBAN_BDL_KANBAN_03_e, + dRes_INDEX_KANBAN_BDL_KANBAN_04_e, + dRes_INDEX_KANBAN_BDL_KANBAN_05_e, + dRes_INDEX_KANBAN_BDL_KANBAN_06_e, + dRes_INDEX_KANBAN_BDL_KANBAN_07_e, + dRes_INDEX_KANBAN_BDL_KANBAN_08_e, + dRes_INDEX_KANBAN_BDL_KANBAN_09_e, + dRes_INDEX_KANBAN_BDL_KANBAN_10_e, }; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kanban", kanban_bdl[i]); diff --git a/src/d/actor/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp index b09b9d40d..f1a91c92d 100644 --- a/src/d/actor/d_a_kantera.cpp +++ b/src/d/actor/d_a_kantera.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kantera.h" -#include "d/res/res_kantera.h" +#include "res/Object/Kantera.h" #include "d/d_kankyo.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" @@ -285,7 +285,7 @@ static BOOL daKantera_Delete(kantera_class* i_this) { static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) { kantera_class* i_this = (kantera_class*)a_this; - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Kantera", KANTERA_BMD_MK_KANTERA)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BMD_MK_KANTERA_e)); JUT_ASSERT(1014, modelData != NULL); i_this->mpModel1 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -293,7 +293,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) { return FALSE; } - J3DAnmTevRegKey* anm_res_brk = static_cast(dComIfG_getObjectRes("Kantera", KANTERA_BRK_MK_KANTERA)); + J3DAnmTevRegKey* anm_res_brk = static_cast(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BRK_MK_KANTERA_e)); JUT_ASSERT(1036, anm_res_brk != NULL); i_this->mpBrkAnm1 = new mDoExt_brkAnm(); @@ -305,7 +305,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) { return FALSE; } - modelData = static_cast(dComIfG_getObjectRes("Kantera", KANTERA_BMD_LF)); + modelData = static_cast(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BMD_LF_e)); JUT_ASSERT(1048, modelData != NULL); i_this->mpModel2 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -313,7 +313,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) { return FALSE; } - anm_res_brk = static_cast(dComIfG_getObjectRes("Kantera", KANTERA_BRK_LF)); + anm_res_brk = static_cast(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BRK_LF_e)); JUT_ASSERT(1058, anm_res_brk != NULL); i_this->mpBrkAnm2 = new mDoExt_brkAnm(); @@ -325,7 +325,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) { return FALSE; } - modelData = static_cast(dComIfG_getObjectRes("Kantera", KANTERA_BMD_GA)); + modelData = static_cast(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BMD_GA_e)); JUT_ASSERT(1125, modelData != NULL); for (s32 i = 0; i < ARRAY_SSIZE(i_this->mGa); i++) { diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index 5fc82513c..b0f07d02b 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -13,7 +13,7 @@ #include "d/d_path.h" #include "d/d_snap.h" #include "d/d_material.h" -#include "d/res/res_ki.h" +#include "res/Object/Ki.h" #include "m_Do/m_Do_hostIO.h" #include "f_op/f_op_actor_mng.h" #include "d/d_cc_uty.h" @@ -88,7 +88,7 @@ static kiHIO_c l_kiHIO; static s32 ki_all_count; static s32 ki_fight_count; -static u16 ki_tex_anm_idx[] = {KI_BTP_AKE1, KI_BTP_TOJI1, KI_BTP_METOJI1, KI_BTP_GURU1}; +static u16 ki_tex_anm_idx[] = {dRes_INDEX_KI_BTP_AKE1_e, dRes_INDEX_KI_BTP_TOJI1_e, dRes_INDEX_KI_BTP_METOJI1_e, dRes_INDEX_KI_BTP_GURU1_e}; static u16 ki_tex_max_frame[] = { 2, 2, 3, 2 }; static u8 ki_tex_loop[] = { 0, 0, 0, 0 }; @@ -287,7 +287,7 @@ void ki_wait_move(ki_class* i_this) { switch(i_this->mBehaviorType) { case 0: - anm_init(i_this, KI_BCK_WAIT1, 10.0f, 2, 1.0f, KI_BAS_WAIT1); + anm_init(i_this, dRes_INDEX_KI_BCK_WAIT1_e, 10.0f, 2, 1.0f, dRes_INDEX_KI_BAS_WAIT1_e); i_this->mBehaviorType = 1; tex_anm_set(i_this, 2); @@ -353,7 +353,7 @@ void ki_wait_move(ki_class* i_this) { if (sp58.abs() < 100.0f) { i_this->mBehaviorType = 0xb; i_this->mTimers[0] = 0x32; - anm_init(i_this, KI_BCK_WAIT1, 10.0f, 2, 1.0f, KI_BAS_WAIT1); + anm_init(i_this, dRes_INDEX_KI_BCK_WAIT1_e, 10.0f, 2, 1.0f, dRes_INDEX_KI_BAS_WAIT1_e); } break; @@ -382,7 +382,7 @@ void ki_fly_move(ki_class* i_this) { switch (i_this->mBehaviorType) { case 0: - anm_init(i_this, KI_BCK_FLY1, 10.0f, 2, l_kiHIO.m08, KI_BAS_FLY1); + anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 10.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e); i_this->mBehaviorType = 1; tex_anm_set(i_this, 0); i_this->mPosMoveTarget = l_kiHIO.m28; @@ -432,7 +432,7 @@ void ki_fire_set_move(ki_class* i_this) { case 0: a_this->speedF = REG8_F(8) + 35.0f + cM_rndF(10.0f); a_this->speed.y = REG8_F(9) + 97.0f + cM_rndF(30.0f); - anm_init(i_this, KI_BCK_WAIT1, 1.0f, 2, 1.0f, KI_BAS_WAIT1); + anm_init(i_this, dRes_INDEX_KI_BCK_WAIT1_e, 1.0f, 2, 1.0f, dRes_INDEX_KI_BAS_WAIT1_e); i_this->mBehaviorType = 1; i_this->m91C = dComIfGp_particle_set(dPa_name::ID_IT_SN_FIREK_FIRE_A, &a_this->current.pos, NULL, NULL, 0xFF, &i_this->m908); @@ -454,7 +454,7 @@ void ki_fire_set_move(ki_class* i_this) { break; case 10: - anm_init(i_this, KI_BCK_FLY1, 10.0f, 2, l_kiHIO.m08, KI_BAS_FLY1); + anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 10.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e); i_this->mBehaviorType = 0xb; i_this->mTimers[1] = 100; @@ -503,7 +503,7 @@ void ki_atack_move(ki_class* i_this) { switch(i_this->mBehaviorType) { case 0: - anm_init(i_this, KI_BCK_FLY1, 10.0f, 2, l_kiHIO.m08, KI_BAS_FLY1); + anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 10.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e); i_this->mBehaviorType = 1; tex_anm_set(i_this, 0); i_this->mTimers[0] = l_kiHIO.m50 + cM_rndF(std::fabsf(l_kiHIO.m4E - l_kiHIO.m50)); @@ -519,7 +519,7 @@ void ki_atack_move(ki_class* i_this) { cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 2, 0x1000); if (sp24.abs() < 300.0f) { i_this->mBehaviorType = 10; - anm_init(i_this, KI_BCK_FLY2, 5.0f, 2, l_kiHIO.m14, KI_BAS_FLY2); + anm_init(i_this, dRes_INDEX_KI_BCK_FLY2_e, 5.0f, 2, l_kiHIO.m14, dRes_INDEX_KI_BAS_FLY2_e); i_this->mPosMoveDist = 0.0f; } break; @@ -536,7 +536,7 @@ void ki_atack_move(ki_class* i_this) { if (cM_rndF(1.0f) < tmp) { i_this->mBehaviorType = 3; - anm_init(i_this, KI_BCK_ATTACK1, 5.0f, 2, l_kiHIO.m18, KI_BAS_ATTACK1); + anm_init(i_this, dRes_INDEX_KI_BCK_ATTACK1_e, 5.0f, 2, l_kiHIO.m18, dRes_INDEX_KI_BAS_ATTACK1_e); i_this->mPosMove = player->current.pos; i_this->mPosMove.y += 80.0f; a_this->current.angle.y = fopAcM_searchPlayerAngleY(a_this); @@ -594,14 +594,14 @@ void ki_atack_move(ki_class* i_this) { } if (i_this->mTimers[1] == 0) { - anm_init(i_this, KI_BCK_FLY1, 5.0f, 2, l_kiHIO.m08, KI_BAS_FLY1); + anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 5.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e); i_this->mBehaviorType = 1; } cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 2, 0x2000); if (i_this->m580.ChkAtHit() || i_this->mDamageSphere.ChkCoHit()) { - anm_init(i_this, KI_BCK_FLY2, 2.0f, 2, l_kiHIO.m14, KI_BAS_FLY2); + anm_init(i_this, dRes_INDEX_KI_BCK_FLY2_e, 2.0f, 2, l_kiHIO.m14, dRes_INDEX_KI_BAS_FLY2_e); i_this->mBehaviorType = 4; i_this->mTimers[1] = 30; a_this->speedF = -15.0f; @@ -612,7 +612,7 @@ void ki_atack_move(ki_class* i_this) { case 4: if (i_this->mTimers[1] == 0) { - anm_init(i_this, KI_BCK_FLY1, 3.0f, 2, l_kiHIO.m08, KI_BAS_FLY1); + anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 3.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e); i_this->mBehaviorType = 1; } break; @@ -683,7 +683,7 @@ void ki_atack_move(ki_class* i_this) { a_this->home.pos = linChk.GetCross(); a_this->home.pos.y -= 30.0f; i_this->mBehaviorType = 10; - anm_init(i_this, KI_BCK_FLY1, 5.0f, 2, l_kiHIO.m08, KI_BAS_FLY1); + anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 5.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e); } else { i_this->mTimers[0] = 50; i_this->mBehaviorType = 1; @@ -742,7 +742,7 @@ void ki_damage_move(ki_class* i_this) { switch (i_this->mBehaviorType) { case 0: - anm_init(i_this, KI_BCK_DAMAGE1, 2.0f, 0, 1.0f, KI_BAS_DAMAGE1); + anm_init(i_this, dRes_INDEX_KI_BCK_DAMAGE1_e, 2.0f, 0, 1.0f, dRes_INDEX_KI_BAS_DAMAGE1_e); tex_anm_set(i_this, 3); i_this->mBehaviorType = 1; @@ -761,7 +761,7 @@ void ki_damage_move(ki_class* i_this) { if (i_this->m31C >= l_kiHIO.m3C) { i_this->mBehaviorType = 2; i_this->mTimers[0] = 0x32; - anm_init(i_this, KI_BCK_BITA1, 1.0f, 0, 1.0f, KI_BAS_BITA1); + anm_init(i_this, dRes_INDEX_KI_BCK_BITA1_e, 1.0f, 0, 1.0f, dRes_INDEX_KI_BAS_BITA1_e); tex_anm_set(i_this, 3); i_this->actor.speed.y = 0.0f; csXyz shapeAngle = i_this->actor.shape_angle; @@ -1209,11 +1209,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i_this->mDamageType == 0) { i_this->actor.gbaName = 0x17; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Ki", KI_BDL_KI), + (J3DModelData*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BDL_KI_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("Ki", KI_BCK_WAIT1), + (J3DAnmTransform*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BCK_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Ki", KI_BAS_WAIT1), + dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BAS_WAIT1_e), 0x80000, 0x37221203 ); #if VERSION == VERSION_DEMO @@ -1227,11 +1227,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } else { i_this->actor.gbaName = 6; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Ki", KI_BDL_FK), + (J3DModelData*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BDL_FK_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("Ki", KI_BCK_WAIT1), + (J3DAnmTransform*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BCK_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Ki", KI_BAS_WAIT1), + dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BAS_WAIT1_e), 0x80000, 0x37221203 ); @@ -1251,7 +1251,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - if (!i_this->m920->init(model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Ki", KI_BTK_FK), true, J3DFrameCtrl::EMode_LOOP)) { + if (!i_this->m920->init(model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BTK_FK_e), true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } } diff --git a/src/d/actor/d_a_kita.cpp b/src/d/actor/d_a_kita.cpp index 04ab704a3..8a7363959 100644 --- a/src/d/actor/d_a_kita.cpp +++ b/src/d/actor/d_a_kita.cpp @@ -11,7 +11,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include "d/res/res_kita.h" +#include "res/Object/kita.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" @@ -367,7 +367,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) { BOOL ret; kita_class* actor = static_cast(i_this); - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Kita", KITA_BDL_VHLIF_00)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Kita", dRes_INDEX_KITA_BDL_VHLIF_00_e)); actor->mModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if(actor->mModel == NULL){ @@ -377,7 +377,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) { JUT_ASSERT(DEMO_SELECT(928, 946), modelData != NULL); actor->pm_bgw = new dBgW(); JUT_ASSERT(DEMO_SELECT(933, 951), actor->pm_bgw != NULL); - actor->pm_bgw->Set(static_cast(dComIfG_getObjectRes("Kita", KITA_DZB_HLIF_00)), cBgW::MOVE_BG_e, &actor->mBgwMtx); + actor->pm_bgw->Set(static_cast(dComIfG_getObjectRes("Kita", dRes_INDEX_KITA_DZB_HLIF_00_e)), cBgW::MOVE_BG_e, &actor->mBgwMtx); actor->pm_bgw->SetCrrFunc(dBgS_MoveBGProc_Typical); actor->pm_bgw->SetRideCallback(ride_call_back); ret = TRUE; diff --git a/src/d/actor/d_a_kmon.cpp b/src/d/actor/d_a_kmon.cpp index db4e5d468..0bd95fd43 100644 --- a/src/d/actor/d_a_kmon.cpp +++ b/src/d/actor/d_a_kmon.cpp @@ -25,21 +25,21 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000138-00000324 .text CreateHeap__8daKmon_cFv */ BOOL daKmon_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(daKmon_c::m_arcname, ALWAYS_BDL_VBELL)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(daKmon_c::m_arcname, dRes_INDEX_ALWAYS_BDL_VBELL_e)); JUT_ASSERT(166, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpModel == NULL) { return FALSE; } - J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(daKmon_c::m_arcname, ALWAYS_BTK_VBELL)); + J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(daKmon_c::m_arcname, dRes_INDEX_ALWAYS_BTK_VBELL_e)); JUT_ASSERT(176, pbtk != NULL); if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } mBtkAnm.setPlaySpeed(1.0); - J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(daKmon_c::m_arcname, ALWAYS_BCK_VBELL)); + J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(daKmon_c::m_arcname, dRes_INDEX_ALWAYS_BCK_VBELL_e)); JUT_ASSERT(188, pbck != NULL); if (!mBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; diff --git a/src/d/actor/d_a_kn.cpp b/src/d/actor/d_a_kn.cpp index 262761f5a..d64aca50a 100644 --- a/src/d/actor/d_a_kn.cpp +++ b/src/d/actor/d_a_kn.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kn.h" -#include "d/res/res_kn.h" +#include "res/Object/Kn.h" #include "d/d_s_play.h" #include "d/d_snap.h" #include "d/d_com_inf_game.h" @@ -139,7 +139,7 @@ void kn_move(kn_class* i_this) { switch (i_this->m2BD) { #if VERSION == VERSION_DEMO case Mode_0_e: - anm_init(i_this, KN_BCK_WALK, 5.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_KN_BCK_WALK_e, 5.0f, 2, 1.0f, -1); i_this->m2CC = -25.0f; i_this->actor.current.angle.z = -0x2000; i_this->m2BD++; @@ -160,9 +160,9 @@ void kn_move(kn_class* i_this) { #endif case Mode_10_e: if (cM_rnd() < 0.5f) { - anm_init(i_this, KN_BCK_WAIT01, 5.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_KN_BCK_WAIT01_e, 5.0f, 2, 1.0f, -1); } else { - anm_init(i_this, KN_BCK_WAIT02, 5.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_KN_BCK_WAIT02_e, 5.0f, 2, 1.0f, -1); } i_this->m2D2 = 0x800; i_this->m2CA = cM_rndF(2.0f) + 1.0f; @@ -183,7 +183,7 @@ void kn_move(kn_class* i_this) { break; case Mode_12_e: - anm_init(i_this, KN_BCK_WALK, 5.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_KN_BCK_WALK_e, 5.0f, 2, 1.0f, -1); i_this->m2D0 = i_this->actor.current.angle.y + cM_rndFX(10752.0f); i_this->m2E8 = f26; if (cM_rnd() < 0.5f) { @@ -246,7 +246,7 @@ void kn_move(kn_class* i_this) { i_this->m2E4 = 0.0; i_this->m2C0 = 0; i_this->m2C2[0] = 0x14; - anm_init(i_this, KN_BCK_PATA, 5.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_KN_BCK_PATA_e, 5.0f, 2, 1.0f, -1); i_this->m2BD++; case Mode_16_e: @@ -277,7 +277,7 @@ void kn_move(kn_class* i_this) { } else { shibuki_set(i_this); } - anm_init(i_this, KN_BCK_PATA, 5.0f, 2, 1.0f, -1); + anm_init(i_this, dRes_INDEX_KN_BCK_PATA_e, 5.0f, 2, 1.0f, -1); i_this->m2BD = Mode_17_e; } } @@ -296,7 +296,7 @@ void kn_move(kn_class* i_this) { break; case Mode_18_e: - anm_init(i_this, KN_BCK_WALK, 5.0f, 2, 2.0f, -1); + anm_init(i_this, dRes_INDEX_KN_BCK_WALK_e, 5.0f, 2, 2.0f, -1); i_this->m2E8 = 40.0; i_this->m2C2[0] = 0; i_this->m2C2[1] = 0; @@ -490,10 +490,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { kn_class* i_this = (kn_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("KN", KN_BDL_KN), + (J3DModelData*)dComIfG_getObjectRes("KN", dRes_INDEX_KN_BDL_KN_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("KN", KN_BCK_PATA), + (J3DAnmTransform*)dComIfG_getObjectRes("KN", dRes_INDEX_KN_BCK_PATA_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index ff9a0abb4..608d7cafa 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_obj_pirateship.h" #include "d/actor/d_a_npc_mt.h" #include "d/d_kankyo.h" -#include "d/res/res_knob.h" +#include "res/Object/Knob.h" #include "m_Do/m_Do_graphic.h" #include "d/d_com_inf_game.h" #include "ctype.h" @@ -32,7 +32,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) { /* 000000D4-000003B8 .text CreateHeap__10daKnob00_cFv */ BOOL daKnob00_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KNOB_BDL_DOOR); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KNOB_BDL_DOOR_e); JUT_ASSERT(VERSION_SELECT(145, 145, 163, 163), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -51,7 +51,7 @@ BOOL daKnob00_c::CreateHeap() { mDoMtx_stack_c::YrotM(current.angle.y); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); - J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, KNOB_BCK_DOOROPENADOOR); + J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KNOB_BCK_DOOROPENADOOR_e); if (!mBckAnm.init(modelData, anmTransform, true, J3DFrameCtrl::EMode_NONE)) { #if VERSION == VERSION_DEMO return cPhs_ERROR_e; @@ -66,35 +66,35 @@ BOOL daKnob00_c::CreateHeap() { s32 fileIndex; switch (getShapeType()) { case 1: - fileIndex = KNOB_BDL_DOOR_B; + fileIndex = dRes_INDEX_KNOB_BDL_DOOR_B_e; break; case 2: - fileIndex = KNOB_BDL_DOOR_C; + fileIndex = dRes_INDEX_KNOB_BDL_DOOR_C_e; break; case 3: - fileIndex = KNOB_BDL_DOOR_D; + fileIndex = dRes_INDEX_KNOB_BDL_DOOR_D_e; break; case 4: - fileIndex = KNOB_BDL_DOOR_E; + fileIndex = dRes_INDEX_KNOB_BDL_DOOR_E_e; break; case 5: - fileIndex = KNOB_BDL_DOOR_F; + fileIndex = dRes_INDEX_KNOB_BDL_DOOR_F_e; break; case 6: - fileIndex = KNOB_BDL_DOOR_G; + fileIndex = dRes_INDEX_KNOB_BDL_DOOR_G_e; break; case 7: - fileIndex = KNOB_BDL_DOOR_H; + fileIndex = dRes_INDEX_KNOB_BDL_DOOR_H_e; break; default: - fileIndex = KNOB_BDL_DOOR_A; + fileIndex = dRes_INDEX_KNOB_BDL_DOOR_A_e; break; } @@ -113,7 +113,7 @@ BOOL daKnob00_c::CreateHeap() { return FALSE; } - cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(M_arcname, KNOB_DZB_DOOR); + cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KNOB_DZB_DOOR_e); if (bgd == NULL) { return FALSE; @@ -208,7 +208,7 @@ BOOL daKnob00_c::msgDoor() { /* 000005DC-000006F0 .text openInit__10daKnob00_cFi */ void daKnob00_c::openInit(int arg1) { - static s32 bck_table[] = { KNOB_BCK_DOOROPENADOOR, KNOB_BCK_DOOROPENBDOOR, KNOB_BCK_DOOROPENADOOR, KNOB_BCK_DOOROPENBDOOR }; + static s32 bck_table[] = { dRes_INDEX_KNOB_BCK_DOOROPENADOOR_e, dRes_INDEX_KNOB_BCK_DOOROPENBDOOR_e, dRes_INDEX_KNOB_BCK_DOOROPENADOOR_e, dRes_INDEX_KNOB_BCK_DOOROPENBDOOR_e }; J3DModelData* modelData = mpModel->getModelData(); s32 iVar2 = mBckAnm.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, bck_table[arg1]), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true); diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index 5398ac1b4..14e5e3b17 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/src/d/actor/d_a_kokiie.cpp @@ -9,7 +9,7 @@ #include "d/d_s_play.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" -#include "d/res/res_kokiie.h" +#include "res/Object/Kokiie.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "JSystem/JUtility/JUTReport.h" @@ -354,7 +354,7 @@ static BOOL daKokiie_Delete(kokiie_class* i_this) { static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { kokiie_class* actor = (kokiie_class*)a_this; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kokiie", KOKIIE_BDL_KOKI_00); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kokiie", dRes_INDEX_KOKIIE_BDL_KOKI_00_e); actor->mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (actor->mpModel == NULL) { return FALSE; @@ -365,7 +365,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { actor->pm_bgw = new dBgW(); JUT_ASSERT(DEMO_SELECT(929, 950), actor->pm_bgw != NULL); - actor->pm_bgw->Set((cBgD_t*)dComIfG_getObjectRes("Kokiie", KOKIIE_DZB_KOKI_00), dBgW::MOVE_BG_e, &actor->m340); + actor->pm_bgw->Set((cBgD_t*)dComIfG_getObjectRes("Kokiie", dRes_INDEX_KOKIIE_DZB_KOKI_00_e), dBgW::MOVE_BG_e, &actor->m340); actor->pm_bgw->SetCrrFunc(dBgS_MoveBGProc_Typical); return TRUE; } diff --git a/src/d/actor/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp index b136939cd..accd56c1c 100644 --- a/src/d/actor/d_a_komore.cpp +++ b/src/d/actor/d_a_komore.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_komore.h" #include "d/d_com_inf_game.h" -#include "d/res/res_frlt.h" +#include "res/Object/frLt.h" const char daKomore::Act_c::M_arcname[] = "frLt"; @@ -20,7 +20,7 @@ bool daKomore::Act_c::create_heap() { J3DModelData* mdl_data; J3DAnmTextureSRTKey* btk_data; - mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, FRLT_BDL_YFRLT00)); + mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, dRes_INDEX_FRLT_BDL_YFRLT00_e)); JUT_ASSERT(0x66, mdl_data != NULL); @@ -28,7 +28,7 @@ bool daKomore::Act_c::create_heap() { mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203); } - btk_data = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes(M_arcname, FRLT_BTK_YFRLT00)); + btk_data = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes(M_arcname, dRes_INDEX_FRLT_BTK_YFRLT00_e)); JUT_ASSERT(0x6d, btk_data != NULL); diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index 79f2a930c..eff1082d9 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/src/d/actor/d_a_ks.cpp @@ -11,7 +11,7 @@ #include "d/d_snap.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_gm.h" -#include "d/res/res_ks.h" +#include "res/Object/Ks.h" static int KS_ALL_COUNT = 0; static int KUTTUKU_ALL_COUNT = 0; @@ -1509,7 +1509,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { ks_class* i_this = (ks_class*)i_act; - i_this->mpBodyMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("KS", KS_BDL_KS_BODY), NULL, NULL, NULL, + i_this->mpBodyMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BDL_KS_BODY_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203); if (i_this->mpBodyMorf == NULL || i_this->mpBodyMorf->getModel() == NULL) return FALSE; @@ -1519,12 +1519,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { if (i_this->mpBodyBrkAnm == NULL) return FALSE; - if (i_this->mpBodyBrkAnm->init(bodyModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_BODY), TRUE, J3DFrameCtrl::EMode_NONE) == 0) + if (i_this->mpBodyBrkAnm->init(bodyModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BRK_KS_BODY_e), TRUE, J3DFrameCtrl::EMode_NONE) == 0) return FALSE; - i_this->mpEyeMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("KS", KS_BDL_KS_EYE), NULL, NULL, - (J3DAnmTransformKey *)dComIfG_getObjectRes("KS", KS_BCK_MABATAKI), + i_this->mpEyeMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BDL_KS_EYE_e), NULL, NULL, + (J3DAnmTransformKey *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BCK_MABATAKI_e), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1, NULL, 0, 0x11020203); if (i_this->mpEyeMorf == NULL || i_this->mpEyeMorf->getModel() == NULL) @@ -1535,14 +1535,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { if (i_this->mpEyeBtkAnm == NULL) return FALSE; - if (i_this->mpEyeBtkAnm->init(eyeModel->getModelData(), (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("KS", KS_BTK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) + if (i_this->mpEyeBtkAnm->init(eyeModel->getModelData(), (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BTK_KS_EYE_e), TRUE, J3DFrameCtrl::EMode_NONE) == 0) return FALSE; i_this->mpEyeBrkAnm = new mDoExt_brkAnm(); if (i_this->mpEyeBrkAnm == NULL) return FALSE; - if (i_this->mpEyeBrkAnm->init(eyeModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) { + if (i_this->mpEyeBrkAnm->init(eyeModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BRK_KS_EYE_e), TRUE, J3DFrameCtrl::EMode_NONE) == 0) { return FALSE; } return TRUE; diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp index 28a7aae15..4543d890f 100644 --- a/src/d/actor/d_a_kt.cpp +++ b/src/d/actor/d_a_kt.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kt.h" -#include "d/res/res_kt.h" +#include "res/Object/Kt.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -315,10 +315,10 @@ static BOOL daKt_Delete(kt_class* i_this) { static BOOL daKt_solidHeapCB(fopAc_ac_c* i_ac) { kt_class* i_this = (kt_class*)i_ac; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kt", KT_INDEX_BMD_KT_MODEL); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kt", dRes_INDEX_KT_BMD_KT_MODEL_e); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x10000, 0x11020203); - J3DModelData* modelDataWing = (J3DModelData*)dComIfG_getObjectRes("Kt", KT_INDEX_BMD_KT_HANE); + J3DModelData* modelDataWing = (J3DModelData*)dComIfG_getObjectRes("Kt", dRes_INDEX_KT_BMD_KT_HANE_e); i_this->mpModelWing = mDoExt_J3DModel__create(modelDataWing, 0x10000, 0x11020203); return modelData != NULL && modelDataWing != NULL && i_this->mpModel != NULL && i_this->mpModelWing != NULL; diff --git a/src/d/actor/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp index 4da99d8e8..040dd130d 100644 --- a/src/d/actor/d_a_kui.cpp +++ b/src/d/actor/d_a_kui.cpp @@ -12,7 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" #include "d/d_s_play.h" -#include "d/res/res_kui.h" +#include "res/Object/Kui.h" #include "f_op/f_op_camera.h" #include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_executor.h" @@ -409,7 +409,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) { if (i_this->type == 3) { // Bell body - modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", KUI_BDL_HKANE1); + modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_BDL_HKANE1_e); JUT_ASSERT(0x353, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -418,7 +418,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) { } // Bell handle - modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", KUI_BDL_HKANE2); + modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_BDL_HKANE2_e); JUT_ASSERT(0x35F, modelData != NULL); i_this->mpModel2 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -427,7 +427,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) { } } else { // Rope - modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", KUI_BDL_OBI_ROPETAG); + modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_BDL_OBI_ROPETAG_e); JUT_ASSERT(0x36B, modelData != NULL); i_this->mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); @@ -437,7 +437,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) { if (i_this->type == 2 || i_this->type == 4) { // Rope swing attachment - modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", KUI_BDL_MROPESW); + modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_BDL_MROPESW_e); JUT_ASSERT(0x377, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); @@ -453,7 +453,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) { return FALSE; } - cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("Kui", KUI_DZB_OBI_ROPETAG); + cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_DZB_OBI_ROPETAG_e); if (i_this->field_0x2D8->Set(pData, cBgW::MOVE_BG_e, &i_this->field_0x2A8) == true) { return FALSE; } diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 9d48c5439..c2890c0f9 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -7,13 +7,13 @@ #include "d/actor/d_a_kytag03.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" -#include "d/res/res_m_door.h" +#include "res/Object/M_door.h" /* 00000078-0000015C .text useHeapInit__FP10fopAc_ac_c */ 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), + (J3DModelData*)dComIfG_getObjectRes("M_DOOR", dRes_INDEX_M_DOOR_BDL_MYAMIF_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, 1, NULL, 0x0, 0x11020203 ); diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index 081f7bd88..45a8b0b96 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_lamp.h" -#include "d/res/res_lamp.h" +#include "res/Object/Lamp.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -123,7 +123,7 @@ static BOOL daLamp_Delete(lamp_class* i_this) { /* 00000678-0000073C .text useHeapInit__FP10lamp_class */ static BOOL useHeapInit(lamp_class* i_this) { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Lamp", LAMP_BMD_LAMP_00)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Lamp", dRes_INDEX_LAMP_BMD_LAMP_00_e)); JUT_ASSERT(0x170, modelData != NULL); i_this->mModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index bdbfc9e3f..a91cbdfef 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_lbridge.h" #include "d/d_com_inf_game.h" -#include "d/res/res_gbrg00.h" +#include "res/Object/Gbrg00.h" const char daLbridge_c::m_arcname[] = "Gbrg00"; @@ -17,7 +17,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-00000384 .text CreateHeap__11daLbridge_cFv */ BOOL daLbridge_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, GBRG00_BDL_GBRG00); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_BDL_GBRG00_e); JUT_ASSERT(DEMO_SELECT(213, 214), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000U, 0x11000223U); @@ -26,14 +26,14 @@ BOOL daLbridge_c::CreateHeap() { return FALSE; } - J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BTK_GBRG00); + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_BTK_GBRG00_e); JUT_ASSERT(DEMO_SELECT(231, 232), pbtk != NULL); if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } - J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, GBRG00_BPK_GBRG00); + J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_BPK_GBRG00_e); JUT_ASSERT(DEMO_SELECT(245, 246), pbpk != NULL); if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_NONE)) { @@ -43,7 +43,7 @@ BOOL daLbridge_c::CreateHeap() { mBpkAnm.setFrame(0.0f); mBpkAnm.setPlaySpeed(1.0f); - J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BRK_GBRG00); + J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_BRK_GBRG00_e); JUT_ASSERT(DEMO_SELECT(261, 262), pbrk != NULL); if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP)) { @@ -55,7 +55,7 @@ BOOL daLbridge_c::CreateHeap() { mpBgW = new dBgW(); if (mpBgW != NULL) { - if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, GBRG00_DZB_HHASHI1), cBgW::MOVE_BG_e, &mMtx) == true) { + if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_DZB_HHASHI1_e), cBgW::MOVE_BG_e, &mMtx) == true) { return FALSE; } else { return TRUE; diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index f9e36fa65..993b9455b 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -9,7 +9,7 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/res/res_olift.h" +#include "res/Object/Olift.h" #include "m_Do/m_Do_ext.h" static dCcD_SrcCyl l_cyl_src = { @@ -79,7 +79,7 @@ static void rideCallBack(dBgW* param1, fopAc_ac_c* i_this, fopAc_ac_c* i_other); /* 000001E0-00000338 .text CreateHeap__9daLlift_cFv */ BOOL daLlift_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, OLIFT_BDL_OLIFT); + J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_OLIFT_BDL_OLIFT_e); JUT_ASSERT(DEMO_SELECT(327, 334), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -90,7 +90,7 @@ BOOL daLlift_c::CreateHeap() { mpModel->setUserArea((u32)this); mpBgW = new dBgW(); if (mpBgW) { - cBgD_t* pData = (cBgD_t *)dComIfG_getObjectRes(m_arcname, OLIFT_DZB_OLIFT); + cBgD_t* pData = (cBgD_t *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_OLIFT_DZB_OLIFT_e); if (mpBgW->Set(pData, cBgW::MOVE_BG_e, &mMtx) == 1) { return FALSE; } diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp index 88c31c7ef..53a19f7d2 100644 --- a/src/d/actor/d_a_lwood.cpp +++ b/src/d/actor/d_a_lwood.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_lwood.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" -#include "d/res/res_lwood.h" +#include "res/Object/Lwood.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" @@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-00000194 .text CreateHeap__9daLwood_cFv */ BOOL daLwood_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, LWOOD_BDL_ALWD); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_LWOOD_BDL_ALWD_e); JUT_ASSERT(0xb9, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); if (mModel == NULL) @@ -28,7 +28,7 @@ BOOL daLwood_c::CreateHeap() { mModel->setUserArea((u32)this); setMoveBGMtx(); - cBgD_t* bgp = (cBgD_t*)dComIfG_getObjectRes(m_arcname, LWOOD_DZB_ALWD); + cBgD_t* bgp = (cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_LWOOD_DZB_ALWD_e); mpBgW = dBgW_NewSet(bgp, dBgW::MOVE_BG_e, &mtx); if (mpBgW == NULL) return FALSE; diff --git a/src/d/actor/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp index cf08f411f..4bc7a15e9 100644 --- a/src/d/actor/d_a_machine.cpp +++ b/src/d/actor/d_a_machine.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" -#include "d/res/res_hkikai1.h" +#include "res/Object/Hkikai1.h" static dCcD_SrcSph l_sph_src_at = { // dCcD_SrcGObjInf @@ -90,14 +90,14 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { BOOL daMachine_c::CreateHeap() { BOOL success; - J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, HKIKAI1_BDL_HKIKAI1); + J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HKIKAI1_BDL_HKIKAI1_e); JUT_ASSERT(DEMO_SELECT(340, 345), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222); if(mpModel == NULL) { success = false; } else{ - J3DAnmTransform * pbck = (J3DAnmTransform *)dComIfG_getObjectRes(m_arcname, HKIKAI1_BCK_HKIKAI1); + J3DAnmTransform * pbck = (J3DAnmTransform *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HKIKAI1_BCK_HKIKAI1_e); JUT_ASSERT(DEMO_SELECT(356, 361), pbck != NULL) int initRet = field_0xc04.init(modelData,pbck, true, 0,1.0f,0,-1,false); diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index e525bd3d7..241a0a8b6 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -8,10 +8,10 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "d/d_s_play.h" -#include "d/res/res_cloth.h" -#include "d/res/res_matif.h" -#include "d/res/res_vsvfg.h" -#include "d/res/res_xhcf.h" +#include "res/Object/Cloth.h" +#include "res/Object/Matif.h" +#include "res/Object/Vsvfg.h" +#include "res/Object/Xhcf.h" #include "dolphin/gx/GXTexture.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" @@ -993,11 +993,11 @@ static cPhs_State daMajuu_Flag_Create(fopAc_ac_c* a_this) { if (i_this->mTexType != 0) { if (i_this->mTexType == 1) { - texInfo = (ResTIMG*)dComIfG_getObjectRes("Matif", MATIF_BTI_FLAG_MATI); + texInfo = (ResTIMG*)dComIfG_getObjectRes("Matif", dRes_INDEX_MATIF_BTI_FLAG_MATI_e); } else if (i_this->mTexType == 2) { - texInfo = (ResTIMG*)dComIfG_getObjectRes("Vsvfg", VSVFG_BTI_VSVFG); + texInfo = (ResTIMG*)dComIfG_getObjectRes("Vsvfg", dRes_INDEX_VSVFG_BTI_VSVFG_e); } else if (i_this->mTexType == 3) { - texInfo = (ResTIMG*)dComIfG_getObjectRes("Xhcf", XHCF_BTI_X_HC_FLAG00); + texInfo = (ResTIMG*)dComIfG_getObjectRes("Xhcf", dRes_INDEX_XHCF_BTI_X_HC_FLAG00_e); } mip = GXBool(texInfo->mipmapCount > 1); GXInitTexObj( @@ -1026,7 +1026,7 @@ static cPhs_State daMajuu_Flag_Create(fopAc_ac_c* a_this) { GXInitTexObjLOD(i_this->mPacket.getImageTexObj(), GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1); } - texInfo = (ResTIMG*)dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON); + texInfo = (ResTIMG*)dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e); mip = GXBool(texInfo->mipmapCount > 1); GXInitTexObj( i_this->mPacket.getToonTexObj(), diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index 47992a3dd..bd5248a74 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -5,8 +5,8 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mbdoor.h" -#include "d/res/res_mbdoor.h" -#include "d/res/res_gbdoor.h" +#include "res/Object/Mbdoor.h" +#include "res/Object/Gbdoor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" @@ -54,9 +54,9 @@ const char* daMbdoor_c::getArcName() { u32 daMbdoor_c::getFuBdl() { switch (getShapeType()) { case 1: - return GBDOOR_BDL_V_GBDFU; + return dRes_INDEX_GBDOOR_BDL_V_GBDFU_e; default: - return MBDOOR_BDL_S_MBDFU; + return dRes_INDEX_MBDOOR_BDL_S_MBDFU_e; } } @@ -64,9 +64,9 @@ u32 daMbdoor_c::getFuBdl() { u32 daMbdoor_c::getLBdl() { switch (getShapeType()) { case 1: - return GBDOOR_BDL_V_GBD_L; + return dRes_INDEX_GBDOOR_BDL_V_GBD_L_e; default: - return MBDOOR_BDL_S_MBD_L; + return dRes_INDEX_MBDOOR_BDL_S_MBD_L_e; } } @@ -74,9 +74,9 @@ u32 daMbdoor_c::getLBdl() { u32 daMbdoor_c::getRBdl() { switch (getShapeType()) { case 1: - return GBDOOR_BDL_V_GBD_R; + return dRes_INDEX_GBDOOR_BDL_V_GBD_R_e; default: - return MBDOOR_BDL_S_MBD_R; + return dRes_INDEX_MBDOOR_BDL_S_MBD_R_e; } } @@ -84,9 +84,9 @@ u32 daMbdoor_c::getRBdl() { u32 daMbdoor_c::getToBdl() { switch (getShapeType()) { case 1: - return GBDOOR_BDL_V_GBDTO; + return dRes_INDEX_GBDOOR_BDL_V_GBDTO_e; default: - return MBDOOR_BDL_S_MBDTO; + return dRes_INDEX_MBDOOR_BDL_S_MBDTO_e; } } @@ -94,9 +94,9 @@ u32 daMbdoor_c::getToBdl() { u32 daMbdoor_c::getDzb() { switch (getShapeType()) { case 1: - return GBDOOR_DZB_GBD; + return dRes_INDEX_GBDOOR_DZB_GBD_e; default: - return MBDOOR_DZB_S_MBDFU; + return dRes_INDEX_MBDOOR_DZB_S_MBDFU_e; } } diff --git a/src/d/actor/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp index bfa17bece..340720859 100644 --- a/src/d/actor/d_a_mdoor.cpp +++ b/src/d/actor/d_a_mdoor.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_mdoor.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/res/res_mdoor.h" +#include "res/Object/Mdoor.h" #include "f_op/f_op_actor_mng.h" const char daMdoor_c::M_arcname[] = "Mdoor"; @@ -44,13 +44,13 @@ BOOL daMdoor_c::CreateHeap() { switch (getShapeType()) { case 1: - modelRes = MDOOR_BDL_MORI2; - bgdRes = MDOOR_DZB_MORI2; + modelRes = dRes_INDEX_MDOOR_BDL_MORI2_e; + bgdRes = dRes_INDEX_MDOOR_DZB_MORI2_e; break; default: - modelRes = MDOOR_BDL_MORI1; - bgdRes = MDOOR_DZB_MORI1; + modelRes = dRes_INDEX_MDOOR_BDL_MORI1_e; + bgdRes = dRes_INDEX_MDOOR_DZB_MORI1_e; break; } diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp index 0ef48a3bc..03c79acb8 100644 --- a/src/d/actor/d_a_mflft.cpp +++ b/src/d/actor/d_a_mflft.cpp @@ -5,8 +5,8 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mflft.h" -#include "d/res/res_mflft.h" -#include "d/res/res_always.h" +#include "res/Object/Mflft.h" +#include "res/Object/Always.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" @@ -543,7 +543,7 @@ static BOOL daMflft_Delete(mflft_class* i_this) { static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { mflft_class* actor = (mflft_class*)a_this; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Mflft", MFLFT_BDL_MFLFT); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Mflft", dRes_INDEX_MFLFT_BDL_MFLFT_e); actor->mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (actor->mpModel == NULL) { return FALSE; @@ -554,10 +554,10 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) { actor->pm_bgw = new dBgW(); JUT_ASSERT(DEMO_SELECT(1047, 1058), actor->pm_bgw != NULL); - actor->pm_bgw->Set((cBgD_t*)dComIfG_getObjectRes("Mflft", MFLFT_DZB_MFLFT), dBgW::MOVE_BG_e, &actor->m700); + actor->pm_bgw->Set((cBgD_t*)dComIfG_getObjectRes("Mflft", dRes_INDEX_MFLFT_DZB_MFLFT_e), dBgW::MOVE_BG_e, &actor->m700); actor->pm_bgw->SetCrrFunc(dBgS_MoveBGProc_Typical); actor->pm_bgw->SetRideCallback(ride_call_back); - if (!actor->mLineMat.init(6, 10, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 1)) { + if (!actor->mLineMat.init(6, 10, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { return FALSE; } return TRUE; diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index bdbee65b1..427a0ae53 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -16,7 +16,7 @@ #include "d/d_s_play.h" #include "d/d_material.h" #include "d/d_snap.h" -#include "d/res/res_mo2.h" +#include "res/Object/Mo2.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" @@ -70,39 +70,39 @@ struct attack_info_s { }; static attack_info_s Atsuki_info[] = { - {MO2_BCK_ATSUKI01, 1.0f, MO2_BAS_ATSUKI01}, - {MO2_BCK_ATSUKI02, 1.0f, MO2_BAS_ATSUKI02}, - {MO2_BCK_ATSUKI03, 1.0f, MO2_BAS_ATSUKI03}, + {dRes_INDEX_MO2_BCK_ATSUKI01_e, 1.0f, dRes_INDEX_MO2_BAS_ATSUKI01_e}, + {dRes_INDEX_MO2_BCK_ATSUKI02_e, 1.0f, dRes_INDEX_MO2_BAS_ATSUKI02_e}, + {dRes_INDEX_MO2_BCK_ATSUKI03_e, 1.0f, dRes_INDEX_MO2_BAS_ATSUKI03_e}, }; static attack_info_s Atate_info[] = { - {MO2_BCK_ATATE01, 1.0f, MO2_BAS_ATATE01}, - {MO2_BCK_ATATE02, 1.0f, MO2_BAS_ATATE02}, - {MO2_BCK_ATATE03, 1.0f, MO2_BAS_ATATE03}, + {dRes_INDEX_MO2_BCK_ATATE01_e, 1.0f, dRes_INDEX_MO2_BAS_ATATE01_e}, + {dRes_INDEX_MO2_BCK_ATATE02_e, 1.0f, dRes_INDEX_MO2_BAS_ATATE02_e}, + {dRes_INDEX_MO2_BCK_ATATE03_e, 1.0f, dRes_INDEX_MO2_BAS_ATATE03_e}, }; static attack_info_s Akaiten_info[] = { - {MO2_BCK_AKAITEN01, 1.0f, MO2_BAS_AKAITEN01}, - {MO2_BCK_AKAITEN02, 1.0f, MO2_BAS_AKAITEN02}, - {MO2_BCK_AKAITEN03, 1.0f, MO2_BAS_AKAITEN03}, + {dRes_INDEX_MO2_BCK_AKAITEN01_e, 1.0f, dRes_INDEX_MO2_BAS_AKAITEN01_e}, + {dRes_INDEX_MO2_BCK_AKAITEN02_e, 1.0f, dRes_INDEX_MO2_BAS_AKAITEN02_e}, + {dRes_INDEX_MO2_BCK_AKAITEN03_e, 1.0f, dRes_INDEX_MO2_BAS_AKAITEN03_e}, }; static attack_info_s Ahazushi_info[] = { - {MO2_BCK_AHAZUSHI01, 1.0f, MO2_BAS_AHAZUSHI01}, - {MO2_BCK_AHAZUSHI02, 1.0f, MO2_BAS_AHAZUSHI02}, - {MO2_BCK_AHAZUSHI03, 1.0f, MO2_BAS_AHAZUSHI03}, + {dRes_INDEX_MO2_BCK_AHAZUSHI01_e, 1.0f, dRes_INDEX_MO2_BAS_AHAZUSHI01_e}, + {dRes_INDEX_MO2_BCK_AHAZUSHI02_e, 1.0f, dRes_INDEX_MO2_BAS_AHAZUSHI02_e}, + {dRes_INDEX_MO2_BCK_AHAZUSHI03_e, 1.0f, dRes_INDEX_MO2_BAS_AHAZUSHI03_e}, }; static attack_info_s Najab_info[] = { - {MO2_BCK_NAJAB, 1.0f, MO2_BAS_NAJAB}, - {MO2_BCK_NAJAB, 1.0f, MO2_BAS_NAJAB}, - {MO2_BCK_NAJAB, 1.0f, MO2_BAS_NAJAB}, + {dRes_INDEX_MO2_BCK_NAJAB_e, 1.0f, dRes_INDEX_MO2_BAS_NAJAB_e}, + {dRes_INDEX_MO2_BCK_NAJAB_e, 1.0f, dRes_INDEX_MO2_BAS_NAJAB_e}, + {dRes_INDEX_MO2_BCK_NAJAB_e, 1.0f, dRes_INDEX_MO2_BAS_NAJAB_e}, }; static attack_info_s Nabigpunch_info[] = { - {MO2_BCK_NABIGPUNCH01, 1.0f, MO2_BAS_NABIGPUNCH01}, - {MO2_BCK_NABIGPUNCH02, 1.0f, MO2_BAS_NABIGPUNCH02}, - {MO2_BCK_NABIGPUNCH03, 1.0f, MO2_BAS_NABIGPUNCH03}, + {dRes_INDEX_MO2_BCK_NABIGPUNCH01_e, 1.0f, dRes_INDEX_MO2_BAS_NABIGPUNCH01_e}, + {dRes_INDEX_MO2_BCK_NABIGPUNCH02_e, 1.0f, dRes_INDEX_MO2_BAS_NABIGPUNCH02_e}, + {dRes_INDEX_MO2_BCK_NABIGPUNCH03_e, 1.0f, dRes_INDEX_MO2_BAS_NABIGPUNCH03_e}, }; static attack_info_s* attack_info[] = { @@ -1064,18 +1064,18 @@ static s32 daMo2_player_way_check(mo2_class* i_this) { static void wait_set(mo2_class* i_this) { if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) { if (i_this->mMode == 1) { - anm_init(i_this, MO2_BCK_KWAIT, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KWAIT); + anm_init(i_this, dRes_INDEX_MO2_BCK_KWAIT_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_KWAIT_e); i_this->m05A4[1] = cM_rndF(100.0f) + 100.0f; return; } - anm_init(i_this, MO2_BCK_WAIT, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_WAIT); + anm_init(i_this, dRes_INDEX_MO2_BCK_WAIT_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_WAIT_e); i_this->m05A4[1] = cM_rndF(60.0f) + 40.0f; return; } if (i_this->mDamageReaction.mAction >= ACTION_FIGHT_RUN) { - anm_init(i_this, MO2_BCK_NBWAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWAIT); + anm_init(i_this, dRes_INDEX_MO2_BCK_NBWAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWAIT_e); } else { - anm_init(i_this, MO2_BCK_SKYORO, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SKYORO); + anm_init(i_this, dRes_INDEX_MO2_BCK_SKYORO_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SKYORO_e); } i_this->m05A4[1] = cM_rndF(30.0f) + 50.0f; } @@ -1084,25 +1084,25 @@ static void wait_set(mo2_class* i_this) { static void walk_set(mo2_class* i_this) { if (i_this->mbHasInnateWeapon != 0) { if (i_this->mMode == 1) { - anm_init(i_this, MO2_BCK_KWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_KWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_KWALK_e); return; } - anm_init(i_this, MO2_BCK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_WALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_WALK_e); return; } if (i_this->m2943 == 0) { - anm_init(i_this, MO2_BCK_NWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_NWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NWALK_e); } else { - anm_init(i_this, MO2_BCK_NYWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NYWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_NYWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NYWALK_e); } } /* 0000410C-00004170 .text fight_run_set__FP9mo2_class */ static void fight_run_set(mo2_class* i_this) { if (i_this->mbHasInnateWeapon != 0) { - anm_init(i_this, MO2_BCK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, MO2_BAS_WALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_MO2_BAS_WALK_e); } else { - anm_init(i_this, MO2_BCK_SWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_SWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SWALK_e); } } @@ -1416,7 +1416,7 @@ static void jyunkai(mo2_class* i_this) { if (point->mArg3 == 7 || point->mArg3 == 8) { i_this->mDamageReaction.mMode = 4; i_this->m05A4[1] = cM_rndF(100.0f) + 100.0f; - anm_init(i_this, MO2_BCK_KKEIKAI, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KKEIKAI); + anm_init(i_this, dRes_INDEX_MO2_BCK_KKEIKAI_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_KKEIKAI_e); if (point->mArg3 == 7) { i_this->mDamageReaction.m4D0 += -0x4000; } else { @@ -1541,7 +1541,7 @@ static void fight_run(mo2_class* i_this) { if (daMo2_player_way_check(i_this)) { if (i_this->m2964 > 0x14) { i_this->m2964 = 0; - anm_init(i_this, MO2_BCK_GAKEDEMO, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_MO2_BCK_GAKEDEMO_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m05B0 = cM_rndF(10.0f) + 15.0f; } if (i_this->m05B0 == 1) { @@ -1555,7 +1555,7 @@ static void fight_run(mo2_class* i_this) { } else { if (i_this->m2964 == 0 && i_this->mbHasInnateWeapon != 0) { i_this->m2964 = 1; - anm_init(i_this, MO2_BCK_DASH, 5.0f, J3DFrameCtrl::EMode_LOOP, l_mo2HIO.m070, MO2_BAS_DASH); + anm_init(i_this, dRes_INDEX_MO2_BCK_DASH_e, 5.0f, J3DFrameCtrl::EMode_LOOP, l_mo2HIO.m070, dRes_INDEX_MO2_BAS_DASH_e); } if (i_this->m2964 != 0) { i_this->m2964 = i_this->m2964 + 1; @@ -1576,9 +1576,9 @@ static void fight_run(mo2_class* i_this) { } else { if (std::fabsf(dVar9) > 0.1f) { if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) { - anm_init(i_this, MO2_BCK_BWALKLR, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKLR); + anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKLR_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_BWALKLR_e); } else { - anm_init(i_this, MO2_BCK_NBWALKLR, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKLR); + anm_init(i_this, dRes_INDEX_MO2_BCK_NBWALKLR_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWALKLR_e); } if (dVar9 > 0.0f) { i_this->mDamageReaction.mMode = 5; @@ -1588,16 +1588,16 @@ static void fight_run(mo2_class* i_this) { } else { if (i_this->m05C0 < l_mo2HIO.m034) { if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) { - anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, MO2_BAS_BWALKFB); + anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, dRes_INDEX_MO2_BAS_BWALKFB_e); } else { - anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, MO2_BAS_NBWALKFB); + anm_init(i_this, dRes_INDEX_MO2_BCK_NBWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, dRes_INDEX_MO2_BAS_NBWALKFB_e); } i_this->mDamageReaction.mMode = 4; } else { if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) { - anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKFB); + anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_BWALKFB_e); } else { - anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKFB); + anm_init(i_this, dRes_INDEX_MO2_BCK_NBWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWALKFB_e); } i_this->mDamageReaction.mMode = 3; } @@ -1620,9 +1620,9 @@ static void fight_run(mo2_class* i_this) { } else { i_this->mDamageReaction.mMode = 3; if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) { - anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKFB); + anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_BWALKFB_e); } else { - anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKFB); + anm_init(i_this, dRes_INDEX_MO2_BCK_NBWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWALKFB_e); } } break; @@ -2029,7 +2029,7 @@ static void nage(mo2_class* i_this) { { i_this->m05A4[1] = l_mo2HIO.m00A + l_mo2HIO.m00C; i_this->m05A4[2] = l_mo2HIO.m00C; - anm_init(i_this, MO2_BCK_KKEIKAI, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KKEIKAI); + anm_init(i_this, dRes_INDEX_MO2_BCK_KKEIKAI_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_KKEIKAI_e); i_this->mDamageReaction.mMode = -9; i_this->mDamageReaction.m713 = 0; i_this->m05A4[0] = REG0_S(7) + 0xf; @@ -2062,7 +2062,7 @@ static void nage(mo2_class* i_this) { maxSpeed = 0; if (i_this->m05A4[1] == 0) { i_this->mDamageReaction.mMode = 1; - anm_init(i_this, MO2_BCK_KWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, MO2_BAS_KWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_KWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_MO2_BAS_KWALK_e); } actor->speedF = 0.0f; break; @@ -2070,7 +2070,7 @@ static void nage(mo2_class* i_this) { cLib_addCalc2(&actor->speedF, l_mo2HIO.m058, 1.0f, 20.0f); if (i_this->m05C0 < l_mo2HIO.m030) { i_this->mDamageReaction.mMode = 2; - anm_init(i_this, MO2_BCK_KNAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KNAGE); + anm_init(i_this, dRes_INDEX_MO2_BCK_KNAGE_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_KNAGE_e); } break; case 2: @@ -2112,7 +2112,7 @@ static void p_lost(mo2_class* i_this) { switch (i_this->mDamageReaction.mMode) { case -10: if (i_this->mDamageReaction.m470 < 200.0f) { - anm_init(i_this, MO2_BCK_UKYADEMO, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_MO2_BCK_UKYADEMO_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamageReaction.mMode = -9; tex_anm_set(i_this, 4); i_this->m05A4[1] = 0x23; @@ -2131,7 +2131,7 @@ static void p_lost(mo2_class* i_this) { case 0: i_this->mDamageReaction.mMode = 1; tex_anm_set(i_this, 4); - anm_init(i_this, MO2_BCK_BKYORO, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_BKYORO); + anm_init(i_this, dRes_INDEX_MO2_BCK_BKYORO_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_BKYORO_e); break; case 1: actor->speedF = 0.0f; @@ -2172,7 +2172,7 @@ static void b_nige(mo2_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, MO2_BCK_SHAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_SHAKKEN); + anm_init(i_this, dRes_INDEX_MO2_BCK_SHAKKEN_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_SHAKKEN_e); i_this->m05A4[1] = 0x14; // Fall-through case 1: @@ -2180,7 +2180,7 @@ static void b_nige(mo2_class* i_this) { cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0 + 0x8000, 2, 0x3000); if (i_this->m05A4[1] == 0) { i_this->mDamageReaction.mMode = 2; - anm_init(i_this, MO2_BCK_NWALK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_NWALK_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NWALK_e); } break; case 2: @@ -2190,7 +2190,7 @@ static void b_nige(mo2_class* i_this) { cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 4, 0x1000); if (std::sqrtf(SQUARE(local_10.x) + SQUARE(local_10.z)) > 800.0f) { i_this->mDamageReaction.mMode = 3; - anm_init(i_this, MO2_BCK_NBWAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWAIT); + anm_init(i_this, dRes_INDEX_MO2_BCK_NBWAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWAIT_e); } break; case 3: @@ -2216,7 +2216,7 @@ static void defence(mo2_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, MO2_BCK_BWALKFB, 5.0f, J3DFrameCtrl::EMode_NONE, -1.0f, MO2_BAS_BWALKFB); + anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKFB_e, 5.0f, J3DFrameCtrl::EMode_NONE, -1.0f, dRes_INDEX_MO2_BAS_BWALKFB_e); i_this->m05A4[1] = REG6_S(3) + 0x1e; tex_anm_set(i_this, 4); actor->speedF = -20.0f; @@ -2246,7 +2246,7 @@ static void oshi(mo2_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, MO2_BCK_ADOTSUKI, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_ADOTSUKI); + anm_init(i_this, dRes_INDEX_MO2_BCK_ADOTSUKI_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_ADOTSUKI_e); tex_anm_set(i_this, 4); actor->speedF = 0.0f; // Fall-through @@ -2277,11 +2277,11 @@ static void hukki(mo2_class* i_this) { i_this->m05B4 = 2; switch (i_this->mDamageReaction.mMode) { case 10: - anm_init(i_this, MO2_BCK_OKIRUA, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_OKIRUA); + anm_init(i_this, dRes_INDEX_MO2_BCK_OKIRUA_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_OKIRUA_e); i_this->m05A4[2] = 0xF; goto LAB_806ae194; case 12: - anm_init(i_this, MO2_BCK_OKIRUU, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_OKIRUU); + anm_init(i_this, dRes_INDEX_MO2_BCK_OKIRUU_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_OKIRUU_e); i_this->m05A4[2] = REG0_S(5) + 0xF; LAB_806ae194: tex_anm_set(i_this, 5); @@ -2432,7 +2432,7 @@ static void yogan_fail(mo2_class* i_this) { actor->speedF = 0.0f; switch (i_this->mDamageReaction.mMode) { case 0: - anm_init(i_this, MO2_BCK_AWATEDEMO, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_MO2_BCK_AWATEDEMO_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mDamageReaction.mMode = 1; actor->speed.y = REG0_F(0x13) + 190.0f; fopAcM_monsSeStart(actor, JA_SE_CV_MO_ALERT, 0); @@ -2485,7 +2485,7 @@ static void wepon_search(mo2_class* i_this) { case -1: i_this->mDamageReaction.mMode = 0; i_this->m2943 = 0; - anm_init(i_this, MO2_BCK_SHAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_SHAKKEN); + anm_init(i_this, dRes_INDEX_MO2_BCK_SHAKKEN_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_SHAKKEN_e); if (dVar9 < 900.0f) { i_this->m05A4[1] = 0x14; } else { @@ -2502,7 +2502,7 @@ static void wepon_search(mo2_class* i_this) { if (i_this->mpMorf->isStop() || i_this->m05A4[1] == 0) { i_this->mDamageReaction.mMode = 1; i_this->m05AE = l_mo2HIO.m08A; - anm_init(i_this, MO2_BCK_SWALK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_SWALK_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SWALK_e); } } break; @@ -2512,14 +2512,14 @@ static void wepon_search(mo2_class* i_this) { i_this->m05F2 = 4; cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 4, 0x1000); if (ground_4_check(i_this, 1, actor->current.angle.y, 300.0f)) { - anm_init(i_this, MO2_BCK_GAKEDEMO, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_MO2_BCK_GAKEDEMO_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamageReaction.mMode = 3; i_this->m05A4[1] = 0x1e; i_this->m2943 = 1; } else { if (dVar9 < 300.0f) { i_this->mDamageReaction.mMode = 2; - anm_init(i_this, MO2_BCK_SCATCH, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_SCATCH); + anm_init(i_this, dRes_INDEX_MO2_BCK_SCATCH_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_SCATCH_e); i_this->m05A4[1] = 0x1d; } else { if (i_this->m05AE == 0 || i_this->mDamageReaction.mAcch.ChkWallHit()) { @@ -2607,7 +2607,7 @@ static void hip_damage(mo2_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, MO2_BCK_HIPDMG01, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_HIPDMG01); + anm_init(i_this, dRes_INDEX_MO2_BCK_HIPDMG01_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_HIPDMG01_e); actor->speedF = REG6_F(0) + 100.0f; i_this->m05A4[0] = 0xF; i_this->m05F0 = l_mo2HIO.m024 + 3; @@ -2617,7 +2617,7 @@ static void hip_damage(mo2_class* i_this) { cLib_addCalc2(&actor->speedF, 0.0f, 1.0f, REG6_F(1) + 10.0f); if (i_this->m05A4[0] == 0) { i_this->mDamageReaction.mMode = 2; - anm_init(i_this, MO2_BCK_HIPDMG02, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_HIPDMG02); + anm_init(i_this, dRes_INDEX_MO2_BCK_HIPDMG02_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_HIPDMG02_e); i_this->m05A4[0] = 0x3c; i_this->mDamageReaction.m4D0 = actor->current.angle.y + 0x8000; } @@ -2649,7 +2649,7 @@ static void d_mahi(mo2_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, MO2_BCK_KOKERUF, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KOKERUF); + anm_init(i_this, dRes_INDEX_MO2_BCK_KOKERUF_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_KOKERUF_e); i_this->m05A4[0] = 100; // Fall-through case 1: @@ -2679,7 +2679,7 @@ static void d_sit(mo2_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, MO2_BCK_KOKERUF, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KOKERUF); + anm_init(i_this, dRes_INDEX_MO2_BCK_KOKERUF_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_KOKERUF_e); i_this->m05A4[0] = 0x32; // Fall-through case 1: @@ -2706,10 +2706,10 @@ static void d_dozou(mo2_class* i_this) { i_this->mDamageReaction.mMode = 1; i_this->mDamageReaction.mStts.Init(0xFF, 0xFF, actor); if (i_this->mFrozenInTimePose == 0) { - anm_init(i_this, MO2_BCK_TACKLEDEMO, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); + anm_init(i_this, dRes_INDEX_MO2_BCK_TACKLEDEMO_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); i_this->mpMorf->setFrame(3.0f); } else { - anm_init(i_this, MO2_BCK_WALK, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, MO2_BAS_WALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_WALK_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, dRes_INDEX_MO2_BAS_WALK_e); i_this->mpMorf->setFrame(37.0f); } // Fall-through @@ -2750,10 +2750,10 @@ static void carry_drop(mo2_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, MO2_BCK_JSTART, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_JSTART); + anm_init(i_this, dRes_INDEX_MO2_BCK_JSTART_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_JSTART_e); case 1: if (i_this->mDamageReaction.mAcch.ChkGroundHit()) { - anm_init(i_this, MO2_BCK_JEND, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_JEND); + anm_init(i_this, dRes_INDEX_MO2_BCK_JEND_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_JEND_e); i_this->mDamageReaction.mMode = 2; i_this->m05F0 = l_mo2HIO.m024 + 6; i_this->m05F2 = 3; @@ -2788,14 +2788,14 @@ static void e3_demo(mo2_class* i_this) { camera->mCamera.SetTrimSize(2); switch (i_this->mDamageReaction.mMode) { case 0: - anm_init(i_this, MO2_BCK_UKYADEMO, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_MO2_BCK_UKYADEMO_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m05A4[1] = 0x19; i_this->mDamageReaction.mMode = 1; dMeter_mtrHide(); i_this->m2A4C = 200; case 1: if (i_this->m05A4[1] == 0) { - anm_init(i_this, MO2_BCK_SWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_SWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SWALK_e); i_this->mDamageReaction.mMode = 2; if (alerm_set == 0) { mDoAud_seStart(JA_SE_MAJUTOU_ALERM); @@ -2809,7 +2809,7 @@ static void e3_demo(mo2_class* i_this) { cLib_addCalc2(&actor->speedF, l_mo2HIO.m058, 1.0f, 20.0f); if (i_this->m05C0 < l_mo2HIO.m030 || ground_4_check(i_this, 1, actor->current.angle.y, 100.0f)) { i_this->mDamageReaction.mMode = 3; - anm_init(i_this, MO2_BCK_KNAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KNAGE); + anm_init(i_this, dRes_INDEX_MO2_BCK_KNAGE_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_KNAGE_e); } break; case 3: @@ -2821,7 +2821,7 @@ static void e3_demo(mo2_class* i_this) { } if (i_this->mpMorf->isStop()) { i_this->mDamageReaction.mMode = 4; - anm_init(i_this, MO2_BCK_SWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK); + anm_init(i_this, dRes_INDEX_MO2_BCK_SWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SWALK_e); } break; } @@ -2829,7 +2829,7 @@ static void e3_demo(mo2_class* i_this) { cLib_addCalc2(&actor->speedF, l_mo2HIO.m058, 1.0f, 20.0f); if (fopAcM_searchPlayerDistance(actor) < 250.0f || ground_4_check(i_this, 1, actor->current.angle.y, 100.0f)) { i_this->mDamageReaction.mMode = 5; - anm_init(i_this, MO2_BCK_WAITDEMO, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_MO2_BCK_WAITDEMO_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m05A4[1] = 0x1E; mDoAud_seStop(JA_SE_MAJUTOU_ALERM, 30); player->changeOriginalDemo(); @@ -3215,7 +3215,7 @@ static u8 damage_check(mo2_class* i_this) { i_this->mDamageReaction.m424 |= 0x20; i_this->mDamageReaction.m428 = 23.0f; cMtx_YrotS(*calc_mtx, i_this->m05D6); - anm_init(i_this, MO2_BCK_PAOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PAOMUKE); + anm_init(i_this, dRes_INDEX_MO2_BCK_PAOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_PAOMUKE_e); i_this->mDamageReaction.m48A = 10; i_this->mDamageReaction.m474 = 5000.0f; i_this->mDamageReaction.m70E = 7; @@ -3515,14 +3515,14 @@ static BOOL daMo2_Execute(mo2_class* i_this) { i_this->m2954 = fpcM_ERROR_PROCESS_ID_e; switch (r3) { case 1: - anm_init(i_this, MO2_BCK_PAOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PAOMUKE); + anm_init(i_this, dRes_INDEX_MO2_BCK_PAOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_PAOMUKE_e); if (i_this->mbHasInnateWeapon != 0 && (actor->health <= 0 || r23 >= 4 || cM_rndF(1.0f) < 0.5f)) { i_this->mSpawnWeaponActor = 1; } i_this->mDamageReaction.mAction = ACTION_JYUNKAI; break; case 2: - anm_init(i_this, MO2_BCK_PUTSUBUSE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PUTSUBUSE); + anm_init(i_this, dRes_INDEX_MO2_BCK_PUTSUBUSE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_PUTSUBUSE_e); break; case 5: if ((i_this->mMode != 1 || rouya_mode == 0) && @@ -3557,7 +3557,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) { i_this->mDamageReaction.m4C8[2] = l_mo2HIO.m088; break; case 0x1E: - anm_init(i_this, MO2_BCK_PAOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PAOMUKE); + anm_init(i_this, dRes_INDEX_MO2_BCK_PAOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_PAOMUKE_e); if (i_this->mbHasInnateWeapon != 0) { i_this->mSpawnWeaponActor = 1; } @@ -3847,16 +3847,16 @@ static BOOL createHeap(fopAc_ac_c* a_this) { mo2_class* i_this = (mo2_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Mo2", MO2_BDL_MO), + (J3DModelData*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BDL_MO_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Mo2", MO2_BCK_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BCK_WAIT_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Mo2", MO2_BAS_WAIT), + dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BAS_WAIT_e), 0x00080000, 0x37441422 ); @@ -3876,7 +3876,7 @@ static BOOL createHeap(fopAc_ac_c* a_this) { } } if (i_this->mMode != 1) { - i_this->m2A50 = (J3DMaterialTable*)dComIfG_getObjectRes("Mo2", MO2_BMT_MO_GREEN); + i_this->m2A50 = (J3DMaterialTable*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BMT_MO_GREEN_e); } J3DAnmTexPattern* btp = static_cast(dComIfG_getObjectRes("Mo2", mo2_tex_anm_idx[3])); JUT_ASSERT(DEMO_SELECT(8843, 8863), btp); @@ -3884,9 +3884,9 @@ static BOOL createHeap(fopAc_ac_c* a_this) { return FALSE; } i_this->m3Dline.init(16, 10, 0); - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Mo2", MO2_BMD_KB); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BMD_KB_e); JUT_ASSERT(DEMO_SELECT(8881, 8901), modelData != NULL); - J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Mo2", MO2_BMT_MO_BLUR); + J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BMT_MO_BLUR_e); modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material); i_this->m058C = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->m058C == NULL) { @@ -4153,7 +4153,7 @@ static cPhs_State daMo2_Create(fopAc_ac_c* a_this) { a_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; } if (i_this->mMode == 5) { - anm_init(i_this, MO2_BCK_BB_FLY, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BB_FLY); + anm_init(i_this, dRes_INDEX_MO2_BCK_BB_FLY_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_BB_FLY_e); i_this->mDamageReaction.mAction = ACTION_CARRY; i_this->mDamageReaction.mMaxFallDistance = 100000.0f; } diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 37d8492d4..a6714f021 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mozo.h" -#include "d/res/res_mozo.h" +#include "res/Object/Mozo.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" @@ -104,13 +104,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000007AC-00000A24 .text CreateHeap__8daMozo_cFv */ BOOL daMozo_c::CreateHeap() { - J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BDL_MOZ); + J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BDL_MOZ_e); mDoExt_McaMorf* newMorf = new mDoExt_McaMorf( mdlData, 0, 0, - static_cast(dComIfG_getObjectRes("Mozo", MOZO_INDEX_BCK_MOZ)), + static_cast(dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BCK_MOZ_e)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -123,10 +123,10 @@ BOOL daMozo_c::CreateHeap() { mAnimMorf = newMorf; - m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BRK_MOZ); + m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BRK_MOZ_e); JUT_ASSERT(0x16A, m_brk != NULL); - m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BTK_MOZ); + m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BTK_MOZ_e); JUT_ASSERT(0x16D, m_btk != NULL); int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::EMode_NONE); diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp index 64ba982d8..76d20fe30 100644 --- a/src/d/actor/d_a_msw.cpp +++ b/src/d/actor/d_a_msw.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_msw.h" -#include "d/res/res_msw.h" +#include "res/Object/Msw.h" #include "d/d_bg_s_movebg_actor.h" #include "m_Do/m_Do_ext.h" #include "d/d_com_inf_game.h" @@ -210,14 +210,14 @@ static BOOL daMsw_Delete(msw_class* i_this) { BOOL daMsw_CreateInit(fopAc_ac_c* i_this) { msw_class* pActor = static_cast(i_this); - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Msw", MSW_BDL_MSWNG)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Msw", dRes_INDEX_MSW_BDL_MSWNG_e)); pActor->mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (pActor->mpModel == NULL) { return FALSE; } - modelData = static_cast(dComIfG_getObjectRes("Msw", MSW_BDL_OBM_CHAIN1)); + modelData = static_cast(dComIfG_getObjectRes("Msw", dRes_INDEX_MSW_BDL_OBM_CHAIN1_e)); JUT_ASSERT(DEMO_SELECT(519, 523), modelData != NULL); for (int chainIdx = 0; chainIdx < 4; chainIdx++) { @@ -233,7 +233,7 @@ BOOL daMsw_CreateInit(fopAc_ac_c* i_this) { return FALSE; } - cBgD_t* pBgd = static_cast(dComIfG_getObjectRes("Msw", MSW_DZB_MSWING)); + cBgD_t* pBgd = static_cast(dComIfG_getObjectRes("Msw", dRes_INDEX_MSW_DZB_MSWING_e)); BOOL error = pActor->mpBgW->Set(pBgd, cBgW::MOVE_BG_e, &pActor->mMtx); if (error == TRUE) { diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp index 9b1c0e206..5b557eaf2 100644 --- a/src/d/actor/d_a_mtoge.cpp +++ b/src/d/actor/d_a_mtoge.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mtoge.h" #include "d/d_com_inf_game.h" -#include "d/res/res_mtoge.h" +#include "res/Object/Mtoge.h" #include "f_op/f_op_actor_mng.h" const char daMtoge_c::M_arcname[] = "Mtoge"; @@ -31,7 +31,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000000A4-000001E8 .text CreateHeap__9daMtoge_cFv */ BOOL daMtoge_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, MTOGE_BMD_S_MTOGE)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MTOGE_BMD_S_MTOGE_e)); JUT_ASSERT(0x70, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U); @@ -45,7 +45,7 @@ BOOL daMtoge_c::CreateHeap() { if (!mpBgW) return FALSE; - cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes(M_arcname, MTOGE_DZB_S_MTOGE); + cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MTOGE_DZB_S_MTOGE_e); if (!pData) { return FALSE; diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 8a359b50e..936a3e577 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -110,7 +110,7 @@ void daNh_c::setBaseMtx() { /* 800F9980-800F9A54 .text createHeap__6daNh_cFv */ BOOL daNh_c::createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_NH); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_NH_e); JUT_ASSERT(DEMO_SELECT(357, 359), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -436,7 +436,7 @@ BOOL daNh_c::initBrkAnm(bool i_modify) { J3DModelData* modelData = mpModel->getModelData(); bool success = false; - J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", ALWAYS_BRK_TNH); + J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BRK_TNH_e); JUT_ASSERT(DEMO_SELECT(881, 883), a_brk != NULL); if (mBrkAnm.init(modelData, a_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, i_modify, false)) { diff --git a/src/d/actor/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp index 16e496462..38052147a 100644 --- a/src/d/actor/d_a_npc_ah.cpp +++ b/src/d/actor/d_a_npc_ah.cpp @@ -8,22 +8,22 @@ #include "d/d_a_obj.h" #include "d/d_com_lib_game.h" #include "d/d_snap.h" -#include "d/res/res_ah.h" +#include "res/Object/Ah.h" const char daNpcAh_c::m_arcname[] = "Ah"; static const int l_bmd_ix_tbl[] = { - AH_BDL_AH + dRes_ID_AH_BDL_AH_e }; static const int l_bck_ix_tbl[] = { - AH_BCK_AH_WAIT01, - AH_BCK_AH_WAIT02 + dRes_ID_AH_BCK_AH_WAIT01_e, + dRes_ID_AH_BCK_AH_WAIT02_e }; static const int l_btp_ix_tbl[] = { - AH_BTP_MABA, - AH_BTP_HOU + dRes_ID_AH_BTP_MABA_e, + dRes_ID_AH_BTP_HOU_e }; static char* l_npc_staff_id[] = { diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp index d33f5a0fb..082089423 100644 --- a/src/d/actor/d_a_npc_bmsw.cpp +++ b/src/d/actor/d_a_npc_bmsw.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bmsw.h" -#include "d/res/res_bmsw.h" +#include "res/Object/Bmsw.h" #include "d/d_shop.h" #include "d/d_snap.h" #include "d/d_com_inf_game.h" @@ -113,15 +113,15 @@ daNpc_Bmsw_HIO_c::daNpc_Bmsw_HIO_c() { static const s32 l_bck_ix_tbl[] = { - BMSW_BCK_BM_WAIT01, BMSW_BCK_BM_WAIT02, BMSW_BCK_BM_TALK01, BMSW_BCK_BM_TALK02, - BMSW_BCK_BM_TALK03, BMSW_BCK_BM_SHIWAKE01, BMSW_BCK_BM_SHIWAKE02, + dRes_ID_BMSW_BCK_BM_WAIT01_e, dRes_ID_BMSW_BCK_BM_WAIT02_e, dRes_ID_BMSW_BCK_BM_TALK01_e, dRes_ID_BMSW_BCK_BM_TALK02_e, + dRes_ID_BMSW_BCK_BM_TALK03_e, dRes_ID_BMSW_BCK_BM_SHIWAKE01_e, dRes_ID_BMSW_BCK_BM_SHIWAKE02_e, }; static const s32 l_arm_bck_ix_tbl[] = { - BMSW_BCK_BMARM_WAIT01, BMSW_BCK_BMARM_WAIT02, BMSW_BCK_BMARM_TALK01, BMSW_BCK_BMARM_TALK02, - BMSW_BCK_BMARM_TALK03, BMSW_BCK_BMARM_SHIWAKE01, BMSW_BCK_BMARM_SHIWAKE02, + dRes_ID_BMSW_BCK_BMARM_WAIT01_e, dRes_ID_BMSW_BCK_BMARM_WAIT02_e, dRes_ID_BMSW_BCK_BMARM_TALK01_e, dRes_ID_BMSW_BCK_BMARM_TALK02_e, + dRes_ID_BMSW_BCK_BMARM_TALK03_e, dRes_ID_BMSW_BCK_BMARM_SHIWAKE01_e, dRes_ID_BMSW_BCK_BMARM_SHIWAKE02_e, }; -static const u32 l_btp_ix_tbl[] = {BMSW_BTP_BMHEAD11, BMSW_BTP_BMHEAD11}; +static const u32 l_btp_ix_tbl[] = {dRes_ID_BMSW_BTP_BMHEAD11_e, dRes_ID_BMSW_BTP_BMHEAD11_e}; /* 000001E4-000003FC .text nodeCallBack__FP7J3DNodei */ @@ -1163,14 +1163,14 @@ cPhs_State daNpc_Bmsw_c::_create() { /* 00003524-00003CB0 .text CreateHeap__12daNpc_Bmsw_cFv */ BOOL daNpc_Bmsw_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", BMSW_BDL_BM); + J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BDL_BM_e); JUT_ASSERT(1499, modelData != NULL); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransform*) dComIfG_getObjectIDRes("Bmsw", BMSW_BCK_BM_TALK01), + (J3DAnmTransform*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BCK_BM_TALK01_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1193,18 +1193,18 @@ BOOL daNpc_Bmsw_c::CreateHeap() { m_body_ArmR = modelData->getJointName()->getIndex("armR"); JUT_ASSERT(1519, m_body_ArmL >= 0 || m_body_ArmR >= 0); - J3DModelData* headModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", BMSW_BDL_BMHEAD11); + J3DModelData* headModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BDL_BMHEAD11_e); field_0x6D4 = mDoExt_J3DModel__create(headModelData, 0x80000,0x11020022); if (field_0x6D4 == NULL) { return FALSE; } - J3DModelData* armModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", BMSW_BDL_BMARM); + J3DModelData* armModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BDL_BMARM_e); mpMorfHand = new mDoExt_McaMorf( armModelData, NULL, NULL, - (J3DAnmTransform*) dComIfG_getObjectIDRes("Bmsw", BMSW_BCK_BMARM_TALK01), + (J3DAnmTransform*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BCK_BMARM_TALK01_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1225,13 +1225,13 @@ BOOL daNpc_Bmsw_c::CreateHeap() { JUT_ASSERT(1555, m_ArmL >= 0 || m_ArmR >= 0); JUT_ASSERT(1556, m_handL >= 0 || m_handR >= 0); - J3DModelData* bagModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", BMSW_BDL_BM_BAG); + J3DModelData* bagModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BDL_BM_BAG_e); field_0x6D8 = mDoExt_J3DModel__create(bagModelData, 0, 0x11020203); if (field_0x6D8 == NULL) { return FALSE; } - J3DModelData* letterModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", BMSW_BDL_BM_LETTER); + J3DModelData* letterModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BDL_BM_LETTER_e); field_0x6DC = mDoExt_J3DModel__create(letterModelData, 0,0x11020203); if (field_0x6DC == NULL) { return FALSE; @@ -1273,8 +1273,8 @@ BOOL daNpc_Bmsw_c::CreateHeap() { return FALSE; } - J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*) dComIfG_getObjectIDRes("Bmsw", BMSW_BRK_SHOP_CURSOR01); - J3DModelData* cursorModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", BMSW_BMD_SHOP_CURSOR01); + J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BRK_SHOP_CURSOR01_e); + J3DModelData* cursorModelData = (J3DModelData*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BMD_SHOP_CURSOR01_e); mpShopCursor = ShopCursor_create(cursorModelData, tevRegKey, 0.65f); if (mpShopCursor == NULL) { @@ -1299,13 +1299,13 @@ BOOL daNpc_Bmsw_c::CreateHeap() { /* 00003CB0-00003DBC .text MailCreateInit__8SwMail_cFP4cXyzP4cXyz */ BOOL SwMail_c::MailCreateInit(cXyz* param_1, cXyz* param_2) { - J3DModelData* modelData = static_cast(dComIfG_getObjectIDRes("Bmsw", BMSW_BDL_QMAIL)); + J3DModelData* modelData = static_cast(dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BDL_QMAIL_e)); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020002); if (mpModel == NULL) { return FALSE; } - J3DAnmTexPattern* texPattern = (J3DAnmTexPattern*) dComIfG_getObjectIDRes("Bmsw", BMSW_BTP_QMAIL); + J3DAnmTexPattern* texPattern = (J3DAnmTexPattern*) dComIfG_getObjectIDRes("Bmsw", dRes_ID_BMSW_BTP_QMAIL_e); if (!field_0x10.init(modelData, texPattern, TRUE, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, false, FALSE)) { return FALSE; } diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 49724cca2..b14f3a283 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bs1.h" -#include "d/res/res_bs.h" +#include "res/Object/Bs.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/actor/d_a_player.h" @@ -162,23 +162,23 @@ s16 daNpc_Bs1_c::XyEventCB(int i_itemBtn) { } static const int l_bck_ix_tbl[] = { - BS_INDEX_BCK_BS_WAIT01, - BS_INDEX_BCK_BS_TALK01, - BS_INDEX_BCK_BS_TALK02, - BS_INDEX_BCK_BS_TALK03, - BS_INDEX_BCK_BS_TALK04, - BS_INDEX_BCK_BS_LAUGH, - BS_INDEX_BCK_BS_PRAISE, - BS_INDEX_BCK_BS_ANGRY, - BS_INDEX_BCK_BS_MANTAN, - BS_INDEX_BCK_BS_TALK04, + dRes_INDEX_BS_BCK_BS_WAIT01_e, + dRes_INDEX_BS_BCK_BS_TALK01_e, + dRes_INDEX_BS_BCK_BS_TALK02_e, + dRes_INDEX_BS_BCK_BS_TALK03_e, + dRes_INDEX_BS_BCK_BS_TALK04_e, + dRes_INDEX_BS_BCK_BS_LAUGH_e, + dRes_INDEX_BS_BCK_BS_PRAISE_e, + dRes_INDEX_BS_BCK_BS_ANGRY_e, + dRes_INDEX_BS_BCK_BS_MANTAN_e, + dRes_INDEX_BS_BCK_BS_TALK04_e, }; static const int l_btp_ix_tbl[] = { - BS_INDEX_BTP_BS, - BS_INDEX_BTP_MABA, - BS_INDEX_BTP_LOOK, - BS_INDEX_BTP_BS_PRAISE, + dRes_INDEX_BS_BTP_BS_e, + dRes_INDEX_BS_BTP_MABA_e, + dRes_INDEX_BS_BTP_LOOK_e, + dRes_INDEX_BS_BTP_BS_PRAISE_e, }; /* 00000490-00000658 .text nodeCallBack_Bs__FP7J3DNodei */ @@ -2170,11 +2170,11 @@ cPhs_State daNpc_Bs1_c::_create() { /* 000050A8-00005470 .text CreateHeap__11daNpc_Bs1_cFv */ BOOL daNpc_Bs1_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bs", BS_INDEX_BDL_BS); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bs", dRes_INDEX_BS_BDL_BS_e); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("Bs", BS_INDEX_BCK_BS_WAIT01), + (J3DAnmTransform*)dComIfG_getObjectRes("Bs", dRes_INDEX_BS_BCK_BS_WAIT01_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0, 0x11020203 ); @@ -2205,13 +2205,13 @@ BOOL daNpc_Bs1_c::CreateHeap() { #endif } - mpHelmetModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Bs", BS_INDEX_BDL_BS_MET), 0, 0x11020203); + mpHelmetModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Bs", dRes_INDEX_BS_BDL_BS_MET_e), 0, 0x11020203); if (!mpHelmetModel) { return FALSE; } for (int i = 0; i < 3; i++) { - mpSoldSignModels[i] = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Bs", BS_INDEX_BDL_VSOLD), 0, 0x11020203); + mpSoldSignModels[i] = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Bs", dRes_INDEX_BS_BDL_VSOLD_e), 0, 0x11020203); if (mpSoldSignModels[i] == NULL) { return false; } @@ -2225,8 +2225,8 @@ BOOL daNpc_Bs1_c::CreateHeap() { mpMorf->getModel()->setUserArea((u32)this); mAcchCir.SetWall(30.0f, 0.0f); mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this)); - J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bs", BS_INDEX_BRK_SHOP_CURSOR01); - modelData = (J3DModelData*)dComIfG_getObjectRes("Bs", BS_INDEX_BMD_SHOP_CURSOR01); + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bs", dRes_INDEX_BS_BRK_SHOP_CURSOR01_e); + modelData = (J3DModelData*)dComIfG_getObjectRes("Bs", dRes_INDEX_BS_BMD_SHOP_CURSOR01_e); mpShopCursor = ShopCursor_create(modelData, brk, l_HIO.mChild[mType].m30); if (mpShopCursor != NULL) { diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index bfe09205a..984a9378f 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_npc_btsw.h" #include "d/d_letter.h" #include "d/d_snap.h" -#include "d/res/res_btsw.h" +#include "res/Object/Btsw.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" @@ -116,11 +116,11 @@ daNpc_Btsw_HIO_c::daNpc_Btsw_HIO_c() { } static const s32 l_bck_ix_tbl[] = { - BTSW_BCK_BN_WAIT01, BTSW_BCK_BN_WAIT02, BTSW_BCK_BN_TALK01, BTSW_BCK_BN_TALK02, - BTSW_BCK_BN_ONEGAI, BTSW_BCK_BN_SUGOI, BTSW_BCK_BN_SUGOI, BTSW_BCK_BN_WALK, - BTSW_BCK_BN_KASIGE, BTSW_BCK_BN_SIWAKE01, BTSW_BCK_BN_SIWAKE02 + dRes_ID_BTSW_BCK_BN_WAIT01_e, dRes_ID_BTSW_BCK_BN_WAIT02_e, dRes_ID_BTSW_BCK_BN_TALK01_e, dRes_ID_BTSW_BCK_BN_TALK02_e, + dRes_ID_BTSW_BCK_BN_ONEGAI_e, dRes_ID_BTSW_BCK_BN_SUGOI_e, dRes_ID_BTSW_BCK_BN_SUGOI_e, dRes_ID_BTSW_BCK_BN_WALK_e, + dRes_ID_BTSW_BCK_BN_KASIGE_e, dRes_ID_BTSW_BCK_BN_SIWAKE01_e, dRes_ID_BTSW_BCK_BN_SIWAKE02_e }; -static const u32 l_btp_ix_tbl[] = {BTSW_INDEX_BCK_BN_TALK02}; +static const u32 l_btp_ix_tbl[] = {dRes_ID_BTSW_BTP_BN_MABA_e}; /* 000001E8-000003F4 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode* node, int calcTiming) { @@ -996,14 +996,14 @@ cPhs_State daNpc_Btsw_c::_create() { /* 00003304-0000372C .text CreateHeap__12daNpc_Btsw_cFv */ BOOL daNpc_Btsw_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectIDRes("Btsw", BTSW_BDL_BN)); + J3DModelData* modelData = static_cast(dComIfG_getObjectIDRes("Btsw", dRes_ID_BTSW_BDL_BN_e)); JUT_ASSERT(1424, modelData != NULL); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransform*) dComIfG_getObjectIDRes("Btsw", BTSW_BCK_BN_WAIT02), + (J3DAnmTransform*) dComIfG_getObjectIDRes("Btsw", dRes_ID_BTSW_BCK_BN_WAIT02_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -1025,7 +1025,7 @@ BOOL daNpc_Btsw_c::CreateHeap() { m_handL = modelData->getJointName()->getIndex("handL"); m_handR = modelData->getJointName()->getIndex("handR"); - J3DModelData* letterModelData = (J3DModelData*) dComIfG_getObjectIDRes("Btsw", BTSW_BDL_BM_LETTER); + J3DModelData* letterModelData = (J3DModelData*) dComIfG_getObjectIDRes("Btsw", dRes_ID_BTSW_BDL_BM_LETTER_e); field_0x6D0 = mDoExt_J3DModel__create(letterModelData, 0,0x11020203); if (field_0x6D0 == NULL) { return FALSE; @@ -1061,8 +1061,8 @@ BOOL daNpc_Btsw_c::CreateHeap() { return FALSE; } - J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*) dComIfG_getObjectIDRes("Btsw", BTSW_BRK_SHOP_CURSOR01); - J3DModelData* cursorModelData = (J3DModelData*) dComIfG_getObjectIDRes("Btsw", BTSW_BMD_SHOP_CURSOR01); + J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*) dComIfG_getObjectIDRes("Btsw", dRes_ID_BTSW_BRK_SHOP_CURSOR01_e); + J3DModelData* cursorModelData = (J3DModelData*) dComIfG_getObjectIDRes("Btsw", dRes_ID_BTSW_BMD_SHOP_CURSOR01_e); mpShopCursor = ShopCursor_create(cursorModelData, tevRegKey, 0.65f); if (mpShopCursor == NULL) { @@ -1087,13 +1087,13 @@ BOOL daNpc_Btsw_c::CreateHeap() { /* 0000372C-00003838 .text MailCreateInit__9SwMail2_cFP4cXyzP4cXyz */ BOOL SwMail2_c::MailCreateInit(cXyz* param_1, cXyz* param_2) { - J3DModelData* modelData = static_cast(dComIfG_getObjectIDRes("Btsw", BTSW_BDL_QMAIL)); + J3DModelData* modelData = static_cast(dComIfG_getObjectIDRes("Btsw", dRes_ID_BTSW_BDL_QMAIL_e)); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020002); if (mpModel == NULL) { return FALSE; } - J3DAnmTexPattern* texPattern = (J3DAnmTexPattern*) dComIfG_getObjectIDRes("Btsw", BTSW_BTP_QMAIL); + J3DAnmTexPattern* texPattern = (J3DAnmTexPattern*) dComIfG_getObjectIDRes("Btsw", dRes_ID_BTSW_BTP_QMAIL_e); if (!field_0x10.init(modelData, texPattern, TRUE, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, false, FALSE)) { return FALSE; } diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 1971e296a..5704d27b4 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_btsw2.h" -#include "d/res/res_btsw.h" +#include "res/Object/Btsw.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_snap.h" @@ -91,21 +91,21 @@ daNpc_Btsw2_HIO_c::daNpc_Btsw2_HIO_c() { const char daNpc_Btsw2_c::m_arc_name[] = "Btsw"; static const int l_bck_ix_tbl[] = { - BTSW_INDEX_BCK_BN_WAIT01, - BTSW_INDEX_BCK_BN_WAIT02, - BTSW_INDEX_BCK_BN_TALK01, - BTSW_INDEX_BCK_BN_TALK02, - BTSW_INDEX_BCK_BN_ONEGAI, - BTSW_INDEX_BCK_BN_SUGOI, - BTSW_INDEX_BCK_BN_SUGOI, - BTSW_INDEX_BCK_BN_WALK, - BTSW_INDEX_BCK_BN_KASIGE, - BTSW_INDEX_BCK_BN_SIWAKE01, - BTSW_INDEX_BCK_BN_SIWAKE02, + dRes_INDEX_BTSW_BCK_BN_WAIT01_e, + dRes_INDEX_BTSW_BCK_BN_WAIT02_e, + dRes_INDEX_BTSW_BCK_BN_TALK01_e, + dRes_INDEX_BTSW_BCK_BN_TALK02_e, + dRes_INDEX_BTSW_BCK_BN_ONEGAI_e, + dRes_INDEX_BTSW_BCK_BN_SUGOI_e, + dRes_INDEX_BTSW_BCK_BN_SUGOI_e, + dRes_INDEX_BTSW_BCK_BN_WALK_e, + dRes_INDEX_BTSW_BCK_BN_KASIGE_e, + dRes_INDEX_BTSW_BCK_BN_SIWAKE01_e, + dRes_INDEX_BTSW_BCK_BN_SIWAKE02_e, }; static const int l_btp_ix_tbl[] = { - BTSW_INDEX_BTP_BN_MABA, + dRes_INDEX_BTSW_BTP_BN_MABA_e, }; /* 000001A8-000003E0 .text nodeCallBack__FP7J3DNodei */ @@ -353,12 +353,12 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) { /* 00000BB4-00000EFC .text CreateHeap__13daNpc_Btsw2_cFv */ BOOL daNpc_Btsw2_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, BTSW_INDEX_BDL_BN)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_BTSW_BDL_BN_e)); JUT_ASSERT(616, modelData != NULL); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - static_cast(dComIfG_getObjectRes(m_arc_name, BTSW_INDEX_BCK_BN_WAIT01)), + static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_BTSW_BCK_BN_WAIT01_e)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, 0x15020022 ); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -372,12 +372,12 @@ BOOL daNpc_Btsw2_c::CreateHeap() { m_handL_jnt_num = modelData->getJointName()->getIndex("handL"); m_handR_jnt_num = modelData->getJointName()->getIndex("handR"); - modelData = static_cast(dComIfG_getObjectRes("Btsw", BTSW_INDEX_BDL_BN_KABAN)); + modelData = static_cast(dComIfG_getObjectRes("Btsw", dRes_INDEX_BTSW_BDL_BN_KABAN_e)); mpKabanModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpKabanModel == NULL) { return FALSE; } - modelData = static_cast(dComIfG_getObjectRes("Btsw", BTSW_INDEX_BDL_BN_TIRASI)); + modelData = static_cast(dComIfG_getObjectRes("Btsw", dRes_INDEX_BTSW_BDL_BN_TIRASI_e)); mpTirasiModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpTirasiModel == NULL) { return FALSE; diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index d3af077a2..586fe34f1 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -16,7 +16,7 @@ #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" #include "d/actor/d_a_player_main.h" -#include "d/res/res_cb.h" +#include "res/Object/Cb.h" class daNpc_Cb1_HIO_c : public JORReflexible { public: @@ -459,7 +459,7 @@ static BOOL ppNodeCallBack(J3DNode* node, int calcTiming) { /* 00000D9C-00001458 .text createHeap__11daNpc_Cb1_cFv */ BOOL daNpc_Cb1_c::createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", CB_BDL_CB); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BDL_CB_e); JUT_ASSERT(DEMO_SELECT(937, 936), modelData != NULL); mpMorf = new mDoExt_McaMorf( @@ -489,13 +489,13 @@ BOOL daNpc_Cb1_c::createHeap() { mpMorf->getModel()->setUserArea((u32)this); - mpFaceModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Cb", CB_BDL_CB_FACE), 0x00080000, 0x11000022); + mpFaceModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BDL_CB_FACE_e), 0x00080000, 0x11000022); if(mpFaceModel == NULL) { return FALSE; } if(isMusic()) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", CB_BDL_CB_STICK); + modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BDL_CB_STICK_e); JUT_ASSERT(DEMO_SELECT(973, 972), modelData != NULL); mpStickModel = mDoExt_J3DModel__create(modelData, 0x00080000, 0x11000022); if(mpStickModel == NULL) { @@ -508,7 +508,7 @@ BOOL daNpc_Cb1_c::createHeap() { mpStickModel->setUserArea((u32)this); - modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", CB_BDL_CB_CELLO); + modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BDL_CB_CELLO_e); JUT_ASSERT(DEMO_SELECT(990, 989), modelData != NULL); mpCelloModel = mDoExt_J3DModel__create(modelData, 0x00080000, 0x11000022); if(mpCelloModel == NULL) { @@ -516,7 +516,7 @@ BOOL daNpc_Cb1_c::createHeap() { } } - modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", CB_BDL_PP); + modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BDL_PP_e); JUT_ASSERT(DEMO_SELECT(1002, 1001), modelData != NULL); mpPropellerModel = mDoExt_J3DModel__create(modelData, 0x00080000, 0x11000022); if(mpPropellerModel == NULL) { @@ -528,18 +528,18 @@ BOOL daNpc_Cb1_c::createHeap() { mpPropellerModel->setUserArea((u32)this); - if(!mPropellerBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", CB_BCK_M_OPEN), FALSE, J3DFrameCtrl::EMode_NONE)) { + if(!mPropellerBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BCK_M_OPEN_e), FALSE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", CB_BDL_CB_NUT); + modelData = (J3DModelData*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BDL_CB_NUT_e); JUT_ASSERT(DEMO_SELECT(1026, 1025), modelData != NULL); mpNutModel = mDoExt_J3DModel__create(modelData, 0x00080000, 0x11000022); if(mpNutModel == NULL) { return FALSE; } - if(!mNutBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", CB_BCK_NUT_SOW), TRUE, J3DFrameCtrl::EMode_NONE)) { + if(!mNutBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", dRes_INDEX_CB_BCK_NUT_SOW_e), TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } diff --git a/src/d/actor/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp index 04b582179..df65cf125 100644 --- a/src/d/actor/d_a_npc_fa1.cpp +++ b/src/d/actor/d_a_npc_fa1.cpp @@ -948,11 +948,11 @@ cPhs_State daNpc_Fa1_c::_create() { /* 800FD4E8-800FD61C .text CreateHeap__11daNpc_Fa1_cFv */ int daNpc_Fa1_c::CreateHeap() { - J3DModelData* pModelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_FA); + J3DModelData* pModelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_FA_e); mpMorf = new mDoExt_McaMorf(pModelData, &mMcaMorfCallback1, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Always", ALWAYS_BCK_FA), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BCK_FA_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0x00000000, 0x11020203); diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index a284500d7..8bb3150ca 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_hi1.h" -#include "d/res/res_hi.h" +#include "res/Object/Hi.h" class daNpc_Hi1_HIO_c : public mDoHIO_entry_c{ public: @@ -196,8 +196,8 @@ void daNpc_Hi1_c::setMtx(bool param_1) { /* 00000778-0000078C .text bckResID__11daNpc_Hi1_cFi */ int daNpc_Hi1_c::bckResID(int idx) { static const int a_resID_tbl[] = { - 1, - 0 + dRes_ID_HI_BCK_HI_WAIT01_e, + dRes_ID_HI_BCK_HI_POSE_e, }; return a_resID_tbl[idx]; } @@ -205,7 +205,7 @@ int daNpc_Hi1_c::bckResID(int idx) { /* 0000078C-000007A0 .text btpResID__11daNpc_Hi1_cFi */ int daNpc_Hi1_c::btpResID(int idx) { static const int a_resID_tbl[] = { - 3 + dRes_ID_HI_BTP_MABA_e, }; return a_resID_tbl[idx]; } @@ -213,7 +213,7 @@ int daNpc_Hi1_c::btpResID(int idx) { /* 000007A0-000007B4 .text btkResID__11daNpc_Hi1_cFi */ int daNpc_Hi1_c::btkResID(int idx) { static const int a_resID_tbl[] = { - 4 + dRes_ID_HI_BTK_HI_e, }; return a_resID_tbl[idx]; } @@ -773,7 +773,7 @@ u8 daNpc_Hi1_c::demo() { field_0x7BF = 1; mBtkAnmFrame = 0; } - dDemo_setDemoData(this, 0x6a, mpMorf, mArcName); + dDemo_setDemoData(this, dDemo_actor_c::ENABLE_TRANS_e | dDemo_actor_c::ENABLE_ROTATE_e | dDemo_actor_c::ENABLE_ANM_e | dDemo_actor_c::ENABLE_ANM_FRAME_e, mpMorf, mArcName); } return field_0x7BA; } @@ -916,7 +916,7 @@ cPhs_State daNpc_Hi1_c::_create() { /* 000024F4-00002768 .text bodyCreateHeap__11daNpc_Hi1_cFv */ BOOL daNpc_Hi1_c::bodyCreateHeap() { - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectIDRes(mArcName, HI_BDL_HI); + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectIDRes(mArcName, dRes_ID_HI_BDL_HI_e); JUT_ASSERT(0x5BB, a_mdl_dat != NULL); mpMorf = new mDoExt_McaMorf( a_mdl_dat, diff --git a/src/d/actor/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp index 065d18d9b..f512a9b65 100644 --- a/src/d/actor/d_a_npc_ho.cpp +++ b/src/d/actor/d_a_npc_ho.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ho.h" -#include "d/res/res_ho.h" +#include "res/Object/Ho.h" #include "d/d_snap.h" #include "m_Do/m_Do_controller_pad.h" @@ -13,15 +13,15 @@ static fpc_ProcID l_msgId; static msg_class* l_msg; static const int l_bck_ix_tbl[] = { - HO_BCK_HO_WAIT01, - HO_BCK_HO_TALK01, - HO_BCK_HO_TALK02, - HO_BCK_HO_GLAD, - HO_BCK_HO_TALK02, + dRes_INDEX_HO_BCK_HO_WAIT01_e, + dRes_INDEX_HO_BCK_HO_TALK01_e, + dRes_INDEX_HO_BCK_HO_TALK02_e, + dRes_INDEX_HO_BCK_HO_GLAD_e, + dRes_INDEX_HO_BCK_HO_TALK02_e, }; static const int l_btp_ix_tbl[] = { - HO_BTP_HO_MABA01 + dRes_INDEX_HO_BTP_HO_MABA01_e }; /* 00000078-0000022C .text nodeCallBack_Ho__FP7J3DNodei */ @@ -334,7 +334,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { msgStatus = fopMsgStts_MSG_ENDS_e; } break; - case 0x2754: + case 0x2754: { *pMsgNo = 0x2755; int numPendantsGiven = dComIfGs_getBeastNum(7); receivePendant(numPendantsGiven); @@ -347,6 +347,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { } mNextMessageId = 0x2757; break; + } case 0x2751: mNextMessageId = 0x2752; mItemNum = dItemNo_HEROS_CHARM_e; @@ -903,13 +904,13 @@ cPhs_State daNpc_Ho_c::_create() { /* 000023F0-00002784 .text CreateHeap__10daNpc_Ho_cFv */ BOOL daNpc_Ho_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Ho", HO_BDL_HO); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Ho", dRes_INDEX_HO_BDL_HO_e); JUT_ASSERT(DEMO_SELECT(1566, 1581), modelData); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Ho", HO_BCK_HO_WAIT01), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Ho", dRes_INDEX_HO_BCK_HO_WAIT01_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, @@ -932,7 +933,7 @@ BOOL daNpc_Ho_c::CreateHeap() { m_jnt.setBackboneJntNum(modelData->getJointName()->getIndex("backbone")); JUT_ASSERT(DEMO_SELECT(1606, 1621), m_jnt.getBackboneJntNum() >= 0); - J3DModelData* penModelData = (J3DModelData*)dComIfG_getObjectRes("Ho", HO_BDL_HO_PEND); + J3DModelData* penModelData = (J3DModelData*)dComIfG_getObjectRes("Ho", dRes_INDEX_HO_BDL_HO_PEND_e); JUT_ASSERT(DEMO_SELECT(1612, 1627), penModelData); mpJoyPendentModel = mDoExt_J3DModel__create(penModelData, 0, 0x11020203); diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp index faca2a180..92310aaef 100644 --- a/src/d/actor/d_a_npc_hr.cpp +++ b/src/d/actor/d_a_npc_hr.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_hr.h" -#include "d/res/res_hr.h" +#include "res/Object/Hr.h" #include "d/d_snap.h" #include "d/d_kankyo_wether.h" #include "d/actor/d_a_player_main.h" @@ -931,25 +931,25 @@ bool daNpc_Hr_c::demoProc() { } static const int l_bck_ix_tbl[] = { - HR_BCK_H_WAIT01, - HR_BCK_R_WAIT01, - HR_BCK_R_WAIT02, - HR_BCK_LOOK, - HR_BCK_TALK01, - HR_BCK_TALK01, - HR_BCK_TALK01, - HR_BCK_TALK02, - HR_BCK_TALK02, - HR_BCK_TALK03, - HR_BCK_TALK03, - HR_BCK_DAMAGE, - HR_BCK_TALK03, + dRes_INDEX_HR_BCK_H_WAIT01_e, + dRes_INDEX_HR_BCK_R_WAIT01_e, + dRes_INDEX_HR_BCK_R_WAIT02_e, + dRes_INDEX_HR_BCK_LOOK_e, + dRes_INDEX_HR_BCK_TALK01_e, + dRes_INDEX_HR_BCK_TALK01_e, + dRes_INDEX_HR_BCK_TALK01_e, + dRes_INDEX_HR_BCK_TALK02_e, + dRes_INDEX_HR_BCK_TALK02_e, + dRes_INDEX_HR_BCK_TALK03_e, + dRes_INDEX_HR_BCK_TALK03_e, + dRes_INDEX_HR_BCK_DAMAGE_e, + dRes_INDEX_HR_BCK_TALK03_e, }; static const int l_btp_ix_tbl[] = { - HR_BTP_MABA_H, - HR_BTP_MABA_R01, - HR_BTP_MABA_R02, + dRes_INDEX_HR_BTP_MABA_H_e, + dRes_INDEX_HR_BTP_MABA_R01_e, + dRes_INDEX_HR_BTP_MABA_R02_e, }; /* 0000232C-00002550 .text nodeCallBack_Hr__FP7J3DNodei */ @@ -1963,7 +1963,7 @@ BOOL daNpc_Hr_c::_draw() { mBtpAnm.entry(modelData, mBlinkFrame); if(getShapeType() == 1) { - J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Hr", HR_BMT_R_BODY); + J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Hr", dRes_INDEX_HR_BMT_R_BODY_e); modelData->setMaterialTable(bmt, J3DMatCopyFlag_Texture); mpHrMorf->entryDL(bmt); } else { @@ -2123,27 +2123,27 @@ daNpc_Hr_c::daNpc_Hr_c() {} /* 000057E4-00005CE8 .text CreateHeap__10daNpc_Hr_cFv */ BOOL daNpc_Hr_c::CreateHeap() { static int brow_bdl_table[] = { - HR_BDL_H_BROW, - HR_BDL_R_BROW + dRes_INDEX_HR_BDL_H_BROW_e, + dRes_INDEX_HR_BDL_R_BROW_e }; static int ant_bdl_table[] = { - HR_BDL_H_ANT, - HR_BDL_R_ANT + dRes_INDEX_HR_BDL_H_ANT_e, + dRes_INDEX_HR_BDL_R_ANT_e }; static u32 ant_bck_table[] = { - HR_BCK_H_ANT, - HR_BCK_R_ANT + dRes_INDEX_HR_BCK_H_ANT_e, + dRes_INDEX_HR_BCK_R_ANT_e }; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Hr", HR_BDL_HR); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Hr", dRes_INDEX_HR_BDL_HR_e); JUT_ASSERT(DEMO_SELECT(3341, 3392), modelData); mpHrMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Hr", HR_BCK_H_WAIT01), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Hr", dRes_INDEX_HR_BCK_H_WAIT01_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index 0ab278a7e..0475a23fd 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_jb1.h" -#include "d/res/res_jb.h" +#include "res/Object/Jb.h" class daNpc_Jb1_HIO_c : public JORReflexible{ public: @@ -141,8 +141,8 @@ void daNpc_Jb1_c::playBrkAnm(J3DAnmTevRegKey* param_1, s16* param_2) { /* 000004CC-000004E0 .text anmNum_toResID__11daNpc_Jb1_cFi */ int daNpc_Jb1_c::anmNum_toResID(int param_1) { static const int a_bck_resID_tbl[] = { - 1, - 0 + dRes_ID_JB_BCK_JB_WAIT01_e, + dRes_ID_JB_BCK_JB_APPEAR_e, }; return a_bck_resID_tbl[param_1]; } @@ -598,13 +598,13 @@ daNpc_Jb1_c::daNpc_Jb1_c() {} /* 00001780-00001A0C .text create_Anm__11daNpc_Jb1_cFv */ J3DModelData* daNpc_Jb1_c::create_Anm() { - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectIDRes("Jb", JB_BDL_JB); + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectIDRes("Jb", dRes_ID_JB_BDL_JB_e); JUT_ASSERT(VERSION_SELECT(0x450, 0x45A, 0x45F, 0x45F), a_mdl_dat != NULL); mpMorf = new mDoExt_McaMorf( a_mdl_dat, NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectIDRes("Jb", JB_BCK_JB_WAIT01), + (J3DAnmTransformKey*)dComIfG_getObjectIDRes("Jb", dRes_ID_JB_BCK_JB_WAIT01_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, @@ -618,7 +618,7 @@ J3DModelData* daNpc_Jb1_c::create_Anm() { return NULL; } - m_lmp_brk = (J3DAnmTevRegKey*)dComIfG_getObjectIDRes("Jb", JB_BRK_JB_LAMP); + m_lmp_brk = (J3DAnmTevRegKey*)dComIfG_getObjectIDRes("Jb", dRes_ID_JB_BRK_JB_LAMP_e); JUT_ASSERT(VERSION_SELECT(0x464, 0x46E, 0x473, 0x473), m_lmp_brk != NULL); bool temp = mBrkAnm.init(mpMorf->getModel()->getModelData(), m_lmp_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if(temp == false) { @@ -645,12 +645,12 @@ static void dummy() { /* 00001A0C-00001B78 .text create_lgt__11daNpc_Jb1_cFv */ bool daNpc_Jb1_c::create_lgt() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectIDRes("Jb", JB_BMD_LF); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectIDRes("Jb", dRes_ID_JB_BMD_LF_e); m_lgt_mdl = mDoExt_J3DModel__create(modelData, 0, 0x11020203); JUT_ASSERT(VERSION_SELECT(0x4B6, 0x4C0, 0x4C5, 0x4C5), m_lgt_mdl != NULL); - m_lgt_brk = (J3DAnmTevRegKey*)dComIfG_getObjectIDRes("Jb", JB_BRK_LF); + m_lgt_brk = (J3DAnmTevRegKey*)dComIfG_getObjectIDRes("Jb", dRes_ID_JB_BRK_LF_e); JUT_ASSERT(VERSION_SELECT(0x4BB, 0x4C5, 0x4CA, 0x4CA), m_lgt_brk != NULL); bool temp = mBrkAnm2.init(m_lgt_mdl->getModelData(), m_lgt_brk, true, J3DFrameCtrl::EMode_LOOP); diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 43a1eebb3..ae6524432 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_tsubo.h" #include "d/d_kankyo_wether.h" #include "d/d_s_play.h" -#include "d/res/res_ji.h" +#include "res/Object/Ji.h" #include "d/d_com_inf_game.h" #include "d/d_snap.h" #include "d/d_lib.h" @@ -4248,146 +4248,146 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { switch(param_1) { case 0: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_WAIT01)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_WAIT01_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WAIT01); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_WAIT01_e); break; case 1: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_WAIT02)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_WAIT02_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WAIT02); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_WAIT02_e); break; case 2: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_TALK01)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_TALK01_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TALK01); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_TALK01_e); break; case 3: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_TALK02)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_TALK02_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TALK02); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_TALK02_e); break; case 4: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_AKIRE)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_AKIRE_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_AKIRE); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_AKIRE_e); break; case 5: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_KAMAE)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_KAMAE_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_KAMAE); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_KAMAE_e); break; case 6: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_KROT)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_KROT_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_KROT); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_KROT_e); speed = l_HIO.field_0x48; break; case 7: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_INASI)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_INASI_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_INASI); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_INASI_e); speed = l_HIO.field_0x44; break; case 8: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_TATEGUARD)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_TATEGUARD_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TATEGUARD); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_TATEGUARD_e); break; case 9: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_YKGUARD)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_YKGUARD_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_YKGUARD); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_YKGUARD_e); break; case 10: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_JPGUARD)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_JPGUARD_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_JPGUARD); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_JPGUARD_e); break; case 11: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_TOKAMAE)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_TOKAMAE_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TOKAMAE); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_TOKAMAE_e); break; case 12: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_REI)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_REI_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_REI); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_REI_e); break; case 13: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_WARAI)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_WARAI_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WARAI); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_WARAI_e); speed = l_HIO.field_0x4C; break; case 14: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_JPGUARD)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_JPGUARD_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_JPGUARD); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_JPGUARD_e); speed = 2.0f; break; case 15: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_GUARD)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_GUARD_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_GUARD); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_GUARD_e); speed = 2.0f; break; case 16: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_BTKAMASI)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_BTKAMASI_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BTKAMASI); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_BTKAMASI_e); break; case 17: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_BTKAMAE)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_BTKAMAE_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BTKAMAE); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_BTKAMAE_e); break; case 18: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_UDEGUMI)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_UDEGUMI_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_UDEGUMI); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_UDEGUMI_e); break; case 19: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_TATEATTACK)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_TATEATTACK_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TATEATTACK); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_TATEATTACK_e); break; case 20: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_YOKOATTACK)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_YOKOATTACK_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_YOKOATTACK); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_YOKOATTACK_e); break; case 21: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_ODOROKU)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_ODOROKU_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_ODOROKU); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_ODOROKU_e); break; case 22: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_BIBIRI)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_BIBIRI_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BIBIRI); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_BIBIRI_e); BackSlideInit(); if(field_0xD84 == 1) { @@ -4396,9 +4396,9 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { break; case 23: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_NAKU)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_NAKU_e)); loopMode = J3DFrameCtrl::EMode_LOOP; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NAKU); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_NAKU_e); if(field_0x430 == 0) { field_0x430 = dComIfGp_particle_set(dPa_name::ID_AK_SN_JITEAR00, ¤t.pos); @@ -4407,15 +4407,15 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { break; case 24: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_NUGUI)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_NUGUI_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NUGUI); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_NUGUI_e); break; case 25: - bckAnm = static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JI_DAMAGE)); + bckAnm = static_cast(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JI_DAMAGE_e)); loopMode = J3DFrameCtrl::EMode_NONE; - pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_DAMAGE); + pSoundAnimRes = dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_JI_DAMAGE_e); break; default: @@ -4424,10 +4424,10 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { mpOrcaMorf->setAnm(bckAnm, loopMode, param_2, speed, 0.0f, -1.0f, pSoundAnimRes); if(mAnimation == 0x13) { - mpSpearMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f, NULL); + mpSpearMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JIYARI_TATEATTACK_e), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f, NULL); } else if(mAnimation == 0x14) { - mpSpearMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_YOKOATTACK), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f, NULL); + mpSpearMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JIYARI_YOKOATTACK_e), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f, NULL); } return true; @@ -4553,13 +4553,13 @@ cPhs_State daNpc_Ji1_c::_create() { BOOL daNpc_Ji1_c::CreateHeap() { /* Nonmatching - regalloc */ - J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Ji", JI_BDL_JI)); + J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BDL_JI_e)); mpOrcaMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransformKey*)(dComIfG_getObjectRes("Ji", JI_BCK_WAIT01)), + (J3DAnmTransformKey*)(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_WAIT01_e)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Ji", JI_BAS_WAIT01), + dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BAS_WAIT01_e), 0x00000000, 0x11020203 ); @@ -4588,9 +4588,9 @@ BOOL daNpc_Ji1_c::CreateHeap() { JUT_ASSERT(0x15BA, handRJointNo >= 0); mpSpearMorf = new mDoExt_McaMorf( - (J3DModelData*)(dComIfG_getObjectRes("Ji", JI_BDL_JI_YARI)), + (J3DModelData*)(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BDL_JI_YARI_e)), NULL, NULL, - (J3DAnmTransformKey*)(dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK)), + (J3DAnmTransformKey*)(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BCK_JIYARI_TATEATTACK_e)), J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, 0, 0x00000000, @@ -4602,13 +4602,13 @@ BOOL daNpc_Ji1_c::CreateHeap() { return false; } - J3DModelData* modelData2 = (J3DModelData*)(dComIfG_getObjectRes("Ji", JI_BDL_YJITR00)); + J3DModelData* modelData2 = (J3DModelData*)(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BDL_YJITR00_e)); mpTearsModel = mDoExt_J3DModel__create(modelData2, 0, 0x11020203); - J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Ji", JI_BRK_YJITR00)); + J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BRK_YJITR00_e)); JUT_ASSERT(0x15CD, a_brk != NULL); - J3DAnmTextureSRTKey* a_btk = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes("Ji", JI_BTK_YJITR00)); + J3DAnmTextureSRTKey* a_btk = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BTK_YJITR00_e)); JUT_ASSERT(0x15D0, a_btk != NULL); int temp1 = mCryBrk.init(modelData2, a_brk, false, J3DFrameCtrl::EMode_LOOP); @@ -4618,7 +4618,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { return false; } - headTexPattern = (J3DAnmTexPattern*)(dComIfG_getObjectRes("Ji", JI_BTP_JI)); + headTexPattern = (J3DAnmTexPattern*)(dComIfG_getObjectRes("Ji", dRes_INDEX_JI_BTP_JI_e)); JUT_ASSERT(0x15D8, headTexPattern != NULL); temp2 = mBlinkAnim.init(modelData2, headTexPattern, TRUE, J3DFrameCtrl::EMode_LOOP); diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 48d84e4c8..c3465453e 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kamome.h" -#include "d/res/res_kamome.h" +#include "res/Object/Kamome.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_hostIO.h" #include "d/d_item_data.h" @@ -274,13 +274,13 @@ static int headNodeCallBack(J3DNode* node, int calcTiming) { /* 00000CD0-00000EB8 .text createHeap__11daNpc_kam_cFv */ BOOL daNpc_kam_c::createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kamome", KAMOME_BDL_KA_HYOI); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BDL_KA_HYOI_e); JUT_ASSERT(DEMO_SELECT(762, 763), modelData != NULL); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Kamome", KAMOME_BCK_KA_WAIT1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BCK_KA_WAIT1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, @@ -1183,9 +1183,9 @@ struct anmTbl_c { /* 000039E8-00003B14 .text setAnm__11daNpc_kam_cFi */ void daNpc_kam_c::setAnm(int anmIdx) { static anmTbl_c l_anmTbl[] = { - {KAMOME_BCK_KA_WAIT1, KAMOME_BAS_KA_WAIT1}, - {KAMOME_BCK_KA_WAIT2, KAMOME_BAS_KA_WAIT2}, - {KAMOME_BCK_KA_SING1, -1}, + {dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e}, + {dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e}, + {dRes_INDEX_KAMOME_BCK_KA_SING1_e, -1}, }; static anmPrm_c l_anmPrm[] = { { diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index d19c208e6..368fde64e 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -8,7 +8,7 @@ #include "d/d_com_inf_game.h" #include "d/d_snap.h" #include "m_Do/m_Do_ext.h" -#include "d/res/res_km.h" +#include "res/Object/Km.h" class daNpc_Km1_HIO_c : public JORReflexible{ public: @@ -134,9 +134,9 @@ void daNpc_Km1_c::setMtx() { /* 0000054C-00000654 .text anmResID__11daNpc_Km1_cFiPiPi */ bool daNpc_Km1_c::anmResID(int i_num, int* o_bck_num, int* o_bas_num) { - static const int a_anm_idx_tbl[1][2] = {KM_BCK_KM_WAIT01,KM_BAS_KM_WAIT01}; - JUT_ASSERT(0x11A,0 <= i_num && i_num < ANM_END); - JUT_ASSERT(0x11B,o_bck_num && o_bas_num); + static const int a_anm_idx_tbl[1][2] = { dRes_ID_KM_BCK_KM_WAIT01_e, dRes_ID_KM_BAS_KM_WAIT01_e}; + JUT_ASSERT(282, 0 <= i_num && i_num < ANM_END); + JUT_ASSERT(283, o_bck_num && o_bas_num); *o_bck_num = a_anm_idx_tbl[i_num][0]; *o_bas_num = a_anm_idx_tbl[i_num][1]; return true; @@ -146,7 +146,7 @@ bool daNpc_Km1_c::anmResID(int i_num, int* o_bck_num, int* o_bas_num) { /* 00000654-000006F0 .text BtpNum2ResID__11daNpc_Km1_cFiPi */ void daNpc_Km1_c::BtpNum2ResID(int i_num, int* o_btp_num){ - static const int a_btp_arc_ix_tbl[1] = {KM_BTP_MABA}; + static const int a_btp_arc_ix_tbl[1] = {dRes_ID_KM_BTP_MABA_e}; JUT_ASSERT(0x130,0 <= i_num && i_num < TEXPATTERN_END); *o_btp_num = a_btp_arc_ix_tbl[i_num]; } @@ -161,14 +161,14 @@ void daNpc_Km1_c::setAnm_tex(signed char i_param_1) { /* 00000734-00000850 .text init_btp__11daNpc_Km1_cFbi */ bool daNpc_Km1_c::init_btp(bool param_1, int param_2) { - int btp_num; int iVar3; J3DModelData *pJVar4; pJVar4 = mpMorf->getModel()->getModelData(); if (param_2 >= 0) { - BtpNum2ResID(param_2,&btp_num); - J3DAnmTexPattern* pVVar1 = (J3DAnmTexPattern*)dComIfG_getObjectIDRes("Km",btp_num); + int btpId; + BtpNum2ResID(param_2, &btpId); + J3DAnmTexPattern* pVVar1 = (J3DAnmTexPattern*)dComIfG_getObjectIDRes("Km", btpId); m_head_tex_pattern = pVVar1; JUT_ASSERT(0x151,m_head_tex_pattern != NULL); iVar3 = mBtpAnm.init(pJVar4,m_head_tex_pattern,TRUE,J3DFrameCtrl::EMode_LOOP,1.0f,0,-1,param_1,FALSE); @@ -748,12 +748,12 @@ BOOL daNpc_Km1_c::CreateHeap() { J3DModelData *a_mdl_data; - a_mdl_data = (J3DModelData*)dComIfG_getObjectIDRes("Km",KM_BDL_KM); + a_mdl_data = (J3DModelData*)dComIfG_getObjectIDRes("Km", dRes_ID_KM_BDL_KM_e); JUT_ASSERT(DEMO_SELECT(1316, 1325) ,a_mdl_data != NULL); mpMorf = new mDoExt_McaMorf( a_mdl_data, NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectIDRes("Km", KM_BCK_KM_WAIT01), + (J3DAnmTransform*)dComIfG_getObjectIDRes("Km", dRes_ID_KM_BCK_KM_WAIT01_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11020002 ); diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index e978f1ca8..6eb584b76 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -11,8 +11,8 @@ #include "d/d_bg_s_func.h" #endif #include "f_op/f_op_camera.h" -#include "d/res/res_link.h" -#include "d/res/res_ls.h" +#include "res/Object/Link.h" +#include "res/Object/Ls.h" #include "SSystem/SComponent/c_counter.h" #include "d/d_snap.h" #include "m_Do/m_Do_lib.h" @@ -401,20 +401,20 @@ void daNpc_Ls1_c::setMtx(bool i_setEyePos) { /* 00000EF0-00000F04 .text bckResID__11daNpc_Ls1_cFi */ int daNpc_Ls1_c::bckResID(int i_bckResIDIndex) { static const int a_resID_tbl[] = { - LS_BCK_LS_WAIT01, - LS_BCK_LS_WAIT02, - LS_BCK_LS_WAIT03, - LS_BCK_LS_WAIT04, - LS_BCK_LS_WAIT05, - LS_BCK_LS_WAIT06, - LS_BCK_LS_WATASU, - LS_BCK_LS_FURIMUKI, - LS_BCK_LS_NOZOKU, - LS_BCK_LS_GET, - LS_BCK_LS_WAIT07, - LS_BCK_LS_TALK01, - LS_BCK_LS_DEMOWAIT, - LS_BCK_LS_DEMOLOOK + dRes_ID_LS_BCK_LS_WAIT01_e, + dRes_ID_LS_BCK_LS_WAIT02_e, + dRes_ID_LS_BCK_LS_WAIT03_e, + dRes_ID_LS_BCK_LS_WAIT04_e, + dRes_ID_LS_BCK_LS_WAIT05_e, + dRes_ID_LS_BCK_LS_WAIT06_e, + dRes_ID_LS_BCK_LS_WATASU_e, + dRes_ID_LS_BCK_LS_FURIMUKI_e, + dRes_ID_LS_BCK_LS_NOZOKU_e, + dRes_ID_LS_BCK_LS_GET_e, + dRes_ID_LS_BCK_LS_WAIT07_e, + dRes_ID_LS_BCK_LS_TALK01_e, + dRes_ID_LS_BCK_LS_DEMOWAIT_e, + dRes_ID_LS_BCK_LS_DEMOLOOK_e }; return a_resID_tbl[i_bckResIDIndex]; } @@ -422,17 +422,17 @@ int daNpc_Ls1_c::bckResID(int i_bckResIDIndex) { /* 00000F04-00000F18 .text btpResID__11daNpc_Ls1_cFi */ int daNpc_Ls1_c::btpResID(int i_btpResIDIndex) { static const int a_resID_tbl[] = { - LS_BTP_FUAN, - LS_BTP_MABA, - LS_BTP_FUAN02, - LS_BTP_KIZUKU, - LS_BTP_LS_GET, - LS_BTP_NGWARAI, - LS_BTP_NOZOKU, - LS_BTP_OKORI, - LS_BTP_WARAI, - LS_BTP_LS_DEMOLOOK, - LS_BTP_LS_DEMOWAIT + dRes_ID_LS_BTP_FUAN_e, + dRes_ID_LS_BTP_MABA_e, + dRes_ID_LS_BTP_FUAN02_e, + dRes_ID_LS_BTP_KIZUKU_e, + dRes_ID_LS_BTP_LS_GET_e, + dRes_ID_LS_BTP_NGWARAI_e, + dRes_ID_LS_BTP_NOZOKU_e, + dRes_ID_LS_BTP_OKORI_e, + dRes_ID_LS_BTP_WARAI_e, + dRes_ID_LS_BTP_LS_DEMOLOOK_e, + dRes_ID_LS_BTP_LS_DEMOWAIT_e }; return a_resID_tbl[i_btpResIDIndex]; } @@ -440,9 +440,9 @@ int daNpc_Ls1_c::btpResID(int i_btpResIDIndex) { /* 00000F18-00000F2C .text btkResID__11daNpc_Ls1_cFi */ int daNpc_Ls1_c::btkResID(int i_btkResIDIndex) { static const int a_resID_tbl[] = { - LS_BTK_LS, - LS_BTK_LS_DEMOLOOK, - LS_BTK_LS_DEMOWAIT + dRes_ID_LS_BTK_LS_e, + dRes_ID_LS_BTK_LS_DEMOLOOK_e, + dRes_ID_LS_BTK_LS_DEMOWAIT_e }; return a_resID_tbl[i_btkResIDIndex]; } @@ -2244,7 +2244,7 @@ daNpc_Ls1_c::daNpc_Ls1_c() {} /* 00004C98-00005250 .text bodyCreateHeap__11daNpc_Ls1_cFv */ BOOL daNpc_Ls1_c::bodyCreateHeap() { - J3DModelData* a_mdl_dat = (J3DModelData*) dComIfG_getObjectIDRes(mArcName, LS_BDL_LS); + J3DModelData* a_mdl_dat = (J3DModelData*) dComIfG_getObjectIDRes(mArcName, dRes_ID_LS_BDL_LS_e); JUT_ASSERT(DEMO_SELECT(0xBB3, 0xBC9), a_mdl_dat != NULL); for (u16 i = 0; i < a_mdl_dat->getMaterialNum(); i++) { @@ -2271,7 +2271,7 @@ BOOL daNpc_Ls1_c::bodyCreateHeap() { } if (mType == 4 || dComIfGs_getClearCount() != 0) { - ResTIMG* tex_info_p = (ResTIMG*) dComIfG_getObjectIDRes(mArcName, LS_BTI_LSBODY02); + ResTIMG* tex_info_p = (ResTIMG*) dComIfG_getObjectIDRes(mArcName, dRes_ID_LS_BTI_LSBODY02_e); J3DTexture* a_texture = a_mdl_dat->getTexture(); JUT_ASSERT(DEMO_SELECT(0xBD1, 0xBE7), a_texture != NULL); @@ -2316,7 +2316,7 @@ BOOL daNpc_Ls1_c::bodyCreateHeap() { /* 00005250-00005428 .text handCreateHeap__11daNpc_Ls1_cFv */ BOOL daNpc_Ls1_c::handCreateHeap() { mpLsHandModel = NULL; - J3DModelData* a_mdl_dat = (J3DModelData*) dComIfG_getObjectIDRes(mArcName, LS_BDL_LSHAND); + J3DModelData* a_mdl_dat = (J3DModelData*) dComIfG_getObjectIDRes(mArcName, dRes_ID_LS_BDL_LSHAND_e); JUT_ASSERT(DEMO_SELECT(0xC09, 0xC1F), a_mdl_dat != NULL); mpLsHandModel = mDoExt_J3DModel__create(a_mdl_dat, 0x80000, 0x11000022); @@ -2342,9 +2342,9 @@ BOOL daNpc_Ls1_c::itemCreateHeap() { J3DModelData* a_mdl_dat = (J3DModelData *) #if VERSION > VERSION_DEMO - dComIfG_getObjectRes("Link", LINK_BDL_TELESCOPE); + dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_TELESCOPE_e); #else - dComIfG_getObjectIDRes("Link", LINK_BDL_TELESCOPE); + dComIfG_getObjectIDRes("Link", dRes_ID_LINK_BDL_TELESCOPE_e); #endif JUT_ASSERT(DEMO_SELECT(0xC2D, 0xC43), a_mdl_dat != NULL); diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 0ef8793a5..be5410f17 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -5,13 +5,17 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_nz.h" -#include "d/res/res_nz.h" -#include "d/res/res_npcnz.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_item.h" +#include "res/Object/Npcnz.h" +// Namespace hack to fix both of these res headers having a duplicated NZ_JNT enum that causes a name collision. +namespace ResNz { +#include "res/Object/Nz.h" +} // namespace ResNz + class daNpc_Nz_HIO_c : public JORReflexible { public: daNpc_Nz_HIO_c(); @@ -165,7 +169,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { /* 00000D18-00000F98 .text _createHeap__10daNpc_Nz_cFv */ BOOL daNpc_Nz_c::_createHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_bdl_arc_name, NPCNZ_BDL_NZ)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_bdl_arc_name, dRes_INDEX_NPCNZ_BDL_NZ_e)); JUT_ASSERT(0xD0, modelData != NULL); mpMorf = new mDoExt_McaMorf( @@ -199,7 +203,7 @@ BOOL daNpc_Nz_c::_createHeap() { } } - ResTIMG* img = static_cast(dComIfG_getObjectRes(m_arc_name, NZ_BTI_SIPPO)); + ResTIMG* img = static_cast(dComIfG_getObjectRes(m_arc_name, ResNz::dRes_INDEX_NZ_BTI_SIPPO_e)); if (field_0x934.init(1, 10, img, FALSE)) { return TRUE; } else { diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 96ef80eed..4c4d20c4b 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -8,7 +8,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_pedestal.h" -#include "d/res/res_os.h" +#include "res/Object/Os.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" @@ -291,13 +291,13 @@ static BOOL tunoNodeCallBack(J3DNode* node, int calcTiming) { /* 00000988-00000C94 .text createHeap__10daNpc_Os_cFv */ BOOL daNpc_Os_c::createHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Os", OS_BDL_OS)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Os", dRes_INDEX_OS_BDL_OS_e)); JUT_ASSERT(0x2F9, modelData != NULL); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - static_cast(dComIfG_getObjectRes("Os", OS_BCK_OS_MOVE01)), + static_cast(dComIfG_getObjectRes("Os", dRes_INDEX_OS_BCK_OS_MOVE01_e)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, @@ -1659,9 +1659,9 @@ void daNpc_Os_c::setAnm(int param_1) { }; static s8 l_anmTbl[] = { - OS_BCK_OS_MOVE01, - OS_BCK_OS_MOVE01, - OS_BCK_OS_AWAKE, + dRes_INDEX_OS_BCK_OS_MOVE01_e, + dRes_INDEX_OS_BCK_OS_MOVE01_e, + dRes_INDEX_OS_BCK_OS_AWAKE_e, }; static anmPrm_c l_anmPrm[] = { @@ -1741,15 +1741,15 @@ BOOL daNpc_Os_c::initBrkAnm(u8 param_1, bool param_2) { }; // Size: 0x10 static AnmTableEntry brkAnmTbl[] = { - {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}, + {dRes_INDEX_OS_BRK_TURN_OFF_e, J3DFrameCtrl::EMode_NONE, 1.0f, 0}, + {dRes_INDEX_OS_BRK_TURN_OFF_e, J3DFrameCtrl::EMode_NONE, 1.0f, -1}, + {dRes_INDEX_OS_BRK_OS_AWAKE_e, J3DFrameCtrl::EMode_NONE, 1.0f, 0}, + {dRes_INDEX_OS_BRK_OS_AWAKE_e, J3DFrameCtrl::EMode_NONE, -1.0f, 0}, + {dRes_INDEX_OS_BRK_TURN_ON_e, J3DFrameCtrl::EMode_NONE, 1.0f, 0}, + {dRes_INDEX_OS_BRK_TURN_ON_e, J3DFrameCtrl::EMode_NONE, 0.0f, 0}, + {dRes_INDEX_OS_BRK_TENMETU_e, J3DFrameCtrl::EMode_LOOP, 1.0f, 0}, + {dRes_INDEX_OS_BRK_OS_AWAKE_e, J3DFrameCtrl::EMode_NONE, 0.0f, -1}, + {dRes_INDEX_OS_BRK_LINK_e, 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 fcd11823c..8358940b4 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -17,6 +17,12 @@ #include "d/d_kankyo_wether.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" +#include "res/Object/Uo.h" +#include "res/Object/Ub.h" +#include "res/Object/Uw.h" +#include "res/Object/Um.h" +#include "res/Object/Sa.h" +#include "res/Object/Ug.h" static char* l_npc_staff_id[] = { "Uo1", @@ -63,210 +69,210 @@ static const char* l_arcname_tbl[] = { }; static int l_bck_ix_tbl_uo1[] = { - 0x05, - 0x03, - 0x14, - 0x04, - 0x04, - 0x04, + dRes_ID_UO_BCK_UO_WAIT02_e, + dRes_ID_UO_BCK_UO_TALK02_e, + dRes_ID_UO_BCK_UO_WALK_e, + dRes_ID_UO_BCK_UO_WAIT01_e, + dRes_ID_UO_BCK_UO_WAIT01_e, + dRes_ID_UO_BCK_UO_WAIT01_e, }; static int l_bck_ix_tbl_uo2[] = { - 0x04, - 0x02, - 0x14, - 0x00, - 0x01, - 0x01, + dRes_ID_UO_BCK_UO_WAIT01_e, + dRes_ID_UO_BCK_UO_TALK01_e, + dRes_ID_UO_BCK_UO_WALK_e, + dRes_ID_UO_BCK_UO_BIKURI_e, + dRes_ID_UO_BCK_UO_FURUE_e, + dRes_ID_UO_BCK_UO_FURUE_e, }; static int l_bck_ix_tbl_uo3[] = { - 0x04, - 0x02, - 0x14, - 0x12, - 0x13, - 0x13, + dRes_ID_UO_BCK_UO_WAIT01_e, + dRes_ID_UO_BCK_UO_TALK01_e, + dRes_ID_UO_BCK_UO_WALK_e, + dRes_ID_UO_BCK_UO_KYORO_e, + dRes_ID_UO_BCK_UO_LETTER_e, + dRes_ID_UO_BCK_UO_LETTER_e, }; static int l_bck_ix_tbl_ub1[] = { - 0x0E, - 0x0D, - 0x0E, - 0x0F, - 0x10, - 0x10, + dRes_ID_UB_BCK_UB_WAIT01_e, + dRes_ID_UB_BCK_UB_TALK01_e, + dRes_ID_UB_BCK_UB_WAIT01_e, + dRes_ID_UB_BCK_UB_WAIT02_e, + dRes_ID_UB_BCK_UB_YADA_e, + dRes_ID_UB_BCK_UB_YADA_e, }; static int l_bck_ix_tbl_ub2[] = { - 0x0E, - 0x0D, - 0x0E, - 0x0F, - 0x10, - 0x10, + dRes_ID_UB_BCK_UB_WAIT01_e, + dRes_ID_UB_BCK_UB_TALK01_e, + dRes_ID_UB_BCK_UB_WAIT01_e, + dRes_ID_UB_BCK_UB_WAIT02_e, + dRes_ID_UB_BCK_UB_YADA_e, + dRes_ID_UB_BCK_UB_YADA_e, }; static int l_bck_ix_tbl_ub3[] = { - 0x0E, - 0x0D, - 0x0E, - 0x0F, - 0x10, - 0x11, + dRes_ID_UB_BCK_UB_WAIT01_e, + dRes_ID_UB_BCK_UB_TALK01_e, + dRes_ID_UB_BCK_UB_WAIT01_e, + dRes_ID_UB_BCK_UB_WAIT02_e, + dRes_ID_UB_BCK_UB_YADA_e, + dRes_ID_UB_BCK_UB_LOOK_e, }; static int l_bck_ix_tbl_ub4[] = { - 0x0E, - 0x0D, - 0x0E, - 0x0F, - 0x10, - 0x12, + dRes_ID_UB_BCK_UB_WAIT01_e, + dRes_ID_UB_BCK_UB_TALK01_e, + dRes_ID_UB_BCK_UB_WAIT01_e, + dRes_ID_UB_BCK_UB_WAIT02_e, + dRes_ID_UB_BCK_UB_YADA_e, + dRes_ID_UB_BCK_UB_KUYASI_e, }; static int l_bck_ix_tbl_uw1[] = { - 0x06, - 0x04, - 0x06, - 0x0B, - 0x0C, - 0x0C, + dRes_ID_UW_BCK_UW_WAIT01_e, + dRes_ID_UW_BCK_UW_TALK01_e, + dRes_ID_UW_BCK_UW_WAIT01_e, + dRes_ID_UW_BCK_UW_TALK03_e, + dRes_ID_UW_BCK_UW_TALK04_e, + dRes_ID_UW_BCK_UW_TALK04_e, }; static int l_bck_ix_tbl_uw2[] = { - 0x07, - 0x05, - 0x07, - 0x0D, - 0x0F, - 0x0E, + dRes_ID_UW_BCK_UW_WAIT02_e, + dRes_ID_UW_BCK_UW_TALK02_e, + dRes_ID_UW_BCK_UW_WAIT02_e, + dRes_ID_UW_BCK_UW_02HOKAN_e, + dRes_ID_UW_BCK_UW_MOJIMOJI_e, + dRes_ID_UW_BCK_UW_HAPPY_e, }; static int l_bck_ix_tbl_um1[] = { - 0x05, - 0x04, - 0x06, - 0x0E, - 0x0D, - 0x17, + dRes_ID_UM_BCK_UM_WAIT01_e, + dRes_ID_UM_BCK_UM_TALK01_e, + dRes_ID_UM_BCK_UM_WALK_e, + dRes_ID_UM_BCK_UM_SHOBON_e, + dRes_ID_UM_BCK_UM_HAPPY_e, + dRes_ID_UM_BCK_UM_HAPPY02_e, }; static int l_bck_ix_tbl_um2[] = { - 0x05, - 0x04, - 0x06, - 0x0E, - 0x0D, - 0x17, + dRes_ID_UM_BCK_UM_WAIT01_e, + dRes_ID_UM_BCK_UM_TALK01_e, + dRes_ID_UM_BCK_UM_WALK_e, + dRes_ID_UM_BCK_UM_SHOBON_e, + dRes_ID_UM_BCK_UM_HAPPY_e, + dRes_ID_UM_BCK_UM_HAPPY02_e, }; static int l_bck_ix_tbl_um3[] = { - 0x13, - 0x0F, - 0x06, - 0x14, - 0x12, - 0x10, + dRes_ID_UM_BCK_UM_WAIT02_e, + dRes_ID_UM_BCK_UM_TALK02_e, + dRes_ID_UM_BCK_UM_WALK_e, + dRes_ID_UM_BCK_UM_WAIT03_e, + dRes_ID_UM_BCK_UM_TAMEIKI_e, + dRes_ID_UM_BCK_UM_TALK03_e, }; static int l_bck_ix_tbl_um3_n[] = { - 0x15, - 0x11, - 0x06, - 0x14, - 0x12, - 0x10, + dRes_ID_UM_BCK_UM_WAIT04_e, + dRes_ID_UM_BCK_UM_TALK04_e, + dRes_ID_UM_BCK_UM_WALK_e, + dRes_ID_UM_BCK_UM_WAIT03_e, + dRes_ID_UM_BCK_UM_TAMEIKI_e, + dRes_ID_UM_BCK_UM_TALK03_e, }; static int l_bck_ix_tbl_sa1_n[] = { - 0x1F, - 0x1B, - 0x08, - 0x0A, - 0x17, - 0x16, + dRes_ID_SA_BCK_SA_CWAIT01_e, + dRes_ID_SA_BCK_SA_CTALK01_e, + dRes_ID_SA_BCK_SA_WAIT01_e, + dRes_ID_SA_BCK_SA_TALK02_e, + dRes_ID_SA_BCK_SA_TALK03_e, + dRes_ID_SA_BCK_SA_KIAI_e, }; static int l_bck_ix_tbl_sa2[] = { - 0x18, - 0x07, - 0x18, - 0x0A, - 0x17, - 0x16, + dRes_ID_SA_BCK_SA_WAIT02_e, + dRes_ID_SA_BCK_SA_TALK01_e, + dRes_ID_SA_BCK_SA_WAIT02_e, + dRes_ID_SA_BCK_SA_TALK02_e, + dRes_ID_SA_BCK_SA_TALK03_e, + dRes_ID_SA_BCK_SA_KIAI_e, }; static int l_bck_ix_tbl_sa3[] = { - 0x08, - 0x07, - 0x08, - 0x0A, - 0x17, - 0x16, + dRes_ID_SA_BCK_SA_WAIT01_e, + dRes_ID_SA_BCK_SA_TALK01_e, + dRes_ID_SA_BCK_SA_WAIT01_e, + dRes_ID_SA_BCK_SA_TALK02_e, + dRes_ID_SA_BCK_SA_TALK03_e, + dRes_ID_SA_BCK_SA_KIAI_e, }; static int l_bck_ix_tbl_sa3_n[] = { - 0x20, - 0x1C, - 0x08, - 0x24, - 0x17, - 0x16, + dRes_ID_SA_BCK_SA_CWAIT03_e, + dRes_ID_SA_BCK_SA_CTALK03_e, + dRes_ID_SA_BCK_SA_WAIT01_e, + dRes_ID_SA_BCK_SA_LAUGH_e, + dRes_ID_SA_BCK_SA_TALK03_e, + dRes_ID_SA_BCK_SA_KIAI_e, }; static int l_bck_ix_tbl_sa4[] = { - 0x18, - 0x07, - 0x18, - 0x0A, - 0x17, - 0x16, + dRes_ID_SA_BCK_SA_WAIT02_e, + dRes_ID_SA_BCK_SA_TALK01_e, + dRes_ID_SA_BCK_SA_WAIT02_e, + dRes_ID_SA_BCK_SA_TALK02_e, + dRes_ID_SA_BCK_SA_TALK03_e, + dRes_ID_SA_BCK_SA_KIAI_e, }; static int l_bck_ix_tbl_sa4_n[] = { - 0x22, - 0x1E, - 0x18, - 0x0A, - 0x17, - 0x16, + dRes_ID_SA_BCK_SA_CWAIT05_e, + dRes_ID_SA_BCK_SA_CTALK05_e, + dRes_ID_SA_BCK_SA_WAIT02_e, + dRes_ID_SA_BCK_SA_TALK02_e, + dRes_ID_SA_BCK_SA_TALK03_e, + dRes_ID_SA_BCK_SA_KIAI_e, }; static int l_bck_ix_tbl_sa5[] = { - 0x08, - 0x07, - 0x08, - 0x0A, - 0x17, - 0x16, + dRes_ID_SA_BCK_SA_WAIT01_e, + dRes_ID_SA_BCK_SA_TALK01_e, + dRes_ID_SA_BCK_SA_WAIT01_e, + dRes_ID_SA_BCK_SA_TALK02_e, + dRes_ID_SA_BCK_SA_TALK03_e, + dRes_ID_SA_BCK_SA_KIAI_e, }; static int l_bck_ix_tbl_sa5_n[] = { - 0x21, - 0x1D, - 0x08, - 0x23, - 0x17, - 0x16, + dRes_ID_SA_BCK_SA_CWAIT04_e, + dRes_ID_SA_BCK_SA_CTALK04_e, + dRes_ID_SA_BCK_SA_WAIT01_e, + dRes_ID_SA_BCK_SA_DRINK_e, + dRes_ID_SA_BCK_SA_TALK03_e, + dRes_ID_SA_BCK_SA_KIAI_e, }; static int l_bck_ix_tbl_ug1[] = { - 0x12, - 0x10, - 0x13, - 0x11, - 0x0E, - 0x0F, + dRes_ID_UG_BCK_UG_WAIT01_e, + dRes_ID_UG_BCK_UG_TALK01_e, + dRes_ID_UG_BCK_UG_WALK_e, + dRes_ID_UG_BCK_UG_TALK02_e, + dRes_ID_UG_BCK_UG_SIT01_e, + dRes_ID_UG_BCK_UG_SIT02_e, }; static int l_bck_ix_tbl_ug2[] = { - 0x12, - 0x10, - 0x13, - 0x11, - 0x0E, - 0x0F, + dRes_ID_UG_BCK_UG_WAIT01_e, + dRes_ID_UG_BCK_UG_TALK01_e, + dRes_ID_UG_BCK_UG_WALK_e, + dRes_ID_UG_BCK_UG_TALK02_e, + dRes_ID_UG_BCK_UG_SIT01_e, + dRes_ID_UG_BCK_UG_SIT02_e, }; static int* l_bck_ix_tbl[][2] = { @@ -349,30 +355,30 @@ static int* l_bck_ix_tbl[][2] = { }; static int l_head_bck_ix_sa[] = { - 0x06, - 0x05, - 0x06, - 0x09, - 0x06, - 0x06, + dRes_ID_SA_BCK_SA01HEAD_WAIT01_e, + dRes_ID_SA_BCK_SA01HEAD_TALK01_e, + dRes_ID_SA_BCK_SA01HEAD_WAIT01_e, + dRes_ID_SA_BCK_SA01HEAD_TALK02_e, + dRes_ID_SA_BCK_SA01HEAD_WAIT01_e, + dRes_ID_SA_BCK_SA01HEAD_WAIT01_e, }; static int l_head_bck_ix_sa_n[] = { - 0x1A, - 0x19, - 0x06, - 0x09, - 0x06, - 0x06, + dRes_ID_SA_BCK_SA01HEAD_CWAIT01_e, + dRes_ID_SA_BCK_SA01HEAD_CTALK01_e, + dRes_ID_SA_BCK_SA01HEAD_WAIT01_e, + dRes_ID_SA_BCK_SA01HEAD_TALK02_e, + dRes_ID_SA_BCK_SA01HEAD_WAIT01_e, + dRes_ID_SA_BCK_SA01HEAD_WAIT01_e, }; static int l_head_bck_ix_ug[] = { - 0x0C, - 0x0A, - 0x0D, - 0x0B, - 0x08, - 0x09, + dRes_ID_UG_BCK_UG01HEAD_WAIT01_e, + dRes_ID_UG_BCK_UG01HEAD_TALK01_e, + dRes_ID_UG_BCK_UG01HEAD_WALK_e, + dRes_ID_UG_BCK_UG01HEAD_TALK02_e, + dRes_ID_UG_BCK_UG01HEAD_SIT01_e, + dRes_ID_UG_BCK_UG01HEAD_SIT02_e, }; static int* l_head_bck_ix_tbl[][2] = { @@ -3936,91 +3942,91 @@ static PsoData* l_pso_tbl[] = { const char daNpcPeople_c::m_arcname[] = "Uo"; static const int l_bmd_ix_tbl[] = { - 0x06, - 0x06, - 0x06, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, + dRes_ID_UO_BDL_UO_e, + dRes_ID_UO_BDL_UO_e, + dRes_ID_UO_BDL_UO_e, + dRes_ID_UB_BDL_UB_e, + dRes_ID_UB_BDL_UB_e, + dRes_ID_UB_BDL_UB_e, + dRes_ID_UB_BDL_UB_e, + dRes_ID_UW_BDL_UW_e, + dRes_ID_UW_BDL_UW_e, + dRes_ID_UM_BDL_UM_e, + dRes_ID_UM_BDL_UM_e, + dRes_ID_UM_BDL_UM_e, + dRes_ID_SA_BDL_SA_e, + dRes_ID_SA_BDL_SA_e, + dRes_ID_SA_BDL_SA_e, + dRes_ID_SA_BDL_SA_e, + dRes_ID_SA_BDL_SA_e, + dRes_ID_UG_BDL_UG_e, + dRes_ID_UG_BDL_UG_e, }; static const int l_head_bmd_ix_tbl[] = { - 0x07, - 0x08, - 0x09, - 0x02, - 0x03, - 0x04, - 0x05, - 0x02, - 0x08, - 0x07, - 0x02, - 0x08, - 0x03, - 0x0B, - 0x0C, - 0x0E, - 0x0D, - 0x03, - 0x04, + dRes_ID_UO_BDL_UO01_HEAD_e, + dRes_ID_UO_BDL_UO02_HEAD_e, + dRes_ID_UO_BDL_UO03_HEAD_e, + dRes_ID_UB_BDL_UB01_HEAD_e, + dRes_ID_UB_BDL_UB02_HEAD_e, + dRes_ID_UB_BDL_UB03_HEAD_e, + dRes_ID_UB_BDL_UB04_HEAD_e, + dRes_ID_UW_BDL_UW01_HEAD_e, + dRes_ID_UW_BDL_UW02_HEAD_e, + dRes_ID_UM_BDL_UM02_HEAD_e, + dRes_ID_UM_BDL_UM01_HEAD_e, + dRes_ID_UM_BDL_UM03_HEAD_e, + dRes_ID_SA_BDL_SA01_HEAD_e, + dRes_ID_SA_BDL_SA02_HEAD_e, + dRes_ID_SA_BDL_SA03_HEAD_e, + dRes_ID_SA_BDL_SA05_HEAD_e, + dRes_ID_SA_BDL_SA04_HEAD_e, + dRes_ID_UG_BDL_UG01_HEAD_e, + dRes_ID_UG_BDL_UG02_HEAD_e, }; static const int l_btp_ix_tbl[] = { - 0x0C, - 0x0D, - 0x0E, - 0x09, - 0x0A, - 0x0B, - 0x0C, - 0x03, - 0x09, - 0x09, - 0x03, - 0x0A, - 0x04, - 0x0F, + dRes_ID_UO_BTP_UO01_MABA_e, + dRes_ID_UO_BTP_UO02_MABA_e, + dRes_ID_UO_BTP_UO03_MABA_e, + dRes_ID_UB_BTP_UB01_MABA_e, + dRes_ID_UB_BTP_UB02_MABA_e, + dRes_ID_UB_BTP_UB03_MABA_e, + dRes_ID_UB_BTP_UB04_MABA_e, + dRes_ID_UW_BTP_UW01_MABA_e, + dRes_ID_UW_BTP_UW02_MABA_e, + dRes_ID_UM_BTP_UM02_MABA_e, + dRes_ID_UM_BTP_UM01_MABA_e, + dRes_ID_UM_BTP_UM03_MABA_e, + dRes_ID_SA_BTP_SA01_MABA_e, + dRes_ID_SA_BTP_SA02_MABA_e, -1, - 0x11, - 0x10, - 0x06, - 0x07, + dRes_ID_SA_BTP_SA05_MABA_e, + dRes_ID_SA_BTP_SA04_MABA_e, + dRes_ID_UG_BTP_UG01_MABA_e, + dRes_ID_UG_BTP_UG02_MABA_e, }; static const int l_bmt_ix_tbl[] = { -1, - 0x0A, - 0x0B, + dRes_ID_UO_BMT_UO02_e, + dRes_ID_UO_BMT_UO03_e, -1, - 0x06, - 0x07, - 0x08, + dRes_ID_UB_BMT_UB02_e, + dRes_ID_UB_BMT_UB03_e, + dRes_ID_UB_BMT_UB04_e, -1, - 0x0A, - 0x0B, + dRes_ID_UW_BMT_UW02_e, + dRes_ID_UM_BMT_UM02_e, -1, - 0x0C, + dRes_ID_UM_BMT_UM03_e, -1, - 0x12, - 0x13, - 0x15, - 0x14, + dRes_ID_SA_BMT_SA02_e, + dRes_ID_SA_BMT_SA03_e, + dRes_ID_SA_BMT_SA05_e, + dRes_ID_SA_BMT_SA04_e, -1, - 0x05, + dRes_ID_UG_BMT_UG02_e, }; static const int l_diff_flag_tbl[] = { @@ -4077,8 +4083,8 @@ static const int l_etc_bmd_ix_tbl[][2] = { -1, }, { - 0x15, - 0x15, + dRes_ID_UO_BDL_UO_LETTER_e, + dRes_ID_UO_BDL_UO_LETTER_e, }, { -1, @@ -4114,7 +4120,7 @@ static const int l_etc_bmd_ix_tbl[][2] = { }, { -1, - 0x16, + dRes_ID_UM_BDL_UM_SCOPE_e, }, { -1, @@ -4130,11 +4136,11 @@ static const int l_etc_bmd_ix_tbl[][2] = { }, { -1, - 0x26, + dRes_ID_SA_BDL_SA_CUP05_e, }, { -1, - 0x25, + dRes_ID_SA_BDL_SA_CUP04_e, }, { -1, diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index cbd725f0e..156f60765 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -11,7 +11,7 @@ #include "d/d_path.h" #include "d/actor/d_a_player_main.h" #include "d/d_camera.h" -#include "d/res/res_po.h" +#include "res/Object/Po.h" #include "d/d_snap.h" #include "d/d_kankyo_rain.h" #include "d/d_picture_box.h" @@ -504,16 +504,16 @@ static char* l_npc_staff_id = { }; static const int l_bck_ix_tbl[] = { - PO_BCK_WAIT01, - PO_BCK_TALK01, - PO_BCK_TALK02, - PO_BCK_WALK01, - PO_BCK_SPIT, + dRes_ID_PO_BCK_WAIT01_e, + dRes_ID_PO_BCK_TALK01_e, + dRes_ID_PO_BCK_TALK02_e, + dRes_ID_PO_BCK_WALK01_e, + dRes_ID_PO_BCK_SPIT_e, }; static const int l_btp_ix_tbl[] = { - PO_BTP_MABA01, - PO_BTP_MABA02 + dRes_ID_PO_BTP_MABA01_e, + dRes_ID_PO_BTP_MABA02_e }; struct SaveDatStruct { @@ -657,13 +657,13 @@ cPhs_State daNpcPhoto_c::_create() { /* 00000A04-00000CA0 .text createHeap__12daNpcPhoto_cFv */ BOOL daNpcPhoto_c::createHeap() { - J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectIDRes(l_arcname_tbl[0], PO_BDL_PO); + J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectIDRes(l_arcname_tbl[0], dRes_ID_PO_BDL_PO_e); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectIDRes(l_arcname_tbl[0], l_bck_ix_tbl[field_0x9C8]), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, - 0x80000,0x11020022 + 0x80000, 0x11020022 ); if (mpMorf == NULL || mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 69734f15c..39597ec5a 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_roten.h" -#include "d/res/res_ro.h" +#include "res/Object/Ro.h" #include "m_Do/m_Do_ext.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_demo_item.h" @@ -1408,72 +1408,72 @@ static char* l_npc_staff_id[] = { const char daNpcRoten_c::m_arcname[] = "Ro"; static const int l_bmd_ix_tbl[] = { - RO_BDL_RO, - RO_BDL_RO, - RO_BDL_RO, + dRes_ID_RO_BDL_RO_e, + dRes_ID_RO_BDL_RO_e, + dRes_ID_RO_BDL_RO_e, }; static const int l_bck_ix_tbl[][10] = { { - RO_BCK_RO_WAIT01, - RO_BCK_RO_TALK01, - RO_BCK_RO_WALK, - RO_BCK_RO_TALK02, - RO_BCK_RO_TALK03, - RO_BCK_RO_TALK04, - RO_BCK_RO_TALK05, - RO_BCK_RO_WATASU, - RO_BCK_RO_ITEMWAIT, - RO_BCK_RO_WIND, + dRes_ID_RO_BCK_RO_WAIT01_e, + dRes_ID_RO_BCK_RO_TALK01_e, + dRes_ID_RO_BCK_RO_WALK_e, + dRes_ID_RO_BCK_RO_TALK02_e, + dRes_ID_RO_BCK_RO_TALK03_e, + dRes_ID_RO_BCK_RO_TALK04_e, + dRes_ID_RO_BCK_RO_TALK05_e, + dRes_ID_RO_BCK_RO_WATASU_e, + dRes_ID_RO_BCK_RO_ITEMWAIT_e, + dRes_ID_RO_BCK_RO_WIND_e, }, { - RO_BCK_RO_WAIT01, - RO_BCK_RO_TALK01, - RO_BCK_RO_WALK, - RO_BCK_RO_TALK02, - RO_BCK_RO_TALK03, - RO_BCK_RO_TALK04, - RO_BCK_RO_TALK05, - RO_BCK_RO_WATASU, - RO_BCK_RO_ITEMWAIT, - RO_BCK_RO_WIND, + dRes_ID_RO_BCK_RO_WAIT01_e, + dRes_ID_RO_BCK_RO_TALK01_e, + dRes_ID_RO_BCK_RO_WALK_e, + dRes_ID_RO_BCK_RO_TALK02_e, + dRes_ID_RO_BCK_RO_TALK03_e, + dRes_ID_RO_BCK_RO_TALK04_e, + dRes_ID_RO_BCK_RO_TALK05_e, + dRes_ID_RO_BCK_RO_WATASU_e, + dRes_ID_RO_BCK_RO_ITEMWAIT_e, + dRes_ID_RO_BCK_RO_WIND_e, }, { - RO_BCK_RO_WAIT01, - RO_BCK_RO_TALK01, - RO_BCK_RO_WALK, - RO_BCK_RO_TALK02, - RO_BCK_RO_TALK03, - RO_BCK_RO_TALK04, - RO_BCK_RO_TALK05, - RO_BCK_RO_WATASU, - RO_BCK_RO_ITEMWAIT, - RO_BCK_RO_WIND, + dRes_ID_RO_BCK_RO_WAIT01_e, + dRes_ID_RO_BCK_RO_TALK01_e, + dRes_ID_RO_BCK_RO_WALK_e, + dRes_ID_RO_BCK_RO_TALK02_e, + dRes_ID_RO_BCK_RO_TALK03_e, + dRes_ID_RO_BCK_RO_TALK04_e, + dRes_ID_RO_BCK_RO_TALK05_e, + dRes_ID_RO_BCK_RO_WATASU_e, + dRes_ID_RO_BCK_RO_ITEMWAIT_e, + dRes_ID_RO_BCK_RO_WIND_e, }, }; static const int l_head_bmd_ix_tbl[] = { - RO_BDL_RO_HAT, - RO_BDL_RO_HAT2, - RO_BDL_RO_HAT3, + dRes_ID_RO_BDL_RO_HAT_e, + dRes_ID_RO_BDL_RO_HAT2_e, + dRes_ID_RO_BDL_RO_HAT3_e, }; static const int l_head_bck_ix_tbl[] = { - RO_BCK_HAT_WID, - RO_BCK_HAT2_WIND, - RO_BCK_HAT3_WID, + dRes_ID_RO_BCK_HAT_WID_e, + dRes_ID_RO_BCK_HAT2_WIND_e, + dRes_ID_RO_BCK_HAT3_WID_e, }; static const int l_btp_ix_tbl[] = { - RO_BTP_RO, - RO_BTP_RO, - RO_BTP_RO, + dRes_ID_RO_BTP_RO_e, + dRes_ID_RO_BTP_RO_e, + dRes_ID_RO_BTP_RO_e, }; static const int l_bmt_ix_tbl[] = { -1, - RO_BMT_RO2, - RO_BMT_RO3, + dRes_ID_RO_BMT_RO2_e, + dRes_ID_RO_BMT_RO3_e, }; static const int l_diff_flag_tbl[] = { diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp index 989afe930..abdce13d9 100644 --- a/src/d/actor/d_a_npc_rsh1.cpp +++ b/src/d/actor/d_a_npc_rsh1.cpp @@ -9,7 +9,7 @@ #include "d/d_item.h" #include "d/d_s_play.h" #include "d/d_snap.h" -#include "d/res/res_rsh.h" +#include "res/Object/Rsh.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_ext.h" @@ -265,28 +265,28 @@ static BOOL daNpc_Rsh1_shopStickMoveMsgCheck(u32 param_1) { } static const int l_bck_ix_tbl[] = { - DEMO_SELECT(RSH_INDEX_BCK_RS_WAIT01, RSH_BCK_RS_WAIT01), - DEMO_SELECT(RSH_INDEX_BCK_RS_WAIT02, RSH_BCK_RS_WAIT02), - DEMO_SELECT(RSH_INDEX_BCK_RS_TALK01, RSH_BCK_RS_TALK01), - DEMO_SELECT(RSH_INDEX_BCK_RS_TALK02, RSH_BCK_RS_TALK02), - DEMO_SELECT(RSH_INDEX_BCK_RS_TALK02, RSH_BCK_RS_TALK02), - DEMO_SELECT(RSH_INDEX_BCK_RS_WALK, RSH_BCK_RS_WALK), - DEMO_SELECT(RSH_INDEX_BCK_RS_PUSH, RSH_BCK_RS_PUSH) + DEMO_SELECT(dRes_INDEX_RSH_BCK_RS_WAIT01_e, dRes_INDEX_RSH_BCK_RS_WAIT01_e), + DEMO_SELECT(dRes_INDEX_RSH_BCK_RS_WAIT02_e, dRes_INDEX_RSH_BCK_RS_WAIT02_e), + DEMO_SELECT(dRes_INDEX_RSH_BCK_RS_TALK01_e, dRes_INDEX_RSH_BCK_RS_TALK01_e), + DEMO_SELECT(dRes_INDEX_RSH_BCK_RS_TALK02_e, dRes_INDEX_RSH_BCK_RS_TALK02_e), + DEMO_SELECT(dRes_INDEX_RSH_BCK_RS_TALK02_e, dRes_INDEX_RSH_BCK_RS_TALK02_e), + DEMO_SELECT(dRes_INDEX_RSH_BCK_RS_WALK_e, dRes_INDEX_RSH_BCK_RS_WALK_e), + DEMO_SELECT(dRes_INDEX_RSH_BCK_RS_PUSH_e, dRes_INDEX_RSH_BCK_RS_PUSH_e) }; static const int l_bas_ix_tbl[] = { - DEMO_SELECT(RSH_INDEX_BAS_RS_WAIT01, RSH_BAS_RS_WAIT01), - DEMO_SELECT(RSH_INDEX_BAS_RS_WAIT02, RSH_BAS_RS_WAIT02), - DEMO_SELECT(RSH_INDEX_BAS_RS_TALK01, RSH_BAS_RS_TALK01), - DEMO_SELECT(RSH_INDEX_BAS_RS_TALK02, RSH_BAS_RS_TALK02), - DEMO_SELECT(RSH_INDEX_BAS_RS_TALK02, RSH_BAS_RS_TALK02), - DEMO_SELECT(RSH_INDEX_BAS_RS_WALK, RSH_BAS_RS_WALK), - DEMO_SELECT(RSH_INDEX_BAS_RS_PUSH, RSH_BAS_RS_PUSH) + DEMO_SELECT(dRes_INDEX_RSH_BAS_RS_WAIT01_e, dRes_INDEX_RSH_BAS_RS_WAIT01_e), + DEMO_SELECT(dRes_INDEX_RSH_BAS_RS_WAIT02_e, dRes_INDEX_RSH_BAS_RS_WAIT02_e), + DEMO_SELECT(dRes_INDEX_RSH_BAS_RS_TALK01_e, dRes_INDEX_RSH_BAS_RS_TALK01_e), + DEMO_SELECT(dRes_INDEX_RSH_BAS_RS_TALK02_e, dRes_INDEX_RSH_BAS_RS_TALK02_e), + DEMO_SELECT(dRes_INDEX_RSH_BAS_RS_TALK02_e, dRes_INDEX_RSH_BAS_RS_TALK02_e), + DEMO_SELECT(dRes_INDEX_RSH_BAS_RS_WALK_e, dRes_INDEX_RSH_BAS_RS_WALK_e), + DEMO_SELECT(dRes_INDEX_RSH_BAS_RS_PUSH_e, dRes_INDEX_RSH_BAS_RS_PUSH_e) }; static const int l_btp_ix_tbl[] = { - DEMO_SELECT(RSH_INDEX_BTP_RS_MABA01, RSH_BTP_RS_MABA01), - DEMO_SELECT(RSH_INDEX_BTP_RS_MABA01, RSH_BTP_RS_MABA01) + DEMO_SELECT(dRes_INDEX_RSH_BTP_RS_MABA01_e, dRes_INDEX_RSH_BTP_RS_MABA01_e), + DEMO_SELECT(dRes_INDEX_RSH_BTP_RS_MABA01_e, dRes_INDEX_RSH_BTP_RS_MABA01_e) }; /* 0000087C-00000A44 .text nodeCallBack_Rsh__FP7J3DNodei */ @@ -1833,13 +1833,13 @@ cPhs_State daNpc_Rsh1_c::_create() { /* 00004698-000049A0 .text CreateHeap__12daNpc_Rsh1_cFv */ BOOL daNpc_Rsh1_c::CreateHeap() { - J3DModelData* model_p = (J3DModelData *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BDL_RS, RSH_BDL_RS)); + J3DModelData* model_p = (J3DModelData *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(dRes_INDEX_RSH_BDL_RS_e, dRes_INDEX_RSH_BDL_RS_e)); mpMorf = new mDoExt_McaMorf( model_p, NULL, NULL, - (J3DAnmTransform *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BCK_RS_WAIT01, RSH_BCK_RS_WAIT01)), + (J3DAnmTransform *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(dRes_INDEX_RSH_BCK_RS_WAIT01_e, dRes_INDEX_RSH_BCK_RS_WAIT01_e)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, - dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BAS_RS_WAIT01, RSH_BAS_RS_WAIT01)), + dComIfG_getObjectRes(m_arcname, DEMO_SELECT(dRes_INDEX_RSH_BAS_RS_WAIT01_e, dRes_INDEX_RSH_BAS_RS_WAIT01_e)), 0, 0x11020203 ); @@ -1884,8 +1884,8 @@ BOOL daNpc_Rsh1_c::CreateHeap() { mAcch.Set(current_pos_p, old_pos_p, this, 1, &mAcchCir, speed_p); mpShopCursor = ShopCursor_create( - (J3DModelData *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BMD_SHOP_CURSOR01, RSH_BMD_SHOP_CURSOR01)), - (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BRK_SHOP_CURSOR01, RSH_BRK_SHOP_CURSOR01)), + (J3DModelData *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(dRes_INDEX_RSH_BMD_SHOP_CURSOR01_e, dRes_INDEX_RSH_BMD_SHOP_CURSOR01_e)), + (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(dRes_INDEX_RSH_BRK_SHOP_CURSOR01_e, dRes_INDEX_RSH_BRK_SHOP_CURSOR01_e)), l_HIO.m34 ); diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index 541110723..0696c85af 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/src/d/actor/d_a_npc_tc.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tc.h" #include "m_Do/m_Do_ext.h" -#include "d/res/res_tc.h" +#include "res/Object/Tc.h" #include "d/d_s_play.h" #include "d/d_snap.h" #include "d/actor/d_a_obj_smplbg.h" @@ -141,7 +141,7 @@ daNpc_Tc_HIO_c::daNpc_Tc_HIO_c() { } static const int l_btp_ix_tbl[] = { - TC_BTP_MABA01 + dRes_INDEX_TC_BTP_MABA01_e }; /* 000003D0-0000059C .text nodeCallBack__FP7J3DNodei */ @@ -235,23 +235,23 @@ void daNpc_Tc_c::smoke_set(f32 i_rate, f32 i_spread, f32 i_initialVelOmni, f32 i /* 00000948-00001168 .text setAnm__10daNpc_Tc_cFv */ void daNpc_Tc_c::setAnm() { static const int a_anm_bck_tbl[] = { - TC_BCK_WAIT01, - TC_BCK_WAIT03, - TC_BCK_WAIT02, - TC_BCK_TALK01, - TC_BCK_WALK01, - TC_BCK_JAMP_A, - TC_BCK_JAMP_B, - TC_BCK_JAMP_C, - TC_BCK_GUARD, - TC_BCK_JTBT, - TC_BCK_HAPPY, - TC_BCK_DANCE01, - TC_BCK_DANCE02, - TC_BCK_GET, - TC_BCK_MAWASU, - TC_BCK_WAIT04, - TC_BCK_TALK02, + dRes_INDEX_TC_BCK_WAIT01_e, + dRes_INDEX_TC_BCK_WAIT03_e, + dRes_INDEX_TC_BCK_WAIT02_e, + dRes_INDEX_TC_BCK_TALK01_e, + dRes_INDEX_TC_BCK_WALK01_e, + dRes_INDEX_TC_BCK_JAMP_A_e, + dRes_INDEX_TC_BCK_JAMP_B_e, + dRes_INDEX_TC_BCK_JAMP_C_e, + dRes_INDEX_TC_BCK_GUARD_e, + dRes_INDEX_TC_BCK_JTBT_e, + dRes_INDEX_TC_BCK_HAPPY_e, + dRes_INDEX_TC_BCK_DANCE01_e, + dRes_INDEX_TC_BCK_DANCE02_e, + dRes_INDEX_TC_BCK_GET_e, + dRes_INDEX_TC_BCK_MAWASU_e, + dRes_INDEX_TC_BCK_WAIT04_e, + dRes_INDEX_TC_BCK_TALK02_e, }; dLib_anm_prm_c a_anm_prm_tbl[24] = { @@ -1621,9 +1621,9 @@ void daNpc_Tc_c::set_mtx() { BOOL daNpc_Tc_c::_draw() { static const int a_bmt_tbl[5] = { -1, - TC_BMT_TCB, - TC_BMT_TCC, - TC_BMT_TCA, + dRes_INDEX_TC_BMT_TCB_e, + dRes_INDEX_TC_BMT_TCC_e, + dRes_INDEX_TC_BMT_TCA_e, -1 }; @@ -1874,7 +1874,7 @@ daNpc_Tc_c::daNpc_Tc_c() {} /* 000045D0-000047DC .text _createHeap__10daNpc_Tc_cFv */ BOOL daNpc_Tc_c::_createHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Tc", TC_BDL_TC)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Tc", dRes_INDEX_TC_BDL_TC_e)); JUT_ASSERT(DEMO_SELECT(0xA26, 0xA30), modelData != NULL); mpMorf = new mDoExt_McaMorf( diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index 1fb56b3d5..2a39b672b 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -12,7 +12,7 @@ #include "m_Do/m_Do_ext.h" #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_player.h" -#include "d/res/res_zl.h" +#include "res/Object/Zl.h" #include "d/d_snap.h" class daNpc_Zl1_HIO_c : public mDoHIO_entry_c{ diff --git a/src/d/actor/d_a_nzg.cpp b/src/d/actor/d_a_nzg.cpp index 3559b1db2..5dc81515f 100644 --- a/src/d/actor/d_a_nzg.cpp +++ b/src/d/actor/d_a_nzg.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_nzg.h" #include "d/d_path.h" #include "d/d_s_play.h" -#include "d/res/res_nzg.h" +#include "res/Object/Nzg.h" /* 00000078-000000E4 .text daNZG_Draw__FP9nzg_class */ static BOOL daNZG_Draw(nzg_class* i_this) { @@ -141,7 +141,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { mDoMtx_stack_c::transS(nzg_this->actor.current.pos.x, nzg_this->actor.current.pos.y, nzg_this->actor.current.pos.z); mDoMtx_stack_c::YrotM(nzg_this->actor.shape_angle.y); - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("NZG", NZG_BDL_KANA_00); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("NZG", dRes_INDEX_NZG_BDL_KANA_00_e); JUT_ASSERT(630, modelData != NULL); J3DModel* model = mDoExt_J3DModel__create(modelData, 0,0x11020203); diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index 7270be69c..7d411d273 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_AjavW.h" -#include "d/res/res_ajavw.h" +#include "res/Object/AjavW.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -26,8 +26,8 @@ BOOL daObjAjavW_c::solidHeapCB(fopAc_ac_c* i_this) { bool daObjAjavW_c::create_heap() { bool ret = true; - J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, AJAVW_BDL_AJAVW)); - J3DAnmTextureSRTKey * pBtk = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes(l_arcname, AJAVW_BTK_AJAVW); + J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_AJAVW_BDL_AJAVW_e)); + J3DAnmTextureSRTKey * pBtk = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes(l_arcname, dRes_INDEX_AJAVW_BTK_AJAVW_e); if (!pModelData || !pBtk) { JUT_ASSERT(0xa7, FALSE); @@ -35,7 +35,7 @@ bool daObjAjavW_c::create_heap() { } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222); s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::EMode_LOOP); - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, AJAVW_DZB_AJAVW), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_AJAVW_DZB_AJAVW_e), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); if (!mpModel || !btkRet || !mpBgW) ret = false; diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index a414636ac..0b78a86f9 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Vteng.h" -#include "d/res/res_vteng.h" +#include "res/Object/Vteng.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -36,8 +36,8 @@ BOOL daObjVteng_c::solidHeapCB(fopAc_ac_c* i_this) { bool daObjVteng_c::create_heap() { bool ret = true; - J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, VTENG_BDL_VTENG)); - J3DAnmTransform * pAnm = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, VTENG_BCK_VTENG); + J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_VTENG_BDL_VTENG_e)); + J3DAnmTransform * pAnm = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, dRes_INDEX_VTENG_BCK_VTENG_e); if (!pModelData || !pAnm) { JUT_ASSERT(0xb7, FALSE); @@ -57,7 +57,7 @@ bool daObjVteng_c::create_heap() { } else { J3DModel * model = mpMorf->getModel(); mpModel = model; - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, VTENG_DZB_VTENG), cBgW::MOVE_BG_e, &mtx); + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_VTENG_DZB_VTENG_e), cBgW::MOVE_BG_e, &mtx); if (!mpBgW) ret = false; } diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index e43fc2ae1..0f7e9b437 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Yboil.h" -#include "d/res/res_yboil.h" +#include "res/Object/Yboil.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" @@ -19,13 +19,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-00000368 .text CreateHeap__12daObjYboil_cFv */ BOOL daObjYboil_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Yboil", YBOIL_BDL_YBOIL00); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Yboil", dRes_INDEX_YBOIL_BDL_YBOIL00_e); JUT_ASSERT(92, modelData != NULL); - J3DAnmTransform* bck = static_cast(dComIfG_getObjectRes("Yboil", YBOIL_BCK_YBOIL00)); + J3DAnmTransform* bck = static_cast(dComIfG_getObjectRes("Yboil", dRes_INDEX_YBOIL_BCK_YBOIL00_e)); JUT_ASSERT(96, bck != NULL); - J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes("Yboil", YBOIL_BTK_YBOIL00)); + J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes("Yboil", dRes_INDEX_YBOIL_BTK_YBOIL00_e)); JUT_ASSERT(100, btk != NULL); - J3DAnmTevRegKey* brk = static_cast(dComIfG_getObjectRes("Yboil", YBOIL_BRK_YBOIL00)); + J3DAnmTevRegKey* brk = static_cast(dComIfG_getObjectRes("Yboil", dRes_INDEX_YBOIL_BRK_YBOIL00_e)); JUT_ASSERT(104, brk != NULL); for (s32 i = 0; i < 50; i++) { diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 6857223b7..56749e0e7 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Ygush00.h" -#include "d/res/res_ygush00.h" +#include "res/Object/Ygush00.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" @@ -36,9 +36,9 @@ BOOL daObjYgush00_c::solidHeapCB(fopAc_ac_c* ac) { /* 0000009C-00000250 .text create_heap__14daObjYgush00_cFv */ bool daObjYgush00_c::create_heap() { - static u32 mdl_table[] = { YGUSH00_BDL_YGUSH00, YGUSH00_BDL_YGSTP00, YGUSH00_BDL_YGSTP00, YGUSH00_BDL_YGSTP00 }; - static u32 btk_table[] = { YGUSH00_BTK_YGUSH00, YGUSH00_BTK_YGSTP00, YGUSH00_BTK_YGSTP00, YGUSH00_BTK_YGSTP00 }; - static u32 bck_table[] = { YGUSH00_BCK_YGUSH00, YGUSH00_BCK_YGSTP00, YGUSH00_BCK_YGSTP00, YGUSH00_BCK_YGSTP00 }; + static u32 mdl_table[] = { dRes_INDEX_YGUSH00_BDL_YGUSH00_e, dRes_INDEX_YGUSH00_BDL_YGSTP00_e, dRes_INDEX_YGUSH00_BDL_YGSTP00_e, dRes_INDEX_YGUSH00_BDL_YGSTP00_e }; + static u32 btk_table[] = { dRes_INDEX_YGUSH00_BTK_YGUSH00_e, dRes_INDEX_YGUSH00_BTK_YGSTP00_e, dRes_INDEX_YGUSH00_BTK_YGSTP00_e, dRes_INDEX_YGUSH00_BTK_YGSTP00_e }; + static u32 bck_table[] = { dRes_INDEX_YGUSH00_BCK_YGUSH00_e, dRes_INDEX_YGUSH00_BCK_YGSTP00_e, dRes_INDEX_YGUSH00_BCK_YGSTP00_e, dRes_INDEX_YGUSH00_BCK_YGSTP00_e }; bool ret = true; diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index 52b703f9e..a42db5e11 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_adnno.h" -#include "d/res/res_adnno.h" +#include "res/Object/Adnno.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -14,22 +14,22 @@ #include "m_Do/m_Do_mtx.h" static const u32 daObjAdnno_bmt_table[16] = { - ADNNO_BMT_ADNNO_00, - ADNNO_BMT_ADNNO_01, - ADNNO_BMT_ADNNO_02, - ADNNO_BMT_ADNNO_03, - ADNNO_BMT_ADNNO_04, - ADNNO_BMT_ADNNO_05, - ADNNO_BMT_ADNNO_06, - ADNNO_BMT_ADNNO_07, - ADNNO_BMT_ADNNO_08, - ADNNO_BMT_ADNNO_09, - ADNNO_BMT_ADNNO_10, - ADNNO_BMT_ADNNO_11, - ADNNO_BMT_ADNNO_12, - ADNNO_BMT_ADNNO_13, - ADNNO_BMT_ADNNO_14, - ADNNO_BMT_ADNNO_15, + dRes_INDEX_ADNNO_BMT_ADNNO_00_e, + dRes_INDEX_ADNNO_BMT_ADNNO_01_e, + dRes_INDEX_ADNNO_BMT_ADNNO_02_e, + dRes_INDEX_ADNNO_BMT_ADNNO_03_e, + dRes_INDEX_ADNNO_BMT_ADNNO_04_e, + dRes_INDEX_ADNNO_BMT_ADNNO_05_e, + dRes_INDEX_ADNNO_BMT_ADNNO_06_e, + dRes_INDEX_ADNNO_BMT_ADNNO_07_e, + dRes_INDEX_ADNNO_BMT_ADNNO_08_e, + dRes_INDEX_ADNNO_BMT_ADNNO_09_e, + dRes_INDEX_ADNNO_BMT_ADNNO_10_e, + dRes_INDEX_ADNNO_BMT_ADNNO_11_e, + dRes_INDEX_ADNNO_BMT_ADNNO_12_e, + dRes_INDEX_ADNNO_BMT_ADNNO_13_e, + dRes_INDEX_ADNNO_BMT_ADNNO_14_e, + dRes_INDEX_ADNNO_BMT_ADNNO_15_e, }; /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ @@ -39,7 +39,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-00000178 .text CreateHeap__12daObjAdnno_cFv */ BOOL daObjAdnno_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Adnno", ADNNO_BDL_ADNNO)); + J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Adnno", dRes_INDEX_ADNNO_BDL_ADNNO_e)); JUT_ASSERT(DEMO_SELECT(91, 92), modelData != NULL); for (s32 i = 0; i < 16; i++) { mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x37441422); diff --git a/src/d/actor/d_a_obj_ajav.cpp b/src/d/actor/d_a_obj_ajav.cpp index 63e747d2e..839a1f353 100644 --- a/src/d/actor/d_a_obj_ajav.cpp +++ b/src/d/actor/d_a_obj_ajav.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ajav.h" -#include "d/res/res_ajav.h" +#include "res/Object/Ajav.h" static cXyz l_daObjAjav_co_offset[3] = { cXyz(0.0f, 2550.0f, 200.0f), @@ -444,7 +444,7 @@ BOOL daObjAjav::Act_c::create_heap() { } if (res != FALSE) { - cBgD_t* cbgd_res = (cBgD_t*)dComIfG_getObjectRes(M_arcname, AJAV_DZB_AJAV); + cBgD_t* cbgd_res = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_AJAV_DZB_AJAV_e); mpBgW = dBgW_NewSet(cbgd_res, cBgW::MOVE_BG_e, &mMtx); if (mpBgW == NULL) { res = FALSE; diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index 3f261013b..1914cb3c1 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/src/d/actor/d_a_obj_akabe.cpp @@ -5,10 +5,10 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_akabe.h" -#include "d/res/res_akabe.h" -#include "d/res/res_akabed.h" -#include "d/res/res_akabek.h" -#include "d/res/res_nbox.h" +#include "res/Object/Akabe.h" +#include "res/Object/AkabeD.h" +#include "res/Object/AkabeK.h" +#include "res/Object/NBOX.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -31,7 +31,7 @@ namespace daObjAkabe { mpBgW = new dBgW(); if (mpBgW != NULL) { - static const s16 dzb[4] = { AKABE_DZB_AKABE, AKABED_DZB_AKABED, AKABEK_DZB_AKABEK, NBOX_DZB_NBOX, }; + static const s16 dzb[4] = { dRes_INDEX_AKABE_DZB_AKABE_e, dRes_INDEX_AKABED_DZB_AKABED_e, dRes_INDEX_AKABEK_DZB_AKABEK_e, dRes_INDEX_NBOX_DZB_NBOX_e, }; cBgD_t * bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname[mType], dzb[mType]); JUT_ASSERT(0x82, bgw_data != NULL); if (!mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx)) diff --git a/src/d/actor/d_a_obj_apzl.cpp b/src/d/actor/d_a_obj_apzl.cpp index 1aed07130..caefb337e 100644 --- a/src/d/actor/d_a_obj_apzl.cpp +++ b/src/d/actor/d_a_obj_apzl.cpp @@ -7,296 +7,296 @@ #include "d/actor/d_a_obj_apzl.h" #include "d/actor/d_a_item.h" #include "m_Do/m_Do_controller_pad.h" -#include "d/res/res_apzl.h" +#include "res/Object/Apzl.h" static const u32 daObjApzl_bmt_table[16][16] = { { - APZL_BMT_APZLP_I00, - APZL_BMT_APZLP_I01, - APZL_BMT_APZLP_I02, - APZL_BMT_APZLP_I03, - APZL_BMT_APZLP_I04, - APZL_BMT_APZLP_I05, - APZL_BMT_APZLP_I06, - APZL_BMT_APZLP_I07, - APZL_BMT_APZLP_I08, - APZL_BMT_APZLP_I09, - APZL_BMT_APZLP_I10, - APZL_BMT_APZLP_I11, - APZL_BMT_APZLP_I12, - APZL_BMT_APZLP_I13, - APZL_BMT_APZLP_I14, - APZL_BMT_APZLP_I15, + dRes_INDEX_APZL_BMT_APZLP_I00_e, + dRes_INDEX_APZL_BMT_APZLP_I01_e, + dRes_INDEX_APZL_BMT_APZLP_I02_e, + dRes_INDEX_APZL_BMT_APZLP_I03_e, + dRes_INDEX_APZL_BMT_APZLP_I04_e, + dRes_INDEX_APZL_BMT_APZLP_I05_e, + dRes_INDEX_APZL_BMT_APZLP_I06_e, + dRes_INDEX_APZL_BMT_APZLP_I07_e, + dRes_INDEX_APZL_BMT_APZLP_I08_e, + dRes_INDEX_APZL_BMT_APZLP_I09_e, + dRes_INDEX_APZL_BMT_APZLP_I10_e, + dRes_INDEX_APZL_BMT_APZLP_I11_e, + dRes_INDEX_APZL_BMT_APZLP_I12_e, + dRes_INDEX_APZL_BMT_APZLP_I13_e, + dRes_INDEX_APZL_BMT_APZLP_I14_e, + dRes_INDEX_APZL_BMT_APZLP_I15_e, }, { - APZL_BMT_APZLP_J00, - APZL_BMT_APZLP_J01, - APZL_BMT_APZLP_J02, - APZL_BMT_APZLP_J03, - APZL_BMT_APZLP_J04, - APZL_BMT_APZLP_J05, - APZL_BMT_APZLP_J06, - APZL_BMT_APZLP_J07, - APZL_BMT_APZLP_J08, - APZL_BMT_APZLP_J09, - APZL_BMT_APZLP_J10, - APZL_BMT_APZLP_J11, - APZL_BMT_APZLP_J12, - APZL_BMT_APZLP_J13, - APZL_BMT_APZLP_J14, - APZL_BMT_APZLP_J15, + dRes_INDEX_APZL_BMT_APZLP_J00_e, + dRes_INDEX_APZL_BMT_APZLP_J01_e, + dRes_INDEX_APZL_BMT_APZLP_J02_e, + dRes_INDEX_APZL_BMT_APZLP_J03_e, + dRes_INDEX_APZL_BMT_APZLP_J04_e, + dRes_INDEX_APZL_BMT_APZLP_J05_e, + dRes_INDEX_APZL_BMT_APZLP_J06_e, + dRes_INDEX_APZL_BMT_APZLP_J07_e, + dRes_INDEX_APZL_BMT_APZLP_J08_e, + dRes_INDEX_APZL_BMT_APZLP_J09_e, + dRes_INDEX_APZL_BMT_APZLP_J10_e, + dRes_INDEX_APZL_BMT_APZLP_J11_e, + dRes_INDEX_APZL_BMT_APZLP_J12_e, + dRes_INDEX_APZL_BMT_APZLP_J13_e, + dRes_INDEX_APZL_BMT_APZLP_J14_e, + dRes_INDEX_APZL_BMT_APZLP_J15_e, }, { - APZL_BMT_APZLP_K00, - APZL_BMT_APZLP_K01, - APZL_BMT_APZLP_K02, - APZL_BMT_APZLP_K03, - APZL_BMT_APZLP_K04, - APZL_BMT_APZLP_K05, - APZL_BMT_APZLP_K06, - APZL_BMT_APZLP_K07, - APZL_BMT_APZLP_K08, - APZL_BMT_APZLP_K09, - APZL_BMT_APZLP_K10, - APZL_BMT_APZLP_K11, - APZL_BMT_APZLP_K12, - APZL_BMT_APZLP_K13, - APZL_BMT_APZLP_K14, - APZL_BMT_APZLP_K15, + dRes_INDEX_APZL_BMT_APZLP_K00_e, + dRes_INDEX_APZL_BMT_APZLP_K01_e, + dRes_INDEX_APZL_BMT_APZLP_K02_e, + dRes_INDEX_APZL_BMT_APZLP_K03_e, + dRes_INDEX_APZL_BMT_APZLP_K04_e, + dRes_INDEX_APZL_BMT_APZLP_K05_e, + dRes_INDEX_APZL_BMT_APZLP_K06_e, + dRes_INDEX_APZL_BMT_APZLP_K07_e, + dRes_INDEX_APZL_BMT_APZLP_K08_e, + dRes_INDEX_APZL_BMT_APZLP_K09_e, + dRes_INDEX_APZL_BMT_APZLP_K10_e, + dRes_INDEX_APZL_BMT_APZLP_K11_e, + dRes_INDEX_APZL_BMT_APZLP_K12_e, + dRes_INDEX_APZL_BMT_APZLP_K13_e, + dRes_INDEX_APZL_BMT_APZLP_K14_e, + dRes_INDEX_APZL_BMT_APZLP_K15_e, }, { - APZL_BMT_APZLP_L00, - APZL_BMT_APZLP_L01, - APZL_BMT_APZLP_L02, - APZL_BMT_APZLP_L03, - APZL_BMT_APZLP_L04, - APZL_BMT_APZLP_L05, - APZL_BMT_APZLP_L06, - APZL_BMT_APZLP_L07, - APZL_BMT_APZLP_L08, - APZL_BMT_APZLP_L09, - APZL_BMT_APZLP_L10, - APZL_BMT_APZLP_L11, - APZL_BMT_APZLP_L12, - APZL_BMT_APZLP_L13, - APZL_BMT_APZLP_L14, - APZL_BMT_APZLP_L15, + dRes_INDEX_APZL_BMT_APZLP_L00_e, + dRes_INDEX_APZL_BMT_APZLP_L01_e, + dRes_INDEX_APZL_BMT_APZLP_L02_e, + dRes_INDEX_APZL_BMT_APZLP_L03_e, + dRes_INDEX_APZL_BMT_APZLP_L04_e, + dRes_INDEX_APZL_BMT_APZLP_L05_e, + dRes_INDEX_APZL_BMT_APZLP_L06_e, + dRes_INDEX_APZL_BMT_APZLP_L07_e, + dRes_INDEX_APZL_BMT_APZLP_L08_e, + dRes_INDEX_APZL_BMT_APZLP_L09_e, + dRes_INDEX_APZL_BMT_APZLP_L10_e, + dRes_INDEX_APZL_BMT_APZLP_L11_e, + dRes_INDEX_APZL_BMT_APZLP_L12_e, + dRes_INDEX_APZL_BMT_APZLP_L13_e, + dRes_INDEX_APZL_BMT_APZLP_L14_e, + dRes_INDEX_APZL_BMT_APZLP_L15_e, }, { - APZL_BMT_APZLP_M00, - APZL_BMT_APZLP_M01, - APZL_BMT_APZLP_M02, - APZL_BMT_APZLP_M03, - APZL_BMT_APZLP_M04, - APZL_BMT_APZLP_M05, - APZL_BMT_APZLP_M06, - APZL_BMT_APZLP_M07, - APZL_BMT_APZLP_M08, - APZL_BMT_APZLP_M09, - APZL_BMT_APZLP_M10, - APZL_BMT_APZLP_M11, - APZL_BMT_APZLP_M12, - APZL_BMT_APZLP_M13, - APZL_BMT_APZLP_M14, - APZL_BMT_APZLP_M15, + dRes_INDEX_APZL_BMT_APZLP_M00_e, + dRes_INDEX_APZL_BMT_APZLP_M01_e, + dRes_INDEX_APZL_BMT_APZLP_M02_e, + dRes_INDEX_APZL_BMT_APZLP_M03_e, + dRes_INDEX_APZL_BMT_APZLP_M04_e, + dRes_INDEX_APZL_BMT_APZLP_M05_e, + dRes_INDEX_APZL_BMT_APZLP_M06_e, + dRes_INDEX_APZL_BMT_APZLP_M07_e, + dRes_INDEX_APZL_BMT_APZLP_M08_e, + dRes_INDEX_APZL_BMT_APZLP_M09_e, + dRes_INDEX_APZL_BMT_APZLP_M10_e, + dRes_INDEX_APZL_BMT_APZLP_M11_e, + dRes_INDEX_APZL_BMT_APZLP_M12_e, + dRes_INDEX_APZL_BMT_APZLP_M13_e, + dRes_INDEX_APZL_BMT_APZLP_M14_e, + dRes_INDEX_APZL_BMT_APZLP_M15_e, }, { - APZL_BMT_APZLP_N00, - APZL_BMT_APZLP_N01, - APZL_BMT_APZLP_N02, - APZL_BMT_APZLP_N03, - APZL_BMT_APZLP_N04, - APZL_BMT_APZLP_N05, - APZL_BMT_APZLP_N06, - APZL_BMT_APZLP_N07, - APZL_BMT_APZLP_N08, - APZL_BMT_APZLP_N09, - APZL_BMT_APZLP_N10, - APZL_BMT_APZLP_N11, - APZL_BMT_APZLP_N12, - APZL_BMT_APZLP_N13, - APZL_BMT_APZLP_N14, - APZL_BMT_APZLP_N15, + dRes_INDEX_APZL_BMT_APZLP_N00_e, + dRes_INDEX_APZL_BMT_APZLP_N01_e, + dRes_INDEX_APZL_BMT_APZLP_N02_e, + dRes_INDEX_APZL_BMT_APZLP_N03_e, + dRes_INDEX_APZL_BMT_APZLP_N04_e, + dRes_INDEX_APZL_BMT_APZLP_N05_e, + dRes_INDEX_APZL_BMT_APZLP_N06_e, + dRes_INDEX_APZL_BMT_APZLP_N07_e, + dRes_INDEX_APZL_BMT_APZLP_N08_e, + dRes_INDEX_APZL_BMT_APZLP_N09_e, + dRes_INDEX_APZL_BMT_APZLP_N10_e, + dRes_INDEX_APZL_BMT_APZLP_N11_e, + dRes_INDEX_APZL_BMT_APZLP_N12_e, + dRes_INDEX_APZL_BMT_APZLP_N13_e, + dRes_INDEX_APZL_BMT_APZLP_N14_e, + dRes_INDEX_APZL_BMT_APZLP_N15_e, }, { - APZL_BMT_APZLP_O00, - APZL_BMT_APZLP_O01, - APZL_BMT_APZLP_O02, - APZL_BMT_APZLP_O03, - APZL_BMT_APZLP_O04, - APZL_BMT_APZLP_O05, - APZL_BMT_APZLP_O06, - APZL_BMT_APZLP_O07, - APZL_BMT_APZLP_O08, - APZL_BMT_APZLP_O09, - APZL_BMT_APZLP_O10, - APZL_BMT_APZLP_O11, - APZL_BMT_APZLP_O12, - APZL_BMT_APZLP_O13, - APZL_BMT_APZLP_O14, - APZL_BMT_APZLP_O15, + dRes_INDEX_APZL_BMT_APZLP_O00_e, + dRes_INDEX_APZL_BMT_APZLP_O01_e, + dRes_INDEX_APZL_BMT_APZLP_O02_e, + dRes_INDEX_APZL_BMT_APZLP_O03_e, + dRes_INDEX_APZL_BMT_APZLP_O04_e, + dRes_INDEX_APZL_BMT_APZLP_O05_e, + dRes_INDEX_APZL_BMT_APZLP_O06_e, + dRes_INDEX_APZL_BMT_APZLP_O07_e, + dRes_INDEX_APZL_BMT_APZLP_O08_e, + dRes_INDEX_APZL_BMT_APZLP_O09_e, + dRes_INDEX_APZL_BMT_APZLP_O10_e, + dRes_INDEX_APZL_BMT_APZLP_O11_e, + dRes_INDEX_APZL_BMT_APZLP_O12_e, + dRes_INDEX_APZL_BMT_APZLP_O13_e, + dRes_INDEX_APZL_BMT_APZLP_O14_e, + dRes_INDEX_APZL_BMT_APZLP_O15_e, }, { - APZL_BMT_APZLP_P00, - APZL_BMT_APZLP_P01, - APZL_BMT_APZLP_P02, - APZL_BMT_APZLP_P03, - APZL_BMT_APZLP_P04, - APZL_BMT_APZLP_P05, - APZL_BMT_APZLP_P06, - APZL_BMT_APZLP_P07, - APZL_BMT_APZLP_P08, - APZL_BMT_APZLP_P09, - APZL_BMT_APZLP_P10, - APZL_BMT_APZLP_P11, - APZL_BMT_APZLP_P12, - APZL_BMT_APZLP_P13, - APZL_BMT_APZLP_P14, - APZL_BMT_APZLP_P15, + dRes_INDEX_APZL_BMT_APZLP_P00_e, + dRes_INDEX_APZL_BMT_APZLP_P01_e, + dRes_INDEX_APZL_BMT_APZLP_P02_e, + dRes_INDEX_APZL_BMT_APZLP_P03_e, + dRes_INDEX_APZL_BMT_APZLP_P04_e, + dRes_INDEX_APZL_BMT_APZLP_P05_e, + dRes_INDEX_APZL_BMT_APZLP_P06_e, + dRes_INDEX_APZL_BMT_APZLP_P07_e, + dRes_INDEX_APZL_BMT_APZLP_P08_e, + dRes_INDEX_APZL_BMT_APZLP_P09_e, + dRes_INDEX_APZL_BMT_APZLP_P10_e, + dRes_INDEX_APZL_BMT_APZLP_P11_e, + dRes_INDEX_APZL_BMT_APZLP_P12_e, + dRes_INDEX_APZL_BMT_APZLP_P13_e, + dRes_INDEX_APZL_BMT_APZLP_P14_e, + dRes_INDEX_APZL_BMT_APZLP_P15_e, }, { - APZL_BMT_APZLP_Q00, - APZL_BMT_APZLP_Q01, - APZL_BMT_APZLP_Q02, - APZL_BMT_APZLP_Q03, - APZL_BMT_APZLP_Q04, - APZL_BMT_APZLP_Q05, - APZL_BMT_APZLP_Q06, - APZL_BMT_APZLP_Q07, - APZL_BMT_APZLP_Q08, - APZL_BMT_APZLP_Q09, - APZL_BMT_APZLP_Q10, - APZL_BMT_APZLP_Q11, - APZL_BMT_APZLP_Q12, - APZL_BMT_APZLP_Q13, - APZL_BMT_APZLP_Q14, - APZL_BMT_APZLP_Q15, + dRes_INDEX_APZL_BMT_APZLP_Q00_e, + dRes_INDEX_APZL_BMT_APZLP_Q01_e, + dRes_INDEX_APZL_BMT_APZLP_Q02_e, + dRes_INDEX_APZL_BMT_APZLP_Q03_e, + dRes_INDEX_APZL_BMT_APZLP_Q04_e, + dRes_INDEX_APZL_BMT_APZLP_Q05_e, + dRes_INDEX_APZL_BMT_APZLP_Q06_e, + dRes_INDEX_APZL_BMT_APZLP_Q07_e, + dRes_INDEX_APZL_BMT_APZLP_Q08_e, + dRes_INDEX_APZL_BMT_APZLP_Q09_e, + dRes_INDEX_APZL_BMT_APZLP_Q10_e, + dRes_INDEX_APZL_BMT_APZLP_Q11_e, + dRes_INDEX_APZL_BMT_APZLP_Q12_e, + dRes_INDEX_APZL_BMT_APZLP_Q13_e, + dRes_INDEX_APZL_BMT_APZLP_Q14_e, + dRes_INDEX_APZL_BMT_APZLP_Q15_e, }, { - APZL_BMT_APZLP_R00, - APZL_BMT_APZLP_R01, - APZL_BMT_APZLP_R02, - APZL_BMT_APZLP_R03, - APZL_BMT_APZLP_R04, - APZL_BMT_APZLP_R05, - APZL_BMT_APZLP_R06, - APZL_BMT_APZLP_R07, - APZL_BMT_APZLP_R08, - APZL_BMT_APZLP_R09, - APZL_BMT_APZLP_R10, - APZL_BMT_APZLP_R11, - APZL_BMT_APZLP_R12, - APZL_BMT_APZLP_R13, - APZL_BMT_APZLP_R14, - APZL_BMT_APZLP_R15, + dRes_INDEX_APZL_BMT_APZLP_R00_e, + dRes_INDEX_APZL_BMT_APZLP_R01_e, + dRes_INDEX_APZL_BMT_APZLP_R02_e, + dRes_INDEX_APZL_BMT_APZLP_R03_e, + dRes_INDEX_APZL_BMT_APZLP_R04_e, + dRes_INDEX_APZL_BMT_APZLP_R05_e, + dRes_INDEX_APZL_BMT_APZLP_R06_e, + dRes_INDEX_APZL_BMT_APZLP_R07_e, + dRes_INDEX_APZL_BMT_APZLP_R08_e, + dRes_INDEX_APZL_BMT_APZLP_R09_e, + dRes_INDEX_APZL_BMT_APZLP_R10_e, + dRes_INDEX_APZL_BMT_APZLP_R11_e, + dRes_INDEX_APZL_BMT_APZLP_R12_e, + dRes_INDEX_APZL_BMT_APZLP_R13_e, + dRes_INDEX_APZL_BMT_APZLP_R14_e, + dRes_INDEX_APZL_BMT_APZLP_R15_e, }, { - APZL_BMT_APZLP_S00, - APZL_BMT_APZLP_S01, - APZL_BMT_APZLP_S02, - APZL_BMT_APZLP_S03, - APZL_BMT_APZLP_S04, - APZL_BMT_APZLP_S05, - APZL_BMT_APZLP_S06, - APZL_BMT_APZLP_S07, - APZL_BMT_APZLP_S08, - APZL_BMT_APZLP_S09, - APZL_BMT_APZLP_S10, - APZL_BMT_APZLP_S11, - APZL_BMT_APZLP_S12, - APZL_BMT_APZLP_S13, - APZL_BMT_APZLP_S14, - APZL_BMT_APZLP_S15, + dRes_INDEX_APZL_BMT_APZLP_S00_e, + dRes_INDEX_APZL_BMT_APZLP_S01_e, + dRes_INDEX_APZL_BMT_APZLP_S02_e, + dRes_INDEX_APZL_BMT_APZLP_S03_e, + dRes_INDEX_APZL_BMT_APZLP_S04_e, + dRes_INDEX_APZL_BMT_APZLP_S05_e, + dRes_INDEX_APZL_BMT_APZLP_S06_e, + dRes_INDEX_APZL_BMT_APZLP_S07_e, + dRes_INDEX_APZL_BMT_APZLP_S08_e, + dRes_INDEX_APZL_BMT_APZLP_S09_e, + dRes_INDEX_APZL_BMT_APZLP_S10_e, + dRes_INDEX_APZL_BMT_APZLP_S11_e, + dRes_INDEX_APZL_BMT_APZLP_S12_e, + dRes_INDEX_APZL_BMT_APZLP_S13_e, + dRes_INDEX_APZL_BMT_APZLP_S14_e, + dRes_INDEX_APZL_BMT_APZLP_S15_e, }, { - APZL_BMT_APZLP_T00, - APZL_BMT_APZLP_T01, - APZL_BMT_APZLP_T02, - APZL_BMT_APZLP_T03, - APZL_BMT_APZLP_T04, - APZL_BMT_APZLP_T05, - APZL_BMT_APZLP_T06, - APZL_BMT_APZLP_T07, - APZL_BMT_APZLP_T08, - APZL_BMT_APZLP_T09, - APZL_BMT_APZLP_T10, - APZL_BMT_APZLP_T11, - APZL_BMT_APZLP_T12, - APZL_BMT_APZLP_T13, - APZL_BMT_APZLP_T14, - APZL_BMT_APZLP_T15, + dRes_INDEX_APZL_BMT_APZLP_T00_e, + dRes_INDEX_APZL_BMT_APZLP_T01_e, + dRes_INDEX_APZL_BMT_APZLP_T02_e, + dRes_INDEX_APZL_BMT_APZLP_T03_e, + dRes_INDEX_APZL_BMT_APZLP_T04_e, + dRes_INDEX_APZL_BMT_APZLP_T05_e, + dRes_INDEX_APZL_BMT_APZLP_T06_e, + dRes_INDEX_APZL_BMT_APZLP_T07_e, + dRes_INDEX_APZL_BMT_APZLP_T08_e, + dRes_INDEX_APZL_BMT_APZLP_T09_e, + dRes_INDEX_APZL_BMT_APZLP_T10_e, + dRes_INDEX_APZL_BMT_APZLP_T11_e, + dRes_INDEX_APZL_BMT_APZLP_T12_e, + dRes_INDEX_APZL_BMT_APZLP_T13_e, + dRes_INDEX_APZL_BMT_APZLP_T14_e, + dRes_INDEX_APZL_BMT_APZLP_T15_e, }, { - APZL_BMT_APZLP_U00, - APZL_BMT_APZLP_U01, - APZL_BMT_APZLP_U02, - APZL_BMT_APZLP_U03, - APZL_BMT_APZLP_U04, - APZL_BMT_APZLP_U05, - APZL_BMT_APZLP_U06, - APZL_BMT_APZLP_U07, - APZL_BMT_APZLP_U08, - APZL_BMT_APZLP_U09, - APZL_BMT_APZLP_U10, - APZL_BMT_APZLP_U11, - APZL_BMT_APZLP_U12, - APZL_BMT_APZLP_U13, - APZL_BMT_APZLP_U14, - APZL_BMT_APZLP_U15, + dRes_INDEX_APZL_BMT_APZLP_U00_e, + dRes_INDEX_APZL_BMT_APZLP_U01_e, + dRes_INDEX_APZL_BMT_APZLP_U02_e, + dRes_INDEX_APZL_BMT_APZLP_U03_e, + dRes_INDEX_APZL_BMT_APZLP_U04_e, + dRes_INDEX_APZL_BMT_APZLP_U05_e, + dRes_INDEX_APZL_BMT_APZLP_U06_e, + dRes_INDEX_APZL_BMT_APZLP_U07_e, + dRes_INDEX_APZL_BMT_APZLP_U08_e, + dRes_INDEX_APZL_BMT_APZLP_U09_e, + dRes_INDEX_APZL_BMT_APZLP_U10_e, + dRes_INDEX_APZL_BMT_APZLP_U11_e, + dRes_INDEX_APZL_BMT_APZLP_U12_e, + dRes_INDEX_APZL_BMT_APZLP_U13_e, + dRes_INDEX_APZL_BMT_APZLP_U14_e, + dRes_INDEX_APZL_BMT_APZLP_U15_e, }, { - APZL_BMT_APZLP_V00, - APZL_BMT_APZLP_V01, - APZL_BMT_APZLP_V02, - APZL_BMT_APZLP_V03, - APZL_BMT_APZLP_V04, - APZL_BMT_APZLP_V05, - APZL_BMT_APZLP_V06, - APZL_BMT_APZLP_V07, - APZL_BMT_APZLP_V08, - APZL_BMT_APZLP_V09, - APZL_BMT_APZLP_V10, - APZL_BMT_APZLP_V11, - APZL_BMT_APZLP_V12, - APZL_BMT_APZLP_V13, - APZL_BMT_APZLP_V14, - APZL_BMT_APZLP_V15, + dRes_INDEX_APZL_BMT_APZLP_V00_e, + dRes_INDEX_APZL_BMT_APZLP_V01_e, + dRes_INDEX_APZL_BMT_APZLP_V02_e, + dRes_INDEX_APZL_BMT_APZLP_V03_e, + dRes_INDEX_APZL_BMT_APZLP_V04_e, + dRes_INDEX_APZL_BMT_APZLP_V05_e, + dRes_INDEX_APZL_BMT_APZLP_V06_e, + dRes_INDEX_APZL_BMT_APZLP_V07_e, + dRes_INDEX_APZL_BMT_APZLP_V08_e, + dRes_INDEX_APZL_BMT_APZLP_V09_e, + dRes_INDEX_APZL_BMT_APZLP_V10_e, + dRes_INDEX_APZL_BMT_APZLP_V11_e, + dRes_INDEX_APZL_BMT_APZLP_V12_e, + dRes_INDEX_APZL_BMT_APZLP_V13_e, + dRes_INDEX_APZL_BMT_APZLP_V14_e, + dRes_INDEX_APZL_BMT_APZLP_V15_e, }, { - APZL_BMT_APZLP_W00, - APZL_BMT_APZLP_W01, - APZL_BMT_APZLP_W02, - APZL_BMT_APZLP_W03, - APZL_BMT_APZLP_W04, - APZL_BMT_APZLP_W05, - APZL_BMT_APZLP_W06, - APZL_BMT_APZLP_W07, - APZL_BMT_APZLP_W08, - APZL_BMT_APZLP_W09, - APZL_BMT_APZLP_W10, - APZL_BMT_APZLP_W11, - APZL_BMT_APZLP_W12, - APZL_BMT_APZLP_W13, - APZL_BMT_APZLP_W14, - APZL_BMT_APZLP_W15, + dRes_INDEX_APZL_BMT_APZLP_W00_e, + dRes_INDEX_APZL_BMT_APZLP_W01_e, + dRes_INDEX_APZL_BMT_APZLP_W02_e, + dRes_INDEX_APZL_BMT_APZLP_W03_e, + dRes_INDEX_APZL_BMT_APZLP_W04_e, + dRes_INDEX_APZL_BMT_APZLP_W05_e, + dRes_INDEX_APZL_BMT_APZLP_W06_e, + dRes_INDEX_APZL_BMT_APZLP_W07_e, + dRes_INDEX_APZL_BMT_APZLP_W08_e, + dRes_INDEX_APZL_BMT_APZLP_W09_e, + dRes_INDEX_APZL_BMT_APZLP_W10_e, + dRes_INDEX_APZL_BMT_APZLP_W11_e, + dRes_INDEX_APZL_BMT_APZLP_W12_e, + dRes_INDEX_APZL_BMT_APZLP_W13_e, + dRes_INDEX_APZL_BMT_APZLP_W14_e, + dRes_INDEX_APZL_BMT_APZLP_W15_e, }, { - APZL_BMT_APZLP_X00, - APZL_BMT_APZLP_X01, - APZL_BMT_APZLP_X02, - APZL_BMT_APZLP_X03, - APZL_BMT_APZLP_X04, - APZL_BMT_APZLP_X05, - APZL_BMT_APZLP_X06, - APZL_BMT_APZLP_X07, - APZL_BMT_APZLP_X08, - APZL_BMT_APZLP_X09, - APZL_BMT_APZLP_X10, - APZL_BMT_APZLP_X11, - APZL_BMT_APZLP_X12, - APZL_BMT_APZLP_X13, - APZL_BMT_APZLP_X14, - APZL_BMT_APZLP_X15, + dRes_INDEX_APZL_BMT_APZLP_X00_e, + dRes_INDEX_APZL_BMT_APZLP_X01_e, + dRes_INDEX_APZL_BMT_APZLP_X02_e, + dRes_INDEX_APZL_BMT_APZLP_X03_e, + dRes_INDEX_APZL_BMT_APZLP_X04_e, + dRes_INDEX_APZL_BMT_APZLP_X05_e, + dRes_INDEX_APZL_BMT_APZLP_X06_e, + dRes_INDEX_APZL_BMT_APZLP_X07_e, + dRes_INDEX_APZL_BMT_APZLP_X08_e, + dRes_INDEX_APZL_BMT_APZLP_X09_e, + dRes_INDEX_APZL_BMT_APZLP_X10_e, + dRes_INDEX_APZL_BMT_APZLP_X11_e, + dRes_INDEX_APZL_BMT_APZLP_X12_e, + dRes_INDEX_APZL_BMT_APZLP_X13_e, + dRes_INDEX_APZL_BMT_APZLP_X14_e, + dRes_INDEX_APZL_BMT_APZLP_X15_e, }, }; @@ -771,7 +771,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000D28-00001088 .text CreateHeap__11daObjApzl_cFv */ BOOL daObjApzl_c::CreateHeap() { - J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Apzl", APZL_BDL_APZLP); + J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Apzl", dRes_INDEX_APZL_BDL_APZLP_e); JUT_ASSERT(VERSION_SELECT(0x2B9, 0x2B9, 0x2E2, 0x2E2), modelData != NULL); for(int i = 0; i < 16; i++) { @@ -781,7 +781,7 @@ BOOL daObjApzl_c::CreateHeap() { } } - modelData = (J3DModelData *)dComIfG_getObjectRes("Apzl", APZL_BDL_APZLY); + modelData = (J3DModelData *)dComIfG_getObjectRes("Apzl", dRes_INDEX_APZL_BDL_APZLY_e); JUT_ASSERT(VERSION_SELECT(0x2C6, 0x2C6, 0x2EF, 0x2EF), modelData != NULL); for(int i = 0; i < 4; i++) { @@ -791,10 +791,10 @@ BOOL daObjApzl_c::CreateHeap() { } } - modelData = (J3DModelData *)dComIfG_getObjectRes("Apzl", APZL_BDL_VBSRP); + modelData = (J3DModelData *)dComIfG_getObjectRes("Apzl", dRes_INDEX_APZL_BDL_VBSRP_e); JUT_ASSERT(VERSION_SELECT(0x2D1, 0x2D1, 0x2FA, 0x2FA), modelData != NULL); - J3DAnmTexPattern* btp_data = (J3DAnmTexPattern *)dComIfG_getObjectRes("Apzl", APZL_BTP_VBSRP); + J3DAnmTexPattern* btp_data = (J3DAnmTexPattern *)dComIfG_getObjectRes("Apzl", dRes_INDEX_APZL_BTP_VBSRP_e); JUT_ASSERT(VERSION_SELECT(0x2D6, 0x2D6, 0x2FF, 0x2FF), btp_data != NULL); diff --git a/src/d/actor/d_a_obj_auzu.cpp b/src/d/actor/d_a_obj_auzu.cpp index c1c8ac0a7..b74bd3d9e 100644 --- a/src/d/actor/d_a_obj_auzu.cpp +++ b/src/d/actor/d_a_obj_auzu.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_kytag01.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_ship.h" -#include "d/res/res_auzu.h" +#include "res/Object/Auzu.h" namespace daObjAuzu { namespace { @@ -40,11 +40,11 @@ BOOL daObjAuzu::Act_c::solidHeapCB(fopAc_ac_c* i_this) { /* 0000009C-000001F8 .text create_heap__Q29daObjAuzu5Act_cFv */ bool daObjAuzu::Act_c::create_heap() { bool create_result = false; - J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, AUZU_BDL_AUZU)); + J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_AUZU_BDL_AUZU_e)); JUT_ASSERT(226, mdl_data != NULL); mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000222); - J3DAnmTextureSRTKey* btk_data = static_cast(dComIfG_getObjectRes(M_arcname, AUZU_BTK_AUZU)); + J3DAnmTextureSRTKey* btk_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_AUZU_BTK_AUZU_e)); JUT_ASSERT(236, btk_data != NULL); int init_result = mBtkAnm.init( diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index e0141998e..5ac4c4853 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_barrel.h" #include "d/actor/d_a_obj_eff.h" -#include "d/res/res_ktaru_01.h" +#include "res/Object/Ktaru_01.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" #include "d/d_com_inf_game.h" @@ -56,7 +56,7 @@ const dCcD_SrcCyl daObjBarrel::Act_c::M_cyl_src = { }; const daObjBarrel::Act_c::Attr_c daObjBarrel::Act_c::M_attr = { - /* mBdlIdx */ KTARU_01_BDL_KTARU_01, + /* mBdlIdx */ dRes_INDEX_KTARU_01_BDL_KTARU_01_e, /* mShadowSize */ 60, /* mEnableCutoff */ false, /* mAttnH */ 50.0f, diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 32af8ae6e..552e03c45 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_barrier.h" -#include "d/res/res_ycage.h" +#include "res/Object/Ycage.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" @@ -99,9 +99,9 @@ int daObjBarrier_c::solidHeapCB(fopAc_ac_c* i_this) { /* 000001B0-00000340 .text init__18daObjBarrier_anm_cFv */ bool daObjBarrier_anm_c::init() { bool rt = true; - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BDL_YCAGE00)); - J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YCAGE00)); - J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YCAGE00)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BDL_YCAGE00_e)); + J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BTK_YCAGE00_e)); + J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BRK_YCAGE00_e)); if (modelData == NULL || pbtk == NULL || pbrk == NULL) { JUT_ASSERT(VERSION_SELECT(406, 406, 407, 407), FALSE); @@ -130,7 +130,7 @@ bool daObjBarrier_c::create_heap() { if (!anm_init || !eff_init) { rt = false; } else { - cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(l_arcname, YCAGE_DZB_KEKKAI); + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_DZB_KEKKAI_e); mpBgW = dBgW_NewSet(dzb, cBgW::MOVE_BG_e, &mBgMtx); if (mpBgW == NULL) { rt = false; @@ -390,13 +390,13 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente J3DModelData* modelData = mpModel[effect_idx]->getModelData(); - J3DAnmTextureSRTKey* btk_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00)); + J3DAnmTextureSRTKey* btk_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BTK_YHRBR00_e)); JUT_ASSERT(VERSION_SELECT(839, 839, 937, 937), btk_anm_p != NULL); - J3DAnmTransform* bck_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00)); + J3DAnmTransform* bck_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BCK_YHRBR00_e)); JUT_ASSERT(VERSION_SELECT(844, 844, 942, 942), bck_anm_p != NULL); - J3DAnmTevRegKey* brk_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00)); + J3DAnmTevRegKey* brk_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BRK_YHRBR00_e)); JUT_ASSERT(VERSION_SELECT(849, 849, 947, 947), brk_anm_p != NULL); mBtk[effect_idx].init(modelData, btk_anm_p, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, @@ -417,10 +417,10 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente /* 000011B8-000013E0 .text init__17daObjBarrier_ef_cFv */ bool daObjBarrier_ef_c::init() { bool rt = true; - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BDL_YHRBR00)); - J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00)); - J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00)); - J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BDL_YHRBR00_e)); + J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BTK_YHRBR00_e)); + J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BCK_YHRBR00_e)); + J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_YCAGE_BRK_YHRBR00_e)); if (modelData == NULL || pbtk == NULL || pbck == NULL || pbrk == NULL) { JUT_ASSERT(VERSION_SELECT(918, 918, 1016, 1016), FALSE); diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 5e4b484b5..ccffb8354 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -12,7 +12,7 @@ #include "d/d_s_play.h" #include "d/d_path.h" #include "f_op/f_op_actor_mng.h" -#include "d/res/res_hmos.h" +#include "res/Object/Hmos.h" static daBemos_HIO_c l_HIO; @@ -168,7 +168,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 0000035C-00000498 .text CreateHeap1__9daBemos_cFv */ BOOL daBemos_c::CreateHeap1() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname, HMOS_BDL_HMOS1)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_HMOS_BDL_HMOS1_e)); JUT_ASSERT(417, modelData != NULL); m2B8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -176,7 +176,7 @@ BOOL daBemos_c::CreateHeap1() { return FALSE; } - modelData = static_cast(dComIfG_getObjectRes(m_arcname, HMOS_BDL_HMOSUP1)); + modelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_HMOS_BDL_HMOSUP1_e)); JUT_ASSERT(426, modelData != NULL); m2BC = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -188,7 +188,7 @@ BOOL daBemos_c::CreateHeap1() { /* 00000498-000006EC .text CreateHeap2__9daBemos_cFv */ BOOL daBemos_c::CreateHeap2() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname, HMOS_BDL_HMOS2)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_HMOS_BDL_HMOS2_e)); JUT_ASSERT(448, modelData != NULL); m2B8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -196,7 +196,7 @@ BOOL daBemos_c::CreateHeap2() { return FALSE; } - modelData = static_cast(dComIfG_getObjectRes(m_arcname, HMOS_BDL_HMOSUP2)); + modelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_HMOS_BDL_HMOSUP2_e)); JUT_ASSERT(457, modelData != NULL); m2BC = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -204,7 +204,7 @@ BOOL daBemos_c::CreateHeap2() { return FALSE; } - modelData = static_cast(dComIfG_getObjectRes(m_arcname, HMOS_BDL_HMOS2T)); + modelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_HMOS_BDL_HMOS2T_e)); JUT_ASSERT(475, modelData != NULL); m2C0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -212,7 +212,7 @@ BOOL daBemos_c::CreateHeap2() { return FALSE; } - m_sch_brk = static_cast(dComIfG_getObjectRes(m_arcname, HMOS_BRK_HMOS2T)); + m_sch_brk = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_HMOS_BRK_HMOS2T_e)); JUT_ASSERT(483, m_sch_brk != NULL); if (!mBrkAnm2.init(modelData, m_sch_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { @@ -223,7 +223,7 @@ BOOL daBemos_c::CreateHeap2() { /* 000006EC-000007A8 .text CreateHeap3__9daBemos_cFv */ BOOL daBemos_c::CreateHeap3() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname, HMOS_BDL_HMOS3)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname, dRes_INDEX_HMOS_BDL_HMOS3_e)); JUT_ASSERT(496, modelData != NULL); m2B8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 6726da1bc..de3352b9e 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bscurtain.h" -#include "d/res/res_ptc.h" +#include "res/Object/Ptc.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -40,9 +40,9 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { BOOL daObj_Bscurtain_c::CreateHeap() { J3DModelData* modelData; if ((fpcM_GetParam(this) & 0xFF) != 1 || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F08) != 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, PTC_INDEX_BDL_PTCO); + modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_PTC_BDL_PTCO_e); } else { - modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, PTC_INDEX_BDL_PTCU); + modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_PTC_BDL_PTCU_e); } JUT_ASSERT(0xa9, modelData != NULL); diff --git a/src/d/actor/d_a_obj_buoyrace.cpp b/src/d/actor/d_a_obj_buoyrace.cpp index 1035135fc..ee42a3667 100644 --- a/src/d/actor/d_a_obj_buoyrace.cpp +++ b/src/d/actor/d_a_obj_buoyrace.cpp @@ -7,8 +7,8 @@ #include "d/actor/d_a_obj_buoyrace.h" #include "d/actor/d_a_goal_flag.h" #include "d/actor/d_a_sea.h" -#include "d/res/res_khasi_00.h" -#include "d/res/res_kkiba_00.h" +#include "res/Object/Khasi_00.h" +#include "res/Object/Kkiba_00.h" const char daObjBuoyrace::Act_c::M_arcname_kiba[] = "Kkiba_00"; const char daObjBuoyrace::Act_c::M_arcname_hasi[] = "Khasi_00"; @@ -33,11 +33,11 @@ BOOL daObjBuoyrace::Act_c::solidHeapCB(fopAc_ac_c* i_this) { bool daObjBuoyrace::Act_c::create_heap() { bool result = false; - J3DModelData* mdl_data_kiba = static_cast(dComIfG_getObjectRes(M_arcname_kiba, KKIBA_00_BDL_KKIBA_00)); + J3DModelData* mdl_data_kiba = static_cast(dComIfG_getObjectRes(M_arcname_kiba, dRes_INDEX_KKIBA_00_BDL_KKIBA_00_e)); JUT_ASSERT(119, mdl_data_kiba != NULL); mpModelKiba = mDoExt_J3DModel__create(mdl_data_kiba, 0x80000, 0x11000022); - J3DModelData* mdl_data_hasi = static_cast(dComIfG_getObjectRes(M_arcname_hasi, KHASI_00_BDL_KHASI_00)); + J3DModelData* mdl_data_hasi = static_cast(dComIfG_getObjectRes(M_arcname_hasi, dRes_INDEX_KHASI_00_BDL_KHASI_00_e)); JUT_ASSERT(128, mdl_data_hasi != NULL); mpModelHasi = mDoExt_J3DModel__create(mdl_data_hasi, 0x80000, 0x11000022); diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp index 6134d5e0e..15f2917cf 100644 --- a/src/d/actor/d_a_obj_cafelmp.cpp +++ b/src/d/actor/d_a_obj_cafelmp.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cafelmp.h" -#include "d/res/res_cafelmp.h" +#include "res/Object/Cafelmp.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-0000015C .text CreateHeap__14daObjCafelmp_cFv */ BOOL daObjCafelmp_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Cafelmp", CAFELMP_BDL_YLAMP)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Cafelmp", dRes_INDEX_CAFELMP_BDL_YLAMP_e)); JUT_ASSERT(0x51, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203); if (!mpModel) diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index 31790e83f..d39839382 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/src/d/actor/d_a_obj_canon.cpp @@ -16,7 +16,7 @@ #include "d/d_cc_d.h" #include "d/actor/d_a_bomb.h" #include "d/d_s_play.h" -#include "d/res/res_wallbom.h" +#include "res/Object/WallBom.h" static daObj_Canon_HIO_c l_HIO; @@ -124,7 +124,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { /* 000003F8-000004CC .text _createHeap__13daObj_Canon_cFv */ BOOL daObj_Canon_c::_createHeap() { - J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arc_name, WALLBOM_BDL_WALLBOM); + J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_WALLBOM_BDL_WALLBOM_e); JUT_ASSERT(0x115, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); diff --git a/src/d/actor/d_a_obj_demo_barrel.cpp b/src/d/actor/d_a_obj_demo_barrel.cpp index 8e136541b..4eacfc24f 100644 --- a/src/d/actor/d_a_obj_demo_barrel.cpp +++ b/src/d/actor/d_a_obj_demo_barrel.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_demo_barrel.h" #include "d/d_bg_s_func.h" #include "d/d_com_inf_game.h" -#include "d/res/res_dbarrel.h" +#include "res/Object/DBarrel.h" #include "f_op/f_op_actor_mng.h" const char daObj_Demo_Barrel_c::M_arcname[] = "DBarrel"; @@ -46,15 +46,15 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) { /* 00000398-00000538 .text CreateHeap__19daObj_Demo_Barrel_cFv */ BOOL daObj_Demo_Barrel_c::CreateHeap() { mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectIDRes(M_arcname, DBARREL_BDL_KTARU_02), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, DBARREL_BCK_02_TR_CD), + (J3DModelData*)dComIfG_getObjectIDRes(M_arcname, dRes_ID_DBARREL_BDL_KTARU_02_e), NULL, NULL, + (J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, dRes_ID_DBARREL_BCK_02_TR_CD_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203); if (mpMorf == NULL || mpMorf->getModel() == NULL) { return FALSE; } - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, DBARREL_BCK_02_TR_CD), 0, + mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, dRes_ID_DBARREL_BCK_02_TR_CD_e), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL); mpMorf->setFrame(mpMorf->getEndFrame() - 1.0f); mpModel = mpMorf->getModel(); diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 72454de54..c9c57a43a 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_dmgroom.h" -#include "d/res/res_dmgroom.h" +#include "res/Object/dmgroom.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -20,13 +20,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-000001FC .text CreateHeap__14daObjDmgroom_cFv */ BOOL daObjDmgroom_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BDL_DMGROOM)); + J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dmgroom", dRes_INDEX_DMGROOM_BDL_DMGROOM_e)); JUT_ASSERT(DEMO_SELECT(81, 82), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203); if (!mpModel) return FALSE; - J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BRK_DMGROOM)); + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", dRes_INDEX_DMGROOM_BRK_DMGROOM_e)); JUT_ASSERT(DEMO_SELECT(91, 92), brk != NULL); if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE)) return FALSE; diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index 88ab8cbb9..6ff21df8b 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_doguu.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" -#include "d/res/res_doguu.h" +#include "res/Object/Doguu.h" #include "d/actor/d_a_player.h" #include "f_op/f_op_camera.h" #include "d/d_kankyo_rain.h" @@ -50,12 +50,12 @@ const struct { int bdl_vgsh[3]; int bdl_vgsp[3]; } daObjDoguu_idx_table = { - DOGUU_BMT_VGSMD, DOGUU_BMT_VGSMF, DOGUU_BMT_VGSMN, - DOGUU_BMT_VGSBD, DOGUU_BMT_VGSBF, DOGUU_BMT_VGSBN, - DOGUU_BCK_VGSHD, DOGUU_BCK_VGSHF, DOGUU_BCK_VGSHN, - DOGUU_BRK_VGSMD, DOGUU_BRK_VGSMF, DOGUU_BRK_VGSMN, - DOGUU_BDL_VGSHD, DOGUU_BDL_VGSHF, DOGUU_BDL_VGSHN, - DOGUU_BDL_VGSPD, DOGUU_BDL_VGSPF, DOGUU_BDL_VGSPN + dRes_INDEX_DOGUU_BMT_VGSMD_e, dRes_INDEX_DOGUU_BMT_VGSMF_e, dRes_INDEX_DOGUU_BMT_VGSMN_e, + dRes_INDEX_DOGUU_BMT_VGSBD_e, dRes_INDEX_DOGUU_BMT_VGSBF_e, dRes_INDEX_DOGUU_BMT_VGSBN_e, + dRes_INDEX_DOGUU_BCK_VGSHD_e, dRes_INDEX_DOGUU_BCK_VGSHF_e, dRes_INDEX_DOGUU_BCK_VGSHN_e, + dRes_INDEX_DOGUU_BRK_VGSMD_e, dRes_INDEX_DOGUU_BRK_VGSMF_e, dRes_INDEX_DOGUU_BRK_VGSMN_e, + dRes_INDEX_DOGUU_BDL_VGSHD_e, dRes_INDEX_DOGUU_BDL_VGSHF_e, dRes_INDEX_DOGUU_BDL_VGSHN_e, + dRes_INDEX_DOGUU_BDL_VGSPD_e, dRes_INDEX_DOGUU_BDL_VGSPF_e, dRes_INDEX_DOGUU_BDL_VGSPN_e }; namespace { @@ -95,7 +95,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000188-000007D0 .text CreateHeap__12daObjDoguu_cFv */ BOOL daObjDoguu_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Doguu", DOGUU_BDL_VGSMA)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Doguu", dRes_INDEX_DOGUU_BDL_VGSMA_e)); JUT_ASSERT(0x160, modelData != NULL); J3DMaterialTable* bmt = static_cast(dComIfG_getObjectRes("Doguu", daObjDoguu_idx_table.bmt_vgsm[field_0x894])); @@ -136,7 +136,7 @@ BOOL daObjDoguu_c::CreateHeap() { return FALSE; } - modelData = static_cast(dComIfG_getObjectRes("Doguu", DOGUU_BDL_VGSBA)); + modelData = static_cast(dComIfG_getObjectRes("Doguu", dRes_INDEX_DOGUU_BDL_VGSBA_e)); JUT_ASSERT(0x18f, modelData != NULL); bmt = static_cast(dComIfG_getObjectRes("Doguu", daObjDoguu_idx_table.bmt_vgsb[field_0x894])); modelData->setMaterialTable(bmt, J3DMatCopyFlag_All); @@ -156,7 +156,7 @@ BOOL daObjDoguu_c::CreateHeap() { } } - J3DAnmTransform* bck_body = static_cast(dComIfG_getObjectRes("Doguu", DOGUU_BCK_VGSBA)); + J3DAnmTransform* bck_body = static_cast(dComIfG_getObjectRes("Doguu", dRes_INDEX_DOGUU_BCK_VGSBA_e)); JUT_ASSERT(0x1AB, bck_body != NULL); if (mBckBody.init(modelData, bck_body, true, J3DFrameCtrl::EMode_NONE) == 0) { @@ -179,7 +179,7 @@ BOOL daObjDoguu_c::CreateHeap() { return FALSE; } - J3DAnmTransform* bck_crystal = static_cast(dComIfG_getObjectRes("Doguu", DOGUU_BCK_VGSPA)); + J3DAnmTransform* bck_crystal = static_cast(dComIfG_getObjectRes("Doguu", dRes_INDEX_DOGUU_BCK_VGSPA_e)); JUT_ASSERT(0x1c3, bck_crystal != NULL); if(mBckCrystal.init(modelData, bck_crystal, true, J3DFrameCtrl::EMode_NONE) == 0){ diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp index e35e13d86..cc0145a18 100644 --- a/src/d/actor/d_a_obj_doguu_demo.cpp +++ b/src/d/actor/d_a_obj_doguu_demo.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_doguu_demo.h" -#include "d/res/res_doguud.h" +#include "res/Object/DoguuD.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor.h" @@ -21,7 +21,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { BOOL daObjDoguuD_c::CreateHeap() { mUnusedParam = fopAcM_GetParam(this) & 0xFF; - J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("DoguuD", DOGUUD_BDL_ESKZTO)); + J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("DoguuD", dRes_INDEX_DOGUUD_BDL_ESKZTO_e)); JUT_ASSERT(0x65, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203); if (mpModel == NULL) @@ -38,7 +38,7 @@ BOOL daObjDoguuD_c::CreateHeap() { return FALSE; } - if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("DoguuD", DOGUUD_DZB_ESKZTO), cBgW::MOVE_BG_e, &mMtx)) + if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("DoguuD", dRes_INDEX_DOGUUD_DZB_ESKZTO_e), cBgW::MOVE_BG_e, &mMtx)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index 4b0df7f13..24d9f5179 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_dragonhead.h" -#include "d/res/res_qdghd.h" +#include "res/Object/Qdghd.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -54,7 +54,7 @@ namespace daObjDragonhead_prm { /* 00000098-00000228 .text CreateHeap__17daObjDragonhead_cFv */ BOOL daObjDragonhead_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", QDGHD_BDL_QDGHD)); + J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", dRes_INDEX_QDGHD_BDL_QDGHD_e)); JUT_ASSERT(DEMO_SELECT(158, 160), model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0x00, 0x11020203); if (!mpModel) @@ -68,7 +68,7 @@ BOOL daObjDragonhead_c::CreateHeap() { mDoMtx_copy(mDoMtx_stack_c::get(), mtx); mpBgW = new dBgW(); - if (!mpBgW || mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("Qdghd", QDGHD_DZB_QDGHD), cBgW::MOVE_BG_e, &mtx)) + if (!mpBgW || mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("Qdghd", dRes_INDEX_QDGHD_DZB_QDGHD_e), cBgW::MOVE_BG_e, &mtx)) ret = 0; if (ret != 1) diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index e9fb7ded5..e4a640718 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/src/d/actor/d_a_obj_eayogn.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_eayogn.h" -#include "d/res/res_eayogn.h" +#include "res/Object/Eayogn.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -24,13 +24,13 @@ BOOL daObjEayogn_c::solidHeapCB(fopAc_ac_c* i_this) { BOOL daObjEayogn_c::create_heap() { BOOL ret = FALSE; - J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, EAYOGN_BDL_EAYOGN)); + J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_EAYOGN_BDL_EAYOGN_e)); JUT_ASSERT(0x5c, mdl_data != NULL); if (mdl_data != NULL) { mpModel = mDoExt_J3DModel__create(mdl_data, 0x00, 0x11020203); if (mpModel != NULL) { - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, EAYOGN_DZB_EAYOGN), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_EAYOGN_DZB_EAYOGN_e), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); if (mpBgW != NULL) ret = TRUE; } diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index 8d72c96a4..ac43a3855 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/src/d/actor/d_a_obj_ebomzo.cpp @@ -8,7 +8,7 @@ #include "dolphin/types.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -#include "d/res/res_ebomzo.h" +#include "res/Object/Ebomzo.h" typedef enum { /*0*/ Ebomzo_Mode_Check = 0, @@ -50,7 +50,7 @@ dCcD_SrcSph sph_check_src = { /* 00000078-0000012C .text CreateHeap__Q211daObjEbomzo5Act_cFv */ BOOL daObjEbomzo::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, EBOMZO_BDL_EBOMZO); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_EBOMZO_BDL_EBOMZO_e); JUT_ASSERT(140, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); return mpModel != NULL; @@ -87,7 +87,7 @@ cPhs_State daObjEbomzo::Act_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, EBOMZO_DZB_EBOMZO, NULL, 0x1200); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_EBOMZO_DZB_EBOMZO_e, NULL, 0x1200); JUT_ASSERT(194, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index b314e0a88..9ac94b8dc 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/src/d/actor/d_a_obj_eskban.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_eskban.h" -#include "d/res/res_eskban.h" +#include "res/Object/Eskban.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -107,7 +107,7 @@ static dCcD_SrcSph sph_check_src = { /* 000000EC-000001FC .text CreateHeap__Q211daObjEskban5Act_cFv */ BOOL daObjEskban::Act_c::CreateHeap() { J3DModelData* model_data = - static_cast(dComIfG_getObjectRes(M_arcname, ESKBAN_BDL_ESKBAN)); + static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_ESKBAN_BDL_ESKBAN_e)); JUT_ASSERT(261, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203U); M_smoke = new dPa_smokeEcallBack(); @@ -155,7 +155,7 @@ cPhs_State daObjEskban::Act_c::Mthd_Create() { } phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, ESKBAN_DZB_ESKBAN, NULL, 0x1020); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_ESKBAN_DZB_ESKBAN_e, NULL, 0x1020); JUT_ASSERT(336, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; @@ -199,9 +199,9 @@ void daObjEskban::Act_c::init_mtx() { /* 00000B3C-00000C80 .text eff_m_break__Q211daObjEskban5Act_cFUsUs */ void daObjEskban::Act_c::eff_m_break(u16 particleID, u16 prm_b) { J3DModelData* mdlData = - static_cast(dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI)); + static_cast(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPI_KOISHI_e)); J3DAnmTexPattern* txPattern = - static_cast(dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI)); + static_cast(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTP_MPI_KOISHI_e)); cXyz scale(3.0f, 3.0f, 3.0f); JPABaseEmitter* pBEmtr = dComIfGp_particle_set( diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp index 2bb44f6e5..63ee40a64 100644 --- a/src/d/actor/d_a_obj_ferris.cpp +++ b/src/d/actor/d_a_obj_ferris.cpp @@ -8,7 +8,7 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" -#include "d/res/res_skanran.h" +#include "res/Object/Skanran.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -88,14 +88,14 @@ BOOL daObjFerris::Act_c::solidHeapCB(fopAc_ac_c* i_this) { /* 00000110-0000048C .text create_heap__Q211daObjFerris5Act_cFv */ bool daObjFerris::Act_c::create_heap() { s32 i; - J3DModelData* mdl_data_gondola = static_cast(dComIfG_getObjectRes(M_arcname, SKANRAN_BDL_SGONDOR)); + J3DModelData* mdl_data_gondola = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_SKANRAN_BDL_SGONDOR_e)); JUT_ASSERT(0x183, mdl_data_gondola != NULL); if (VERSION == VERSION_DEMO || mdl_data_gondola != NULL) { for (i = 0; i < 5; i++) mpModel[i] = mDoExt_J3DModel__create(mdl_data_gondola, 0, 0x11020203); } - J3DModelData* mdl_data_wheelbase = static_cast(dComIfG_getObjectRes(M_arcname, SKANRAN_BDL_SKANRAN)); + J3DModelData* mdl_data_wheelbase = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_SKANRAN_BDL_SKANRAN_e)); JUT_ASSERT(DEMO_SELECT(394, 396), mdl_data_wheelbase != NULL); if (VERSION == VERSION_DEMO || mdl_data_wheelbase != NULL) { mpModel[5] = mDoExt_J3DModel__create(mdl_data_wheelbase, 0, 0x11020203); @@ -108,7 +108,7 @@ bool daObjFerris::Act_c::create_heap() { int r29 = 0; #endif - cBgD_t* bgw_data_gondola = static_cast(dComIfG_getObjectRes(M_arcname, SKANRAN_DZB_SGONDOR)); + cBgD_t* bgw_data_gondola = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_SKANRAN_DZB_SGONDOR_e)); JUT_ASSERT(DEMO_SELECT(412, 416), bgw_data_gondola != NULL); if (VERSION == VERSION_DEMO || bgw_data_gondola != NULL) { for (i = 0; i < 5; i++) { @@ -123,7 +123,7 @@ bool daObjFerris::Act_c::create_heap() { } } - cBgD_t* bgw_data_wheelbase = static_cast(dComIfG_getObjectRes(M_arcname, SKANRAN_DZB_SKANRAN)); + cBgD_t* bgw_data_wheelbase = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_SKANRAN_DZB_SKANRAN_e)); JUT_ASSERT(DEMO_SELECT(426, 432), bgw_data_wheelbase != NULL); if (VERSION == VERSION_DEMO || bgw_data_wheelbase != NULL) { int r24 = 5; diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 53c48e8b2..fbedef17d 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -5,8 +5,9 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_figure.h" -#include "d/res/res_figure.h" -#include "d/res/res_figure2.h" +#include "res/Object/Figure.h" +#include "res/Object/Figure1.h" +#include "res/Object/Figure2.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" @@ -106,6 +107,7 @@ struct FigureData { } #endif +// TODO: use enums for bmdId static const FigureData l_figure_dat_tbl[TOTAL_FIGURE_COUNT] = { FIGUREDAT(0x00, 0x37441422, -1), // 0x00 FIGUREDAT(0x01, 0x37441422, -1), // 0x01 @@ -470,7 +472,7 @@ BOOL daObjFigure_c::createHeap() { } if(mFigureNo == 0x3D) { - J3DAnmTevRegKey* pBrkData = static_cast(dComIfG_getObjectIDRes(DEMO_SELECT(l_arcname_tbl[roomId], arcname), FIGURE2_BDL_VF_047)); + J3DAnmTevRegKey* pBrkData = static_cast(dComIfG_getObjectIDRes(DEMO_SELECT(l_arcname_tbl[roomId], arcname), dRes_ID_FIGURE2_BDL_VF_047_e)); if(pBrkData == NULL) { return false; } @@ -486,11 +488,11 @@ BOOL daObjFigure_c::createHeap() { } J3DModelData* pPedestalData; if(mFigureNo == 0x40) { - pPedestalData = (J3DModelData*)dComIfG_getObjectIDRes(DEMO_SELECT(l_arcname_tbl[roomId], arcname), FIGURE2_BDL_VF_044); + pPedestalData = (J3DModelData*)dComIfG_getObjectIDRes(DEMO_SELECT(l_arcname_tbl[roomId], arcname), dRes_ID_FIGURE2_BDL_VF_044_e); mpMorf = new mDoExt_McaMorf( pPedestalData, NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectIDRes(DEMO_SELECT(l_arcname_tbl[roomId], arcname), FIGURE2_BCK_VF_064L), + (J3DAnmTransformKey*)dComIfG_getObjectIDRes(DEMO_SELECT(l_arcname_tbl[roomId], arcname), dRes_ID_FIGURE2_BCK_VF_064L_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, @@ -517,7 +519,7 @@ BOOL daObjFigure_c::createHeap() { #endif } - pPedestalData = static_cast(dComIfG_getObjectIDRes("Figure", FIGURE_BDL_VF_BS)); + pPedestalData = static_cast(dComIfG_getObjectIDRes("Figure", dRes_ID_FIGURE_BDL_VF_BS_e)); if(pPedestalData == NULL) { return false; } @@ -527,7 +529,7 @@ BOOL daObjFigure_c::createHeap() { return false; } - mpPedestalBtp = static_cast(dComIfG_getObjectIDRes("Figure", FIGURE_BTP_VF_BS)); + mpPedestalBtp = static_cast(dComIfG_getObjectIDRes("Figure", dRes_ID_FIGURE_BTP_VF_BS_e)); if(mpPedestalBtp == NULL) { return false; } @@ -1000,15 +1002,15 @@ u8 daObjFigure_c::isFigureGet(u8 figureNo) { int daObjFigure_c::getFigureBmd(u8 figureNo) { u32 bmd = l_figure_dat_tbl[figureNo].mBmdId; switch(figureNo) { - case 0x10: + case 0x10: // Mila's Father if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { - bmd = 3; + bmd = dRes_ID_FIGURE1_BDL_VF_016B_e; } break; - case 0x12: + case 0x12: // Maggie's Father if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { - bmd = 6; + bmd = dRes_ID_FIGURE1_BDL_VF_018B_e; } break; diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index e83980ecb..46879303e 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ganonbed.h" -#include "d/res/res_gbed.h" +#include "res/Object/Gbed.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -57,14 +57,14 @@ BOOL daObjGbed_c::solidHeapCB(fopAc_ac_c* i_this) { bool daObjGbed_c::create_heap() { bool ret = true; - J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, GBED_BDL_K_GBED)); + J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_GBED_BDL_K_GBED_e)); if (!pModelData) { JUT_ASSERT(DEMO_SELECT(173, 177), FALSE); ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022); - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, GBED_DZB_K_GBED), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_GBED_DZB_K_GBED_e), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); if (!mpModel || !mpBgW) ret = false; diff --git a/src/d/actor/d_a_obj_gaship.cpp b/src/d/actor/d_a_obj_gaship.cpp index 530801df5..bd1e71a3d 100644 --- a/src/d/actor/d_a_obj_gaship.cpp +++ b/src/d/actor/d_a_obj_gaship.cpp @@ -8,7 +8,7 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "d/res/res_gaship.h" +#include "res/Object/GaShip.h" const char daObjGaship::Act_c::M_arcname[7] = "GaShip"; @@ -43,7 +43,7 @@ BOOL daObjGaship::Act_c::solidHeapCB(fopAc_ac_c* i_ac) { /* 00000378-00000448 .text create_heap__Q211daObjGaship5Act_cFv */ bool daObjGaship::Act_c::create_heap() { - J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, GASHIP_BDL_GASHIP)); + J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GASHIP_BDL_GASHIP_e)); JUT_ASSERT(140, mdl_data != NULL); #if VERSION > VERSION_DEMO if (mdl_data != NULL) diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index 9a3ba37f1..30b30ed79 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gaship2.h" -#include "d/res/res_yakerom.h" +#include "res/Object/YakeRom.h" #include "SSystem/SComponent/c_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" @@ -23,12 +23,12 @@ bool daObjGaship2::Act_c::create_heap() { J3DModelData *mdl_data; cBgD_t *bgw_data; - mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, YAKEROM_BDL_YAKEROM)); + mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, dRes_INDEX_YAKEROM_BDL_YAKEROM_e)); JUT_ASSERT(90, mdl_data != NULL); mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002); set_mtx(); - bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, YAKEROM_DZB_YAKEROM)); + bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, dRes_INDEX_YAKEROM_DZB_YAKEROM_e)); JUT_ASSERT(103, bgw_data != NULL); #if VERSION > VERSION_DEMO if (bgw_data != NULL) diff --git a/src/d/actor/d_a_obj_gnnbtltaki.cpp b/src/d/actor/d_a_obj_gnnbtltaki.cpp index 3c54440a0..c2d1c2d73 100644 --- a/src/d/actor/d_a_obj_gnnbtltaki.cpp +++ b/src/d/actor/d_a_obj_gnnbtltaki.cpp @@ -4,7 +4,7 @@ */ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gnnbtltaki.h" -#include "d/res/res_gnnbtltaki.h" +#include "res/Object/Gnnbtltaki.h" const char daObjGnnbtaki_c::M_arcname[] = "Gnnbtltaki"; @@ -19,12 +19,12 @@ BOOL daObjGnnbtaki_c::create_heap() { J3DModelData* mdl_data; J3DAnmTextureSRTKey* btk_data; BOOL ret = FALSE; - mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, GNNBTLTAKI_BDL_GNN_BTL_TAKI)); + mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GNNBTLTAKI_BDL_GNN_BTL_TAKI_e)); JUT_ASSERT(90, mdl_data != NULL); if (mdl_data != NULL) { mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203); if (mpModel != NULL) { - btk_data = static_cast(dComIfG_getObjectRes(M_arcname, GNNBTLTAKI_BTK_GNN_BTL_TAKI)); + btk_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GNNBTLTAKI_BTK_GNN_BTL_TAKI_e)); JUT_ASSERT(97, btk_data != NULL); if (btk_data != NULL && mBtkAnm.init(mdl_data, btk_data, TRUE, J3DFrameCtrl::EMode_LOOP)) { ret = TRUE; diff --git a/src/d/actor/d_a_obj_gnndemotakie.cpp b/src/d/actor/d_a_obj_gnndemotakie.cpp index c581b7971..fd800fc1b 100644 --- a/src/d/actor/d_a_obj_gnndemotakie.cpp +++ b/src/d/actor/d_a_obj_gnndemotakie.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gnndemotakie.h" -#include "d/res/res_gnndemotakie.h" +#include "res/Object/Gnndemotakie.h" const char daObjGnntakie_c::M_arcname[] = "Gnndemotakie"; @@ -19,13 +19,13 @@ BOOL daObjGnntakie_c::create_heap() { J3DModelData* mdl_data; J3DAnmTextureSRTKey* btk_data; BOOL ret = FALSE; - mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIE_BDL_GNN_DEMO_TAKI_E)); + mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GNNDEMOTAKIE_BDL_GNN_DEMO_TAKI_E_e)); JUT_ASSERT(90, mdl_data != NULL); if (mdl_data != NULL) { mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203); if (mpModel != NULL) { - btk_data = static_cast(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIE_BTK_GNN_DEMO_TAKI_E)); + btk_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GNNDEMOTAKIE_BTK_GNN_DEMO_TAKI_E_e)); JUT_ASSERT(97, btk_data != NULL); if (btk_data != NULL && mpBtkAnm.init(mdl_data, btk_data, true, J3DFrameCtrl::EMode_LOOP)) { ret = TRUE; diff --git a/src/d/actor/d_a_obj_gnndemotakis.cpp b/src/d/actor/d_a_obj_gnndemotakis.cpp index c137c3a8b..ce0cb7f5d 100644 --- a/src/d/actor/d_a_obj_gnndemotakis.cpp +++ b/src/d/actor/d_a_obj_gnndemotakis.cpp @@ -4,7 +4,7 @@ */ #include "d/dolzel_rel.h" // IWYU pragma: keep -#include "d/res/res_gnndemotakis.h" +#include "res/Object/Gnndemotakis.h" #include "d/actor/d_a_obj_gnndemotakis.h" const char daObjGnntakis_c::M_arcname[] = "Gnndemotakis"; @@ -19,13 +19,13 @@ BOOL daObjGnntakis_c::create_heap() { J3DModelData* mdl_data; J3DAnmTextureSRTKey* btk_data; BOOL ret = FALSE; - mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIS_BDL_GNN_DEMO_TAKI_S)); + mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GNNDEMOTAKIS_BDL_GNN_DEMO_TAKI_S_e)); JUT_ASSERT(155, mdl_data != NULL); if (mdl_data != NULL) { mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203); if (mpModel != NULL) { - btk_data = static_cast(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIS_BTK_GNN_DEMO_TAKI_S)); + btk_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GNNDEMOTAKIS_BTK_GNN_DEMO_TAKI_S_e)); JUT_ASSERT(162, btk_data != NULL); if (btk_data != NULL && mpBtkAnm.init(mdl_data, btk_data, TRUE, 0, 1.0f, 0, -1, FALSE, 0)) { ret = TRUE; diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index 5a154c26b..6f28ea052 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gong.h" -#include "d/res/res_vdora.h" +#include "res/Object/Vdora.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_a_obj.h" @@ -39,8 +39,8 @@ BOOL daObjGong::Act_c::solidHeapCB(fopAc_ac_c* i_this) { /* 0000009C-0000028C .text create_heap__Q29daObjGong5Act_cFv */ bool daObjGong::Act_c::create_heap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BDL_VDORA)); - J3DAnmTransformKey* bck = static_cast(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BCK_05_VDORA_CUT02_HIT)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_VDORA_BDL_VDORA_e)); + J3DAnmTransformKey* bck = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_VDORA_BCK_05_VDORA_CUT02_HIT_e)); JUT_ASSERT(0xbd, (modelData != NULL) && (bck != NULL)); mpMorf = new mDoExt_McaMorf( diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index 314e25378..0bed11a29 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -7,7 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_particle.h" #include "d/actor/d_a_obj_gryw00.h" -#include "d/res/res_gryw00.h" +#include "res/Object/Gryw00.h" #define SPREAD_PHASE_ANIM_LEN 95 #define RISE_PHASE_ANIM_LEN 299 @@ -30,7 +30,7 @@ f32 daObjGryw00_c::get_draw_water_lv(void* p) { /* 00000090-00000168 .text setup_high_water_level_btk_anm__13daObjGryw00_cFv */ 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)); + J3DAnmTextureSRTKey* btk_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_GRYW00_BTK_GRYW00_e)); JUT_ASSERT(223, btk_anm_p != NULL); if (!mBtk.init(mpModel->getModelData(), btk_anm_p, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0x191, -1, -1, 0)) { ret = FALSE; @@ -92,9 +92,9 @@ void daObjGryw00_c::set_se() { /* 000004C4-00000654 .text CreateHeap__13daObjGryw00_cFv */ BOOL daObjGryw00_c::CreateHeap() { BOOL ret = TRUE; - J3DModelData* mdlData = static_cast(dComIfG_getObjectRes(l_arcname, GRYW00_BDL_GRYW00)); - J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(l_arcname, GRYW00_BTK_GRYW00)); - J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(l_arcname, GRYW00_BCK_GRYW00)); + J3DModelData* mdlData = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_GRYW00_BDL_GRYW00_e)); + J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_GRYW00_BTK_GRYW00_e)); + J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_GRYW00_BCK_GRYW00_e)); if (!mdlData || !pbtk || !pbck) { JUT_ASSERT(409, FALSE); ret = FALSE; @@ -154,7 +154,7 @@ cPhs_State daObjGryw00_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, l_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(l_arcname, GRYW00_DZB_EWATER, dBgS_MoveBGProc_Trans, 0x9a0); + phase_state = MoveBGCreate(l_arcname, dRes_INDEX_GRYW00_DZB_EWATER_e, dBgS_MoveBGProc_Trans, 0x9a0); JUT_ASSERT(519, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; diff --git a/src/d/actor/d_a_obj_gtaki.cpp b/src/d/actor/d_a_obj_gtaki.cpp index bee08a361..725fb720a 100644 --- a/src/d/actor/d_a_obj_gtaki.cpp +++ b/src/d/actor/d_a_obj_gtaki.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gtaki.h" #include "d/d_cc_d.h" -#include "d/res/res_gtaki.h" +#include "res/Object/Gtaki.h" #include "m_Do/m_Do_graphic.h" static dCcD_SrcCyl l_cyl_src = { @@ -63,12 +63,12 @@ void daObjGtaki_c::setDummyTexture() { /* 00000280-00000484 .text CreateHeap__12daObjGtaki_cFv */ BOOL daObjGtaki_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Gtaki", GTAKI_BDL_GTAKI); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Gtaki", dRes_INDEX_GTAKI_BDL_GTAKI_e); JUT_ASSERT(DEMO_SELECT(265, 267), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if(mpModel == NULL) return FALSE; - J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes("Gtaki", GTAKI_BTK_GTAKI)); + J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes("Gtaki", dRes_INDEX_GTAKI_BTK_GTAKI_e)); JUT_ASSERT(DEMO_SELECT(275, 277), btk != NULL); mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0, 0, -1, false, 0); setDummyTexture(); @@ -80,7 +80,7 @@ BOOL daObjGtaki_c::CreateHeap() { mpBgW = new dBgW(); - if(!mpBgW || mpBgW->Set(static_cast(dComIfG_getObjectRes("Gtaki", GTAKI_DZB_ITAKI)), cBgW::MOVE_BG_e, &mMtx)){ + if(!mpBgW || mpBgW->Set(static_cast(dComIfG_getObjectRes("Gtaki", dRes_INDEX_GTAKI_DZB_ITAKI_e)), cBgW::MOVE_BG_e, &mMtx)){ return FALSE; } diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp index 67b562819..b743f64b5 100644 --- a/src/d/actor/d_a_obj_hami3.cpp +++ b/src/d/actor/d_a_obj_hami3.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_hami3.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" -#include "d/res/res_hami3.h" +#include "res/Object/Hami3.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -37,7 +37,7 @@ static BOOL nodeCallBack(J3DNode *node, int calcTiming) { /* 0000012C-0000026C .text CreateHeap__Q210daObjHami35Act_cFv */ BOOL daObjHami3::Act_c::CreateHeap() { - J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes(M_arcname, HAMI3_BDL_HAMI3); + J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes(M_arcname, dRes_INDEX_HAMI3_BDL_HAMI3_e); JUT_ASSERT(DEMO_SELECT(112, 113), modelData != NULL); field_0x2D4 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -83,7 +83,7 @@ cPhs_State daObjHami3::Act_c::Mthd_Create() { fopAcM_ct(this, daObjHami3::Act_c); cPhs_State phase_state = dComIfG_resLoad(&field_0x2CC, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, HAMI3_DZB_HAMI3, dBgS_MoveBGProc_Typical, 0x1fc0); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_HAMI3_DZB_HAMI3_e, dBgS_MoveBGProc_Typical, 0x1fc0); JUT_ASSERT(DEMO_SELECT(182, 183), (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); diff --git a/src/d/actor/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp index cba70edee..a05e08aae 100644 --- a/src/d/actor/d_a_obj_hami4.cpp +++ b/src/d/actor/d_a_obj_hami4.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_hami4.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/d_com_inf_game.h" -#include "d/res/res_hami4.h" +#include "res/Object/Hami4.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c* actor) { @@ -16,7 +16,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* actor) { /* 00000098-00000374 .text CreateHeap__12daObjHami4_cFv */ BOOL daObjHami4_c::CreateHeap() { - J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Hami4", HAMI4_BDL_HAMI4); + J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Hami4", dRes_INDEX_HAMI4_BDL_HAMI4_e); JUT_ASSERT(0x5f, modelData != NULL); if (fopAcM_isSwitch(this, prm_get_swSave())) { @@ -41,7 +41,7 @@ BOOL daObjHami4_c::CreateHeap() { mpModels[i]->setBaseTRMtx(mDoMtx_stack_c::get()); mdBgW[i] = new dBgW(); if (mdBgW[i] != NULL) { - cBgD_t* bgp = (cBgD_t*)dComIfG_getObjectRes("Hami4", HAMI4_DZB_HAMI4); + cBgD_t* bgp = (cBgD_t*)dComIfG_getObjectRes("Hami4", dRes_INDEX_HAMI4_DZB_HAMI4_e); if(!mdBgW[i]->Set(bgp, dBgW::MOVE_BG_e, &field_0x2B8[i])){ continue; } diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp index fb3e24b7c..7ee2e1a4c 100644 --- a/src/d/actor/d_a_obj_hat.cpp +++ b/src/d/actor/d_a_obj_hat.cpp @@ -9,12 +9,12 @@ #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" -#include "d/res/res_ro.h" +#include "res/Object/Ro.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" -static const int l_bmd_ix_tbl[] = {RO_BDL_RO_HAT, RO_BDL_RO_HAT2, RO_BDL_RO_HAT3, RO_BDL_RO_HAT}; -static const int l_bck_ix_tbl[] = {RO_BCK_HAT_WID, RO_BCK_HAT2_WIND, RO_BCK_HAT3_WID, - RO_BCK_HAT_WID}; +static const int l_bmd_ix_tbl[] = {dRes_ID_RO_BDL_RO_HAT_e, dRes_ID_RO_BDL_RO_HAT2_e, dRes_ID_RO_BDL_RO_HAT3_e, dRes_ID_RO_BDL_RO_HAT_e}; +static const int l_bck_ix_tbl[] = {dRes_ID_RO_BCK_HAT_WID_e, dRes_ID_RO_BCK_HAT2_WIND_e, dRes_ID_RO_BCK_HAT3_WID_e, + dRes_ID_RO_BCK_HAT_WID_e}; static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { diff --git a/src/d/actor/d_a_obj_hbrf1.cpp b/src/d/actor/d_a_obj_hbrf1.cpp index 115c132a7..5979395bc 100644 --- a/src/d/actor/d_a_obj_hbrf1.cpp +++ b/src/d/actor/d_a_obj_hbrf1.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hbrf1.h" -#include "d/res/res_hbrf1.h" +#include "res/Object/Hbrf1.h" #include "d/d_com_inf_game.h" Mtx daObjHbrf1::Act_c::M_tmp_mtx; @@ -15,7 +15,7 @@ const char daObjHbrf1::Act_c::M_evname[] = "ami_cam"; /* 00000078-0000012C .text CreateHeap__Q210daObjHbrf15Act_cFv */ BOOL daObjHbrf1::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, HBRF1_BDL_HBRF1); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_HBRF1_BDL_HBRF1_e); JUT_ASSERT(0x5E, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); @@ -54,7 +54,7 @@ cPhs_State daObjHbrf1::Act_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, HBRF1_DZB_HBRF1, dBgS_MoveBGProc_Trans, 0); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_HBRF1_DZB_HBRF1_e, dBgS_MoveBGProc_Trans, 0); JUT_ASSERT(0x94, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index 26517bdd1..adb7e9979 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hfuck1.h" -#include "d/res/res_hfuck1.h" +#include "res/Object/Hfuck1.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_cc_d.h" @@ -85,14 +85,14 @@ BOOL daObjHfuck1_c::solidHeapCB(fopAc_ac_c* i_this) { bool daObjHfuck1_c::create_heap() { bool ret = true; - J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, HFUCK1_BDL_HFUCK1)); + J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_HFUCK1_BDL_HFUCK1_e)); if (!pModelData) { JUT_ASSERT(DEMO_SELECT(241, 245), FALSE); ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022); - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, HFUCK1_DZB_HFUCK1), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_HFUCK1_DZB_HFUCK1_e), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); if (!mpModel || !mpBgW) ret = false; diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index fdd3b36f4..8e3702c10 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -9,7 +9,7 @@ #include "d/d_bg_s_func.h" #include "d/d_bg_s_wtr_chk.h" #include "d/d_com_inf_game.h" -#include "d/res/res_hha.h" +#include "res/Object/Hha.h" #if VERSION == VERSION_DEMO static dCcD_SrcCyl l_daObjHha_cyl_data = @@ -77,9 +77,9 @@ const dCcD_SrcSph daObjHha_c::M_sph_data = { }; #endif -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 int l_daObjHha_bdl_idx_table[2] = {dRes_INDEX_HHA_BDL_HHA1_e, dRes_INDEX_HHA_BDL_HHA2_e}; +const int l_daObjHha_dzb_idx_table[2] = {dRes_INDEX_HHA_DZB_HHA1_e, dRes_INDEX_HHA_DZB_HHA2_e}; +const int l_daObjHha_btk_idx_table[2] = {dRes_INDEX_HHA_BTK_YSWTR00_01_e, dRes_INDEX_HHA_BTK_YSWTR00_02_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_AK_SN_SIRENSUIRYU00, @@ -192,7 +192,7 @@ void daObjHhaSplash_c::create_s(u16 particleID, cXyz* pPos, float offsetY, float BOOL daObjHhaYgush_c::create_area(const char* arcname) { BOOL ret = FALSE; - J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(arcname, HHA_BDL_YGSTP00)); + J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(arcname, dRes_INDEX_HHA_BDL_YGSTP00_e)); JUT_ASSERT(DEMO_SELECT(577, 640), mdl_data != NULL); if(mdl_data != NULL){ @@ -200,11 +200,11 @@ BOOL daObjHhaYgush_c::create_area(const char* arcname) { JUT_ASSERT(DEMO_SELECT(586, 649), M_mdl != NULL); if(M_mdl != NULL){ - J3DAnmTextureSRTKey* btk_data = static_cast(dComIfG_getObjectRes(arcname, HHA_BTK_YGSTP00)); + J3DAnmTextureSRTKey* btk_data = static_cast(dComIfG_getObjectRes(arcname, dRes_INDEX_HHA_BTK_YGSTP00_e)); JUT_ASSERT(DEMO_SELECT(593, 656), btk_data != NULL); if(mBtk.init(M_mdl->getModelData(), btk_data, true, J3DFrameCtrl::EMode_LOOP) != false){ - J3DAnmTransform* bck_data = static_cast(dComIfG_getObjectRes(arcname, HHA_BCK_YGSTP00)); + J3DAnmTransform* bck_data = static_cast(dComIfG_getObjectRes(arcname, dRes_INDEX_HHA_BCK_YGSTP00_e)); JUT_ASSERT(DEMO_SELECT(598, 661), bck_data != NULL); if(mBck.init(M_mdl->getModelData(), bck_data, true, J3DFrameCtrl::EMode_LOOP) != false){ @@ -277,7 +277,7 @@ BOOL daObjHha_c::create_heap() { } if(ret != FALSE){ - mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, HHA_BDL_YSWTR00)); + mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_HHA_BDL_YSWTR00_e)); JUT_ASSERT(DEMO_SELECT(741, 804), mdl_data != NULL); if(mdl_data != NULL){ mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000222); diff --git a/src/d/actor/d_a_obj_hlift.cpp b/src/d/actor/d_a_obj_hlift.cpp index 3afc2aa72..d7e7a488d 100644 --- a/src/d/actor/d_a_obj_hlift.cpp +++ b/src/d/actor/d_a_obj_hlift.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hlift.h" -#include "d/res/res_hlift.h" +#include "res/Object/Hlift.h" namespace daObjHlift { @@ -21,8 +21,8 @@ const char Act_c::M_arcname[] = "Hlift"; const char Act_c::M_evname[] = "Hlift_up"; const s16 Act_c::M_up_dist[] = { 125, 250, 375, 500, 625, 750, 875, 1000 }; const Act_c::size_data Act_c::M_data_size[2] = { - { HLIFT_BDL_HLIFT, HLIFT_DZB_HLIFT, DEMO_SELECT(0x8000, 0x1700) }, - { HLIFT_BDL_HLIFTB, HLIFT_DZB_HLIFTB, DEMO_SELECT(0x8000, 0x1700) } + { dRes_INDEX_HLIFT_BDL_HLIFT_e, dRes_INDEX_HLIFT_DZB_HLIFT_e, DEMO_SELECT(0x8000, 0x1700) }, + { dRes_INDEX_HLIFT_BDL_HLIFTB_e, dRes_INDEX_HLIFT_DZB_HLIFTB_e, DEMO_SELECT(0x8000, 0x1700) } }; } // namespace daObjHlift @@ -32,7 +32,7 @@ BOOL daObjHlift::Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, M_data_size[field_0x2DC].field_0x00); JUT_ASSERT(288, model_data != NULL); mModel1 = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000022); - J3DModelData* model_data_c = (J3DModelData*)dComIfG_getObjectRes(M_arcname, HLIFT_BDL_HLIFTC); + J3DModelData* model_data_c = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_HLIFT_BDL_HLIFTC_e); JUT_ASSERT(298, model_data_c != NULL); mModel2 = mDoExt_J3DModel__create(model_data_c, 0x80000, 0x11000022); return mModel1 != NULL && mModel2 != NULL; diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index 6d6be3c74..1480589a7 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hole.h" -#include "d/res/res_aana.h" +#include "res/Object/Aana.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_bg_s_acch.h" #include "d/d_com_inf_game.h" @@ -216,7 +216,7 @@ void daObj_Hole_c::createInit() { /* 00000864-00000928 .text _createHeap__12daObj_Hole_cFv */ BOOL daObj_Hole_c::_createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, AANA_BDL_AANA); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AANA_BDL_AANA_e); JUT_ASSERT(0x13D, modelData != NULL); diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp index 41a5877e4..82021c04b 100644 --- a/src/d/actor/d_a_obj_homen.cpp +++ b/src/d/actor/d_a_obj_homen.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_homen.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/res/res_homen.h" +#include "res/Object/Homen.h" #include "f_op/f_op_actor_mng.h" namespace daObjHomen { @@ -209,12 +209,12 @@ BOOL Act_c::solidHeapCB(fopAc_ac_c* i_this) { /* 00000110-000002B4 .text create_heap__Q210daObjHomen5Act_cFv */ bool Act_c::create_heap() { static int bdl_idx[] = { - HOMEN_BDL_HOMEN1, - HOMEN_BDL_HOMEN2, + dRes_INDEX_HOMEN_BDL_HOMEN1_e, + dRes_INDEX_HOMEN_BDL_HOMEN2_e, }; static int dzb_idx[] = { - HOMEN_DZB_HOMEN1, - HOMEN_DZB_HOMEN2, + dRes_INDEX_HOMEN_DZB_HOMEN1_e, + dRes_INDEX_HOMEN_DZB_HOMEN2_e, }; J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, bdl_idx[mType]); diff --git a/src/d/actor/d_a_obj_ice.cpp b/src/d/actor/d_a_obj_ice.cpp index 53ac68377..835cda425 100644 --- a/src/d/actor/d_a_obj_ice.cpp +++ b/src/d/actor/d_a_obj_ice.cpp @@ -8,7 +8,7 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" -#include "d/res/res_ikori.h" +#include "res/Object/Ikori.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_hostIO.h" @@ -139,7 +139,7 @@ BOOL daObjIce_c::solidHeapCB(fopAc_ac_c* a_this) { /* 000001EC-000002E4 .text create_heap__10daObjIce_cFv */ bool daObjIce_c::create_heap() { bool uVar5 = true; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcname, IKORI_BDL_VICE); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_IKORI_BDL_VICE_e); if (modelData == NULL) { JUT_ASSERT(DEMO_SELECT(392, 395), FALSE); @@ -147,7 +147,7 @@ bool daObjIce_c::create_heap() { } else { mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222); - cBgD_t* pcVar3 = (cBgD_t*)dComIfG_getObjectRes(l_arcname, IKORI_DZB_VICE); + cBgD_t* pcVar3 = (cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_IKORI_DZB_VICE_e); mBgw = dBgW_NewSet(pcVar3, cBgW::MOVE_BG_e, &m40C); if (mModel == NULL || mBgw == NULL) { diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index b85fc238e..bee962ff3 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/src/d/actor/d_a_obj_iceisland.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_iceisland.h" #include "d/d_com_inf_game.h" -#include "d/res/res_gicel.h" +#include "res/Object/GiceL.h" #include "JSystem/JKernel/JKRExpHeap.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ @@ -18,19 +18,19 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { BOOL daObjIceisland_c::CreateHeap() { mDoExt_getGameHeap()->check(); - J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("GiceL", GICEL_BDL_GICEL00)); + J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("GiceL", dRes_INDEX_GICEL_BDL_GICEL00_e)); JUT_ASSERT(0x66, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); - J3DAnmTextureSRTKey* btk1 = static_cast(dComIfG_getObjectRes("GiceL", GICEL_BTK_GICEL00_01)); + J3DAnmTextureSRTKey* btk1 = static_cast(dComIfG_getObjectRes("GiceL", dRes_INDEX_GICEL_BTK_GICEL00_01_e)); JUT_ASSERT(0x6D, btk1 != NULL); int result1 = mBtkAnm1.init(model_data, btk1, true, J3DFrameCtrl::EMode_LOOP); - J3DAnmTextureSRTKey* btk2 = static_cast(dComIfG_getObjectRes("GiceL", GICEL_BTK_GICEL00_02)); + J3DAnmTextureSRTKey* btk2 = static_cast(dComIfG_getObjectRes("GiceL", dRes_INDEX_GICEL_BTK_GICEL00_02_e)); JUT_ASSERT(0x73, btk2 != NULL); int result2 = mBtkAnm2.init(model_data, btk2, true, J3DFrameCtrl::EMode_LOOP); - J3DAnmTevRegKey * brk = static_cast(dComIfG_getObjectRes("GiceL", GICEL_BRK_GICEL00)); + J3DAnmTevRegKey * brk = static_cast(dComIfG_getObjectRes("GiceL", dRes_INDEX_GICEL_BRK_GICEL00_e)); JUT_ASSERT(0x7A, brk != NULL); int result3 = mBrkAnm.init(model_data, brk, true, J3DFrameCtrl::EMode_NONE); return((mpModel != NULL) && (result1 != 0) && (result2 != 0) && (result3 != 0)); diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 8311df8eb..84975e127 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -14,9 +14,9 @@ #include "d/d_lib.h" #include "d/d_s_play.h" #include "d/d_snap.h" -#include "d/res/res_always.h" -#include "d/res/res_ikadah.h" -#include "d/res/res_link.h" +#include "res/Object/Always.h" +#include "res/Object/IkadaH.h" +#include "res/Object/Link.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" @@ -1427,8 +1427,8 @@ void daObj_Ikada_c::createInit() { /* 00004838-00004B60 .text _createHeap__13daObj_Ikada_cFv */ BOOL daObj_Ikada_c::_createHeap() { - static const s32 bdl[] = {IKADAH_BDL_VIKAE, IKADAH_BDL_VTSP, IKADAH_BDL_VIKAH, IKADAH_BDL_VTSP2, IKADAH_BDL_VSVSP}; - static const s32 dzb[] = {IKADAH_DZB_VIKAE, IKADAH_DZB_VTSP, IKADAH_DZB_VIKAH, IKADAH_DZB_VTSP, IKADAH_DZB_VSVSP}; + static const s32 bdl[] = {dRes_INDEX_IKADAH_BDL_VIKAE_e, dRes_INDEX_IKADAH_BDL_VTSP_e, dRes_INDEX_IKADAH_BDL_VIKAH_e, dRes_INDEX_IKADAH_BDL_VTSP2_e, dRes_INDEX_IKADAH_BDL_VSVSP_e}; + static const s32 dzb[] = {dRes_INDEX_IKADAH_DZB_VIKAE_e, dRes_INDEX_IKADAH_DZB_VTSP_e, dRes_INDEX_IKADAH_DZB_VIKAH_e, dRes_INDEX_IKADAH_DZB_VTSP_e, dRes_INDEX_IKADAH_DZB_VSVSP_e}; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, bdl[mType]); JUT_ASSERT(2170, modelData != NULL); @@ -1439,7 +1439,7 @@ BOOL daObj_Ikada_c::_createHeap() { } if (mType == 4) { - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arc_name, IKADAH_BCK_SVSHIP_KAITEN); + J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_IKADAH_BCK_SVSHIP_KAITEN_e); JUT_ASSERT(2180, bck != NULL); if (!mBckAnm.init(modelData, bck, true, J3DFrameCtrl::EMode_LOOP)) { @@ -1474,7 +1474,7 @@ BOOL daObj_Ikada_c::_createHeap() { } if (mType == 4) { - ResTIMG* pImg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE); + ResTIMG* pImg = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e); if (!mRopeLine.init(1, 200, pImg, 0)) { return FALSE; } @@ -1482,7 +1482,7 @@ BOOL daObj_Ikada_c::_createHeap() { #if VERSION > VERSION_DEMO J3DModelData* #endif - modelData = (J3DModelData*)dComIfG_getObjectRes("Link", LINK_BDL_ROPEEND); + modelData = (J3DModelData*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_ROPEEND_e); JUT_ASSERT(2228, modelData != NULL); mpRopeEnd = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); diff --git a/src/d/actor/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp index 19b48b10a..fc7d5d183 100644 --- a/src/d/actor/d_a_obj_jump.cpp +++ b/src/d/actor/d_a_obj_jump.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_jump.h" #include "d/actor/d_a_player.h" -#include "d/res/res_hjump.h" +#include "res/Object/Hjump.h" namespace daObjJump { @@ -15,8 +15,8 @@ const char Act_c::M_arcname[] = "Hjump"; const Attr_c Act_c::M_attr[2] = { { // Type_SPRING_e /* heapSize */ DEMO_SELECT(0x8000, 0x840), - /* dzbResIndex */ HJUMP_DZB_HJUMP2, - /* bdlResIndex */ HJUMP_BDL_HJUMP2, + /* dzbResIndex */ dRes_INDEX_HJUMP_DZB_HJUMP2_e, + /* bdlResIndex */ dRes_INDEX_HJUMP_BDL_HJUMP2_e, /* cullSizeBoxMin */ { -60, -1, -60 }, /* cullSizeBoxMax */ { 60, VERSION_SELECT(151, 151, 251, 251), 60 }, /* hasShadow */ true, @@ -44,8 +44,8 @@ const Attr_c Act_c::M_attr[2] = { }, { // Type_SPRING_ON_BOX_e /* heapSize */ DEMO_SELECT(0x8000, 0x840), - /* dzbResIndex */ HJUMP_DZB_HJUMP1B, - /* bdlResIndex */ HJUMP_BDL_HJUMP1, + /* dzbResIndex */ dRes_INDEX_HJUMP_DZB_HJUMP1B_e, + /* bdlResIndex */ dRes_INDEX_HJUMP_BDL_HJUMP1_e, /* cullSizeBoxMin */ { -90, -1, -90 }, /* cullSizeBoxMax */ { 90, VERSION_SELECT(301, 301, 401, 401), 90 }, /* hasShadow */ false, diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index 49575d445..0deb4b5f3 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/src/d/actor/d_a_obj_kanat.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kanat.h" -#include "d/res/res_kanat.h" +#include "res/Object/Kanat.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -14,7 +14,7 @@ const char daObjKanat::Act_c::M_arcname[] = "Kanat"; /* 00000078-0000012C .text CreateHeap__Q210daObjKanat5Act_cFv */ BOOL daObjKanat::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KANAT_BDL_KANAT); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KANAT_BDL_KANAT_e); JUT_ASSERT(79, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); return !!mpModel; @@ -41,7 +41,7 @@ cPhs_State daObjKanat::Act_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, KANAT_DZB_KANAT, NULL, 0x6440); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_KANAT_DZB_KANAT_e, NULL, 0x6440); JUT_ASSERT(126, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index cab25b6b7..7e92c06cf 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ladder.h" -#include "d/res/res_mhsg.h" +#include "res/Object/Mhsg.h" #include "d/d_com_inf_game.h" Mtx daObjLadder::Act_c::M_tmp_mtx; @@ -45,11 +45,11 @@ namespace daObjLadder { }; static AttrType L_attr_type[] = { - {MHSG_BDL_MHSG6, MHSG_DZB_MHSG6, 600.0f}, - {MHSG_BDL_MHSG9, MHSG_DZB_MHSG9, 900.0f}, - {MHSG_BDL_MHSG12, MHSG_DZB_MHSG12, 1200.0f}, - {MHSG_BDL_MHSG15, MHSG_DZB_MHSG15, 1500.0f}, - {MHSG_BDL_MHSG4H, MHSG_DZB_MHSG4H, 450.0f}, + {dRes_INDEX_MHSG_BDL_MHSG6_e, dRes_INDEX_MHSG_DZB_MHSG6_e, 600.0f}, + {dRes_INDEX_MHSG_BDL_MHSG9_e, dRes_INDEX_MHSG_DZB_MHSG9_e, 900.0f}, + {dRes_INDEX_MHSG_BDL_MHSG12_e, dRes_INDEX_MHSG_DZB_MHSG12_e, 1200.0f}, + {dRes_INDEX_MHSG_BDL_MHSG15_e, dRes_INDEX_MHSG_DZB_MHSG15_e, 1500.0f}, + {dRes_INDEX_MHSG_BDL_MHSG4H_e, dRes_INDEX_MHSG_DZB_MHSG4H_e, 450.0f}, }; inline const AttrType& attr_type(Type_e type) { return L_attr_type[type]; } diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp index ddfdbe29e..f3926172d 100644 --- a/src/d/actor/d_a_obj_leaves.cpp +++ b/src/d/actor/d_a_obj_leaves.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_leaves.h" #include "d/actor/d_a_player.h" -#include "d/res/res_vochi.h" +#include "res/Object/Vochi.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" @@ -282,13 +282,13 @@ BOOL daObjLeaves_c::solidHeapCB(fopAc_ac_c* a_this) { /* 00000384-00000494 .text create_heap__13daObjLeaves_cFv */ bool daObjLeaves_c::create_heap() { bool uVar5 = true; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcname, VOCHI_BDL_VOCHI); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_VOCHI_BDL_VOCHI_e); if (modelData == NULL) { JUT_ASSERT(VERSION_SELECT(550, 544, 548, 548), FALSE); uVar5 = false; } else { mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x31000202); - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, VOCHI_DZB_VOCHI), cBgW::MOVE_BG_e, &mModel->getBaseTRMtx()); + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_VOCHI_DZB_VOCHI_e), cBgW::MOVE_BG_e, &mModel->getBaseTRMtx()); if (mModel == NULL || mpBgW == NULL) { uVar5 = false; } else { diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp index a20f239a7..1f3f0338e 100644 --- a/src/d/actor/d_a_obj_lpalm.cpp +++ b/src/d/actor/d_a_obj_lpalm.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lpalm.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" -#include "d/res/res_oyashi.h" +#include "res/Object/Oyashi.h" #include "m_Do/m_Do_ext.h" const char daObjLpalm_c::M_arcname[7] = "Oyashi"; @@ -40,7 +40,7 @@ static BOOL nodeCallBack(J3DNode* joint, int calcTiming) { /* 00000164-00000268 .text CreateHeap__12daObjLpalm_cFv */ BOOL daObjLpalm_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, OYASHI_BDL_OYASHI); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_OYASHI_BDL_OYASHI_e); for (u16 i = 0; i < modelData->getJointNum(); i++) modelData->getJointNodePointer(i)->setCallBack(nodeCallBack); if (modelData == NULL) @@ -51,7 +51,7 @@ BOOL daObjLpalm_c::CreateHeap() { return false; mModel->setUserArea((u32)this); - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, OYASHI_DZB_OYASHI), dBgW::MOVE_BG_e, &mModel->getBaseTRMtx()); + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_OYASHI_DZB_OYASHI_e), dBgW::MOVE_BG_e, &mModel->getBaseTRMtx()); if (mpBgW == NULL) return false; diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp index b7e34f5c1..9c504f690 100644 --- a/src/d/actor/d_a_obj_mkie.cpp +++ b/src/d/actor/d_a_obj_mkie.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mkie.h" -#include "d/res/res_mkieb.h" +#include "res/Object/MkieB.h" Mtx daObjMkie::Act_c::M_tmp_mtx; const char daObjMkie::Act_c::M_arcname[] = "MkieB"; @@ -123,15 +123,15 @@ const daObjMkie::Act_c::Attr_c daObjMkie::Act_c::M_attr[2] = { /* 00000078-00000250 .text CreateHeap__Q29daObjMkie5Act_cFv */ BOOL daObjMkie::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKIEB_BDL_MKIEB); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKIEB_BDL_MKIEB_e); JUT_ASSERT(DEMO_SELECT(395, 402), model_data != NULL); mModelBase = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000022); - J3DModelData* model_data_van = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKIEB_BDL_YLSMF00); + J3DModelData* model_data_van = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKIEB_BDL_YLSMF00_e); JUT_ASSERT(DEMO_SELECT(404, 411), model_data_van != NULL); mModelVan = mDoExt_J3DModel__create(model_data_van, 0x80000, 0x11000022); - J3DAnmTevRegKey* brk_van = (J3DAnmTevRegKey*)dComIfG_getObjectRes(M_arcname, MKIEB_BRK_YLSMF00); + J3DAnmTevRegKey* brk_van = (J3DAnmTevRegKey*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKIEB_BRK_YLSMF00_e); JUT_ASSERT(DEMO_SELECT(414, 421), brk_van != NULL); int init = mBrkVan.init(model_data_van, brk_van, true, J3DFrameCtrl::EMode_NONE); @@ -210,7 +210,7 @@ cPhs_State daObjMkie::Act_c::Mthd_Create() { mType = prm_get_type(); float initialScale = attr().mScale; scale.setall(initialScale); - phase_state = MoveBGCreate(M_arcname, MKIEB_DZB_MKIEB, dBgS_MoveBGProc_Trans, DEMO_SELECT(0x10000, 0x1B20)); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_MKIEB_DZB_MKIEB_e, dBgS_MoveBGProc_Trans, DEMO_SELECT(0x10000, 0x1B20)); JUT_ASSERT(DEMO_SELECT(521, 534), (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp index e6b7bb3a1..c55f818ce 100644 --- a/src/d/actor/d_a_obj_mkiek.cpp +++ b/src/d/actor/d_a_obj_mkiek.cpp @@ -9,7 +9,7 @@ #include "d/d_a_obj.h" #include "d/d_particle_name.h" #include "d/d_cc_d.h" -#include "d/res/res_mkiek.h" +#include "res/Object/MkieK.h" #include "f_op/f_op_actor_mng.h" static dCcD_SrcSph sph_check_src = { @@ -48,15 +48,15 @@ Mtx daObjMkiek::Act_c::M_tmp_mtx; /* 00000078-00000240 .text CreateHeap__Q210daObjMkiek5Act_cFv */ BOOL daObjMkiek::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKIEK_BDL_MKIEK); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKIEK_BDL_MKIEK_e); JUT_ASSERT(0x96, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); - J3DModelData* model_data_v = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKIEK_BDL_YLSMK00); + J3DModelData* model_data_v = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKIEK_BDL_YLSMK00_e); JUT_ASSERT(0x9C, model_data_v != NULL); mpModelV = mDoExt_J3DModel__create(model_data_v, 0, 0x11020203); - J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(M_arcname, MKIEK_BRK_YLSMK00); + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKIEK_BRK_YLSMK00_e); JUT_ASSERT(0xA2, brk != NULL); int result = mBrkAnm.init(model_data_v, brk, true, J3DFrameCtrl::EMode_NONE); @@ -93,7 +93,7 @@ cPhs_State daObjMkiek::Act_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, MKIEK_DZB_MKIEK, NULL, 0x1220); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_MKIEK_DZB_MKIEK_e, NULL, 0x1220); JUT_ASSERT(0xD9, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)) } return phase_state; diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 92766f278..7b0240402 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mknjd.h" #include "d/d_s_play.h" // IWYU pragma: keep -#include "d/res/res_mknjd.h" +#include "res/Object/MknjD.h" #include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_manager.h" #include "f_op/f_op_msg.h" @@ -167,13 +167,13 @@ s16 daObjMknjD::Act_c::XyEventCB(int) { BOOL daObjMknjD::Act_c::CreateHeap() { J3DModelData* model_data_d; if (m043E == true) { - model_data_d = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJK); + model_data_d = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKNJD_BDL_MKNJK_e); } else { - model_data_d = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJD); + model_data_d = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKNJD_BDL_MKNJD_e); } - J3DModelData* model_data_h = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJH); + J3DModelData* model_data_h = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKNJD_BDL_MKNJH_e); JUT_ASSERT(0x123, model_data_d != NULL) JUT_ASSERT(0x124, model_data_h != NULL) @@ -309,7 +309,7 @@ cPhs_State daObjMknjD::Act_c::Mthd_Create() { else { phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, MKNJD_DZB_MKNJD, NULL, 0x65A0); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_MKNJD_DZB_MKNJD_e, NULL, 0x65A0); JUT_ASSERT(0x1CA, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)) } diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp index e763ad063..421de9d07 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/src/d/actor/d_a_obj_monument.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_monument.h" -#include "d/res/res_esekh.h" +#include "res/Object/Esekh.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -16,8 +16,8 @@ namespace daObjMonument { namespace { static Attr_c L_attr[] = { - { ESEKH_BDL_ESEKH, ESEKH_DZB_ESEKH }, - { ESEKH_BDL_ESEKH2, ESEKH_DZB_ESEKH2 }, + { dRes_INDEX_ESEKH_BDL_ESEKH_e, dRes_INDEX_ESEKH_DZB_ESEKH_e }, + { dRes_INDEX_ESEKH_BDL_ESEKH2_e, dRes_INDEX_ESEKH_DZB_ESEKH2_e }, }; inline const Attr_c & attr(Type_e type) { return L_attr[type]; } diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 10e7761ab..eac8b143a 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -5,13 +5,13 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_movebox.h" -#include "d/res/res_ecube.h" -#include "d/res/res_hbox2.h" -#include "d/res/res_hjump.h" -#include "d/res/res_kkiba_00.h" -#include "d/res/res_mmirror.h" -#include "d/res/res_mpwrb.h" -#include "d/res/res_osiblk.h" +#include "res/Object/Ecube.h" +#include "res/Object/Hbox2.h" +#include "res/Object/Hjump.h" +#include "res/Object/Kkiba_00.h" +#include "res/Object/Mmirror.h" +#include "res/Object/MpwrB.h" +#include "res/Object/Osiblk.h" #include "d/d_path.h" #include "d/d_cc_d.h" #include "JSystem/JUtility/JUTAssert.h" @@ -365,8 +365,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ KKIBA_00_BDL_KKIBA_00, - /* mDZBFileIndex */ KKIBA_00_DZB_KKIBA_00, + /* mModelFileIndex */ dRes_INDEX_KKIBA_00_BDL_KKIBA_00_e, + /* mDZBFileIndex */ dRes_INDEX_KKIBA_00_DZB_KKIBA_00_e, /* mDZBHeapSize */ DEMO_SELECT(0x1620, 0x8A0), /* mScaleY */ 150.0f, /* m68 */ 150.0f, @@ -416,8 +416,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ OSIBLK_BDL_OBM_OSIHIKIBLK1, - /* mDZBFileIndex */ OSIBLK_DZB_OBM_OSIHIKIBLK1, + /* mModelFileIndex */ dRes_INDEX_OSIBLK_BDL_OBM_OSIHIKIBLK1_e, + /* mDZBFileIndex */ dRes_INDEX_OSIBLK_DZB_OBM_OSIHIKIBLK1_e, /* mDZBHeapSize */ DEMO_SELECT(0x1620, 0x8A0), /* mScaleY */ 150.0f, /* m68 */ 150.0f, @@ -468,8 +468,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ OSIBLK_BDL_OBM_OSIHIKIBLK2, - /* mDZBFileIndex */ OSIBLK_DZB_OBM_OSIHIKIBLK2, + /* mModelFileIndex */ dRes_INDEX_OSIBLK_BDL_OBM_OSIHIKIBLK2_e, + /* mDZBFileIndex */ dRes_INDEX_OSIBLK_DZB_OBM_OSIHIKIBLK2_e, /* mDZBHeapSize */ DEMO_SELECT(0x8000, 0x1560), /* mScaleY */ 150.0f, /* m68 */ 300.0f, @@ -519,8 +519,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ MPWRB_BDL_MPWRB, - /* mDZBFileIndex */ MPWRB_DZB_MPWRB, + /* mModelFileIndex */ dRes_INDEX_MPWRB_BDL_MPWRB_e, + /* mDZBFileIndex */ dRes_INDEX_MPWRB_DZB_MPWRB_e, /* mDZBHeapSize */ DEMO_SELECT(0x8000, 0x8A0), /* mScaleY */ 300.0f, /* m68 */ 300.0f, @@ -570,8 +570,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ KKIBA_00_BDL_KKIBA_00, - /* mDZBFileIndex */ KKIBA_00_DZB_KKIBA_00, + /* mModelFileIndex */ dRes_INDEX_KKIBA_00_BDL_KKIBA_00_e, + /* mDZBFileIndex */ dRes_INDEX_KKIBA_00_DZB_KKIBA_00_e, /* mDZBHeapSize */ 0x1620, /* mScaleY */ 150.0f, /* m68 */ 150.0f, @@ -621,8 +621,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ HBOX2_BDL_HBOX2, - /* mDZBFileIndex */ HBOX2_DZB_HBOX2, + /* mModelFileIndex */ dRes_INDEX_HBOX2_BDL_HBOX2_e, + /* mDZBFileIndex */ dRes_INDEX_HBOX2_DZB_HBOX2_e, /* mDZBHeapSize */ DEMO_SELECT(0x8000, 0x8A0), /* mScaleY */ 150.0f, /* m68 */ 150.0f, @@ -672,8 +672,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ HJUMP_BDL_HBOX1, - /* mDZBFileIndex */ HJUMP_DZB_HBOX1, + /* mModelFileIndex */ dRes_INDEX_HJUMP_BDL_HBOX1_e, + /* mDZBFileIndex */ dRes_INDEX_HJUMP_DZB_HBOX1_e, /* mDZBHeapSize */ DEMO_SELECT(0x8000, 0x7E0), /* mScaleY */ 150.0f, /* m68 */ 150.0f, @@ -724,7 +724,7 @@ namespace daObjMovebox { /* m50 */ 0.06f, /* m54 */ 0.075f, /* mModelFileIndex */ -1, - /* mDZBFileIndex */ HJUMP_DZB_HJUMP1A, + /* mDZBFileIndex */ dRes_INDEX_HJUMP_DZB_HJUMP1A_e, /* mDZBHeapSize */ DEMO_SELECT(0x8000, 0x320), /* mScaleY */ 150.0f, /* m68 */ 300.0f, @@ -774,8 +774,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ KKIBA_00_BDL_KKIBA_00, - /* mDZBFileIndex */ KKIBA_00_DZB_KKIBA_00, + /* mModelFileIndex */ dRes_INDEX_KKIBA_00_BDL_KKIBA_00_e, + /* mDZBFileIndex */ dRes_INDEX_KKIBA_00_DZB_KKIBA_00_e, /* mDZBHeapSize */ 0x1620, /* mScaleY */ 150.0f, /* m68 */ 150.0f, @@ -825,8 +825,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ KKIBA_00_BDL_KKIBA_00, - /* mDZBFileIndex */ KKIBA_00_DZB_KKIBA_00, + /* mModelFileIndex */ dRes_INDEX_KKIBA_00_BDL_KKIBA_00_e, + /* mDZBFileIndex */ dRes_INDEX_KKIBA_00_DZB_KKIBA_00_e, /* mDZBHeapSize */ 0x1620, /* mScaleY */ 150.0f, /* m68 */ 150.0f, @@ -877,7 +877,7 @@ namespace daObjMovebox { /* m50 */ 0.06f, /* m54 */ 0.075f, /* mModelFileIndex */ -1, - /* mDZBFileIndex */ MMIRROR_DZB_MMRR, + /* mDZBFileIndex */ dRes_INDEX_MMIRROR_DZB_MMRR_e, /* mDZBHeapSize */ DEMO_SELECT(0x8000, 0xD40), /* mScaleY */ 300.0f, /* m68 */ 450.0f, @@ -927,8 +927,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ OSIBLK_BDL_OBM_OSIHIKIBLK1, - /* mDZBFileIndex */ OSIBLK_DZB_OBM_OSIHIKIBLK1, + /* mModelFileIndex */ dRes_INDEX_OSIBLK_BDL_OBM_OSIHIKIBLK1_e, + /* mDZBFileIndex */ dRes_INDEX_OSIBLK_DZB_OBM_OSIHIKIBLK1_e, /* mDZBHeapSize */ DEMO_SELECT(0x1620, 0x8A0), /* mScaleY */ 150.0f, /* m68 */ 350.0f, @@ -978,8 +978,8 @@ namespace daObjMovebox { /* m4C */ 0.1f, /* m50 */ 0.06f, /* m54 */ 0.075f, - /* mModelFileIndex */ ECUBE_BDL_ECUBE, - /* mDZBFileIndex */ ECUBE_DZB_ECUBE, + /* mModelFileIndex */ dRes_INDEX_ECUBE_BDL_ECUBE_e, + /* mDZBFileIndex */ dRes_INDEX_ECUBE_DZB_ECUBE_e, /* mDZBHeapSize */ DEMO_SELECT(0x8000, 0x8A0), /* mScaleY */ 150.0f, /* m68 */ 150.0f, diff --git a/src/d/actor/d_a_obj_msdan_sub.cpp b/src/d/actor/d_a_obj_msdan_sub.cpp index 3f94a144f..77b611ace 100644 --- a/src/d/actor/d_a_obj_msdan_sub.cpp +++ b/src/d/actor/d_a_obj_msdan_sub.cpp @@ -5,14 +5,14 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan_sub.h" -#include "d/res/res_msdan.h" +#include "res/Object/Msdan.h" const char daObjMsdanSub::Act_c::M_arcname[] = "Msdan"; Mtx daObjMsdanSub::Act_c::M_tmp_mtx; /* 00000078-0000012C .text CreateHeap__Q213daObjMsdanSub5Act_cFv */ BOOL daObjMsdanSub::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MSDAN_BDL_MSDAN); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MSDAN_BDL_MSDAN_e); JUT_ASSERT(93, model_data != NULL); mModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); return mModel != NULL; @@ -53,7 +53,7 @@ cPhs_State daObjMsdanSub::Act_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, MSDAN_DZB_MSDAN, dBgS_MoveBGProc_Trans, 0x9A0); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_MSDAN_DZB_MSDAN_e, dBgS_MoveBGProc_Trans, 0x9A0); JUT_ASSERT(155, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; diff --git a/src/d/actor/d_a_obj_mshokki.cpp b/src/d/actor/d_a_obj_mshokki.cpp index 38ceeabeb..73980d1e2 100644 --- a/src/d/actor/d_a_obj_mshokki.cpp +++ b/src/d/actor/d_a_obj_mshokki.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mshokki.h" -#include "d/res/res_mshokki.h" +#include "res/Object/Mshokki.h" #include "d/d_kankyo.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -141,7 +141,7 @@ BOOL daObjMshokki_c::solidHeapCB(fopAc_ac_c* a_this) { /* 0000012C-000001FC .text create_heap__14daObjMshokki_cFv */ bool daObjMshokki_c::create_heap() { - static s32 bdl_idx[] = {MSHOKKI_BDL_POT, MSHOKKI_BDL_OSARA, MSHOKKI_BDL_KOPPU}; + static s32 bdl_idx[] = {dRes_INDEX_MSHOKKI_BDL_POT_e, dRes_INDEX_MSHOKKI_BDL_OSARA_e, dRes_INDEX_MSHOKKI_BDL_KOPPU_e}; bool uVar3 = true; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcname, bdl_idx[m60C]); diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index f3ba5ede1..0e2d507cf 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -5,9 +5,9 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mtest.h" -#include "d/res/res_mtest.h" -#include "d/res/res_owater.h" -#include "d/res/res_astop.h" +#include "res/Object/Mtest.h" +#include "res/Object/Owater.h" +#include "res/Object/Astop.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -80,10 +80,10 @@ bool daObjMtest::Act_c::chk_appear() { /* 00000198-00000284 .text CreateHeap__Q210daObjMtest5Act_cFv */ BOOL daObjMtest::Act_c::CreateHeap() { static s16 bmd_data[Type_Max] = { - MTEST_BMD_MCUBE, - MTEST_BMD_MCYLN, - MTEST_BMD_MCUBE, - MTEST_BMD_MCYLN, + dRes_INDEX_MTEST_BMD_MCUBE_e, + dRes_INDEX_MTEST_BMD_MCYLN_e, + dRes_INDEX_MTEST_BMD_MCUBE_e, + dRes_INDEX_MTEST_BMD_MCYLN_e, -1, -1, -1, @@ -136,54 +136,54 @@ BOOL daObjMtest::Act_c::Create() { cPhs_State daObjMtest::Act_c::Mthd_Create() { static s16 dzb_data[5][Type_Max] = { { - MTEST_DZB_MCUBE, - MTEST_DZB_MCYLN, - MTEST_DZB_MCUBE, - MTEST_DZB_MCYLN, - MTEST_DZB_MWTRSB, - MTEST_DZB_MYGNSB, - OWATER_DZB_OWATER, - ASTOP_DZB_ASLOW, + dRes_INDEX_MTEST_DZB_MCUBE_e, + dRes_INDEX_MTEST_DZB_MCYLN_e, + dRes_INDEX_MTEST_DZB_MCUBE_e, + dRes_INDEX_MTEST_DZB_MCYLN_e, + dRes_INDEX_MTEST_DZB_MWTRSB_e, + dRes_INDEX_MTEST_DZB_MYGNSB_e, + dRes_INDEX_OWATER_DZB_OWATER_e, + dRes_INDEX_ASTOP_DZB_ASLOW_e, }, { - MTEST_DZB_MCUBEHG, - MTEST_DZB_MCYLNHG, - MTEST_DZB_MCUBEHG, - MTEST_DZB_MCYLNHG, - MTEST_DZB_MWTRSB, - MTEST_DZB_MYGNSB, - OWATER_DZB_OWATER, - ASTOP_DZB_ASLOW00, + dRes_INDEX_MTEST_DZB_MCUBEHG_e, + dRes_INDEX_MTEST_DZB_MCYLNHG_e, + dRes_INDEX_MTEST_DZB_MCUBEHG_e, + dRes_INDEX_MTEST_DZB_MCYLNHG_e, + dRes_INDEX_MTEST_DZB_MWTRSB_e, + dRes_INDEX_MTEST_DZB_MYGNSB_e, + dRes_INDEX_OWATER_DZB_OWATER_e, + dRes_INDEX_ASTOP_DZB_ASLOW00_e, }, { - MTEST_DZB_MCUBENC, - MTEST_DZB_MCYLNNC, - MTEST_DZB_MCUBENC, - MTEST_DZB_MCYLNNC, - MTEST_DZB_MWTRSB, - MTEST_DZB_MYGNSB, - OWATER_DZB_OWATER, - ASTOP_DZB_ASTOP, + dRes_INDEX_MTEST_DZB_MCUBENC_e, + dRes_INDEX_MTEST_DZB_MCYLNNC_e, + dRes_INDEX_MTEST_DZB_MCUBENC_e, + dRes_INDEX_MTEST_DZB_MCYLNNC_e, + dRes_INDEX_MTEST_DZB_MWTRSB_e, + dRes_INDEX_MTEST_DZB_MYGNSB_e, + dRes_INDEX_OWATER_DZB_OWATER_e, + dRes_INDEX_ASTOP_DZB_ASTOP_e, }, { - MTEST_DZB_MCUBELK, - MTEST_DZB_MCYLN, - MTEST_DZB_MCUBELK, - MTEST_DZB_MCYLN, - MTEST_DZB_MWTRSB, - MTEST_DZB_MYGNSB, - OWATER_DZB_OWATER, - ASTOP_DZB_ASTOP00, + dRes_INDEX_MTEST_DZB_MCUBELK_e, + dRes_INDEX_MTEST_DZB_MCYLN_e, + dRes_INDEX_MTEST_DZB_MCUBELK_e, + dRes_INDEX_MTEST_DZB_MCYLN_e, + dRes_INDEX_MTEST_DZB_MWTRSB_e, + dRes_INDEX_MTEST_DZB_MYGNSB_e, + dRes_INDEX_OWATER_DZB_OWATER_e, + dRes_INDEX_ASTOP_DZB_ASTOP00_e, }, { - MTEST_DZB_MCUBE, - MTEST_DZB_MCYLN, - MTEST_DZB_MCUBE, - MTEST_DZB_MCYLN, - MTEST_DZB_MWTRSB, - MTEST_DZB_MYGNSB, - OWATER_DZB_OWATER, - ASTOP_DZB_A00, + dRes_INDEX_MTEST_DZB_MCUBE_e, + dRes_INDEX_MTEST_DZB_MCYLN_e, + dRes_INDEX_MTEST_DZB_MCUBE_e, + dRes_INDEX_MTEST_DZB_MCYLN_e, + dRes_INDEX_MTEST_DZB_MWTRSB_e, + dRes_INDEX_MTEST_DZB_MYGNSB_e, + dRes_INDEX_OWATER_DZB_OWATER_e, + dRes_INDEX_ASTOP_DZB_A00_e, }, }; static u32 heap_size[5][Type_Max] = { diff --git a/src/d/actor/d_a_obj_nest.cpp b/src/d/actor/d_a_obj_nest.cpp index 50f5524fa..9c10ba733 100644 --- a/src/d/actor/d_a_obj_nest.cpp +++ b/src/d/actor/d_a_obj_nest.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_nest.h" -#include "d/res/res_mtorisu.h" +#include "res/Object/MtoriSU.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" namespace daObjNest{ @@ -51,7 +51,7 @@ const char daObjNest::Act_c::M_arcname[] = "MtoriSU"; /* 00000078-0000012C .text CreateHeap__Q29daObjNest5Act_cFv */ BOOL daObjNest::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MTORISU_BDL_MTORISU); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MTORISU_BDL_MTORISU_e); JUT_ASSERT(281, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0x80000,0x11000022); return mpModel != NULL; @@ -77,7 +77,7 @@ cPhs_State daObjNest::Act_c::Mthd_Create() { if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate( M_arcname, - MTORISU_DZB_MTORISU, + dRes_INDEX_MTORISU_DZB_MTORISU_e, NULL, DEMO_SELECT(0x1820, 0xAA0) ); diff --git a/src/d/actor/d_a_obj_ohatch.cpp b/src/d/actor/d_a_obj_ohatch.cpp index fd529a686..986e46da1 100644 --- a/src/d/actor/d_a_obj_ohatch.cpp +++ b/src/d/actor/d_a_obj_ohatch.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ohatch.h" -#include "d/res/res_ohatch.h" +#include "res/Object/Ohatch.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -111,14 +111,14 @@ BOOL daObjOhatch_c::solidHeapCB(fopAc_ac_c* a_this) { /* 000002A0-000003CC .text create_heap__13daObjOhatch_cFv */ bool daObjOhatch_c::create_heap() { bool uVar5 = true; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcname, OHATCH_BDL_OHATCH); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_OHATCH_BDL_OHATCH_e); if (modelData == NULL) { JUT_ASSERT(DEMO_SELECT(308, 311), FALSE); uVar5 = false; } else { mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); - mBgW1 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, OHATCH_DZB_OH_CLS), cBgW::MOVE_BG_e, &m2A8); - mBgW2 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, OHATCH_DZB_OH_OPN), cBgW::MOVE_BG_e, &m2A8); + mBgW1 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_OHATCH_DZB_OH_CLS_e), cBgW::MOVE_BG_e, &m2A8); + mBgW2 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, dRes_INDEX_OHATCH_DZB_OH_OPN_e), cBgW::MOVE_BG_e, &m2A8); if (mModel == NULL || mBgW1 == NULL || mBgW2 == NULL) { uVar5 = false; } diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp index 44f99d9dc..72bd1989a 100644 --- a/src/d/actor/d_a_obj_ojtree.cpp +++ b/src/d/actor/d_a_obj_ojtree.cpp @@ -4,7 +4,7 @@ */ #include "d/dolzel_rel.h" // IWYU pragma: keep -#include "d/res/res_ojtree.h" +#include "res/Object/Ojtree.h" #include "d/actor/d_a_jbo.h" #include "d/actor/d_a_obj_ojtree.h" #include "d/d_com_inf_game.h" @@ -15,7 +15,7 @@ const char daObjOjtree::Act_c::M_arcname[] = "Ojtree"; /* 00000078-0000012C .text CreateHeap__Q211daObjOjtree5Act_cFv */ BOOL daObjOjtree::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, OJTREE_BDL_OJTREE); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_OJTREE_BDL_OJTREE_e); JUT_ASSERT(67, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000022); return !!mpModel; @@ -41,7 +41,7 @@ cPhs_State daObjOjtree::Act_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, OJTREE_DZB_OJTREE, NULL, DEMO_SELECT(0x34A0, 0x26A0)); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_OJTREE_DZB_OJTREE_e, NULL, DEMO_SELECT(0x34A0, 0x26A0)); JUT_ASSERT(123, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } diff --git a/src/d/actor/d_a_obj_ospbox.cpp b/src/d/actor/d_a_obj_ospbox.cpp index 895f9a179..4b9f35657 100644 --- a/src/d/actor/d_a_obj_ospbox.cpp +++ b/src/d/actor/d_a_obj_ospbox.cpp @@ -8,7 +8,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_particle_name.h" -#include "d/res/res_ospbox.h" +#include "res/Object/Ospbox.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "m_Do/m_Do_mtx.h" @@ -46,7 +46,7 @@ const dCcD_SrcCyl daObjOspbox::Act_c::M_cyl_src = { /* 000000EC-000001A0 .text CreateHeap__Q211daObjOspbox5Act_cFv */ BOOL daObjOspbox::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, OSPBOX_BDL_OSPBOX); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_OSPBOX_BDL_OSPBOX_e); JUT_ASSERT(0x86, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data,0x80000,0x11000022); return mpModel != NULL; @@ -86,7 +86,7 @@ cPhs_State daObjOspbox::Act_c::Mthd_Create() { #else const u32 heapSize = 0x8A0; #endif - phase_state = MoveBGCreate(M_arcname, OSPBOX_DZB_OSPBOX, NULL, heapSize); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_OSPBOX_DZB_OSPBOX_e, NULL, heapSize); JUT_ASSERT(0xc3, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; diff --git a/src/d/actor/d_a_obj_otble.cpp b/src/d/actor/d_a_obj_otble.cpp index 660e580ca..cacda86cf 100644 --- a/src/d/actor/d_a_obj_otble.cpp +++ b/src/d/actor/d_a_obj_otble.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_otble.h" -#include "d/res/res_okmono.h" +#include "res/Object/Okmono.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -65,8 +65,8 @@ BOOL daObj_Otble::Act_c::_draw() { /* 000002E8-00000470 .text _createHeap__Q211daObj_Otble5Act_cFv */ BOOL daObj_Otble::Act_c::_createHeap() { - static const s32 bdl[] = {OKMONO_BDL_OTABLE, OKMONO_BDL_OTABLEL}; - static const s32 dzb[] = {OKMONO_DZB_OTBLE, OKMONO_DZB_OTBLE_L}; + static const s32 bdl[] = {dRes_INDEX_OKMONO_BDL_OTABLE_e, dRes_INDEX_OKMONO_BDL_OTABLEL_e}; + static const s32 dzb[] = {dRes_INDEX_OKMONO_DZB_OTBLE_e, dRes_INDEX_OKMONO_DZB_OTBLE_L_e}; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Okmono", bdl[m294]); JUT_ASSERT(191, modelData != NULL); diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index 0e49f5a9d..80fb15ec9 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -5,9 +5,9 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_paper.h" -#include "d/res/res_opaper.h" -#include "d/res/res_ppos.h" -#include "d/res/res_piwa.h" +#include "res/Object/Opaper.h" +#include "res/Object/Ppos.h" +#include "res/Object/Piwa.h" #include "JSystem/JUtility/JUTAssert.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" @@ -41,7 +41,7 @@ namespace daObjPaper { { /* mResName */ "Opaper", /* mHeapSize */ 0x04C0, - /* mModelId */ OPAPER_BDL_OPAPER, + /* mModelId */ dRes_INDEX_OPAPER_BDL_OPAPER_e, /* mEyeOffset */ 0x00, /* mAttentionOffset */ 0x28, /* mCullSphereRadius */ 0x28, @@ -55,7 +55,7 @@ namespace daObjPaper { { /* mResName */ "Ppos", /* mHeapSize */ DEMO_SELECT(0x1000, 0x04C0), - /* mModelId */ PPOS_BDL_PPOS, + /* mModelId */ dRes_INDEX_PPOS_BDL_PPOS_e, /* mEyeOffset */ 0x00, /* mAttentionOffset */ 0x32, /* mCullSphereRadius */ 0x3C, @@ -69,7 +69,7 @@ namespace daObjPaper { { /* mResName */ "Piwa", /* mHeapSize */ DEMO_SELECT(0x8000, 0x04C0), - /* mModelId */ PIWA_BDL_PIWA, + /* mModelId */ dRes_INDEX_PIWA_BDL_PIWA_e, /* mEyeOffset */ 0x3C, /* mAttentionOffset */ 0x82, /* mCullSphereRadius */ 0x50, diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index 1430e123a..34d08dacb 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pbco.h" -#include "d/res/res_pbco.h" +#include "res/Object/Pbco.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" @@ -34,16 +34,16 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { BOOL daObj_Pbco_c::CreateHeap() { J3DModelData* modelData; if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !checkItemGet(dItemNo_PEARL_NAYRU_e, TRUE)) { - modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBCO)); + modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, dRes_INDEX_PBCO_BDL_PBCO_e)); } else { - modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBC2)); + modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, dRes_INDEX_PBCO_BDL_PBC2_e)); } JUT_ASSERT(0xa9, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !checkItemGet(dItemNo_PEARL_NAYRU_e, TRUE)) { mpBgW = NULL; } else { - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, PBCO_INDEX_DZB_PBCO), cBgW::MOVE_BG_e, + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_PBCO_DZB_PBCO_e), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); if (mpBgW == NULL) { return FALSE; diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index ad5362aee..b5a41b029 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pbka.h" -#include "d/res/res_pbka.h" +#include "res/Object/Pbka.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -18,7 +18,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-0000015C .text CreateHeap__11daObjPbka_cFv */ BOOL daObjPbka_c::CreateHeap() { - J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes("Pbka", PBKA_BDL_PBKA); + J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes("Pbka", dRes_INDEX_PBKA_BDL_PBKA_e); JUT_ASSERT(0x51, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData,0,0x11020203); if(mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp index 29d495397..6f44c03fc 100644 --- a/src/d/actor/d_a_obj_pfall.cpp +++ b/src/d/actor/d_a_obj_pfall.cpp @@ -6,13 +6,13 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pfall.h" #include "d/d_com_inf_game.h" -#include "d/res/res_pfall.h" +#include "res/Object/Pfall.h" #include "d/d_lib.h" #include "d/actor/d_a_player_main.h" static const int l_bck_ix_tbl[] = { - PFALL_BCK_NZ_WAIT, - PFALL_BCK_HIKU, + dRes_INDEX_PFALL_BCK_NZ_WAIT_e, + dRes_INDEX_PFALL_BCK_HIKU_e, }; static daObj_PfallHIO_c l_HIO; @@ -34,8 +34,8 @@ daObj_PfallHIO_c::daObj_PfallHIO_c() { /* 00000140-00000190 .text setAnm__13daObj_Pfall_cFv */ void daObj_Pfall_c::setAnm() { static const int a_anm_bcks_tbl[] = { - PFALL_BCK_NZ_WAIT, - PFALL_BCK_HIKU, + dRes_INDEX_PFALL_BCK_NZ_WAIT_e, + dRes_INDEX_PFALL_BCK_HIKU_e, }; static const dLib_anm_prm_c a_anm_prm_tbl[] = { @@ -111,7 +111,7 @@ void daObj_Pfall_c::set_mtx() { /* 00000518-00000858 .text CreateHeap__13daObj_Pfall_cFv */ BOOL daObj_Pfall_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Pfall", PFALL_BDL_AOTSI); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Pfall", dRes_INDEX_PFALL_BDL_AOTSI_e); JUT_ASSERT(0xD1, modelData != NULL); field_0x3C4 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); field_0x3FC = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -120,7 +120,7 @@ BOOL daObj_Pfall_c::CreateHeap() { return FALSE; } - J3DModelData* himoModelData = (J3DModelData*)dComIfG_getObjectRes("Pfall", PFALL_BDL_PSUZU); + J3DModelData* himoModelData = (J3DModelData*)dComIfG_getObjectRes("Pfall", dRes_INDEX_PFALL_BDL_PSUZU_e); JUT_ASSERT(0xD9, himoModelData != NULL); mpHimoModel = mDoExt_J3DModel__create(himoModelData, 0, 0x11020203); @@ -128,7 +128,7 @@ BOOL daObj_Pfall_c::CreateHeap() { return FALSE; } - J3DModelData* nzModelData = (J3DModelData*)dComIfG_getObjectRes("Pfall", PFALL_BDL_NZ); + J3DModelData* nzModelData = (J3DModelData*)dComIfG_getObjectRes("Pfall", dRes_INDEX_PFALL_BDL_NZ_e); JUT_ASSERT(0xE0, nzModelData != NULL); mpMorf = new mDoExt_McaMorf( nzModelData, @@ -151,7 +151,7 @@ BOOL daObj_Pfall_c::CreateHeap() { if(mpBgW == NULL) { return FALSE; } - cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("Pfall", PFALL_DZB_AOTOSI); + cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("Pfall", dRes_INDEX_PFALL_DZB_AOTOSI_e); if (mpBgW->Set(pData, cBgW::MOVE_BG_e, &field_0x3CC) == true) { return FALSE; @@ -162,7 +162,7 @@ BOOL daObj_Pfall_c::CreateHeap() { return FALSE; } - pData = (cBgD_t*)dComIfG_getObjectRes("Pfall", PFALL_DZB_AOTOSI); + pData = (cBgD_t*)dComIfG_getObjectRes("Pfall", dRes_INDEX_PFALL_DZB_AOTOSI_e); if (mpBgW2->Set(pData, cBgW::MOVE_BG_e, &field_0x404) == true) { return FALSE; diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index 4bf0df1e5..c9ad6ee46 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pirateship.h" #include "d/actor/d_a_knob00.h" -#include "d/res/res_kaizokusen.h" +#include "res/Object/Kaizokusen.h" #include "d/d_particle.h" #include "d/d_path.h" #include "d/d_lib.h" @@ -274,7 +274,7 @@ void daObjPirateship::Act_c::sound_proc() { /* 0000095C-00000A50 .text CreateHeap__Q215daObjPirateship5Act_cFv */ BOOL daObjPirateship::Act_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(mArcname, KAIZOKUSEN_INDEX_BDL_OBA_KAIZOKU_A); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(mArcname, dRes_INDEX_KAIZOKUSEN_BDL_OBA_KAIZOKU_A_e); JUT_ASSERT(374, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); @@ -464,9 +464,9 @@ cPhs_State daObjPirateship::Act_c::_create() { cPhs_State PVar1 = dComIfG_resLoad(&mPhase, mArcname); if (PVar1 == cPhs_COMPLEATE_e) { - s32 dzbFileIndex = KAIZOKUSEN_INDEX_DZB_ROOM1A; + s32 dzbFileIndex = dRes_INDEX_KAIZOKUSEN_DZB_ROOM1A_e; if (strcmp(dComIfGp_getStartStageName(), "sea") == 0) { - dzbFileIndex = KAIZOKUSEN_INDEX_DZB_ROOM1B; + dzbFileIndex = dRes_INDEX_KAIZOKUSEN_DZB_ROOM1B_e; } PVar1 = MoveBGCreate(mArcname, dzbFileIndex, dBgS_MoveBGProc_TypicalRotY, 0x7500); mpBgW->SetRideCallback(ride_call_back); diff --git a/src/d/actor/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp index ce46a4cb5..555c014b3 100644 --- a/src/d/actor/d_a_obj_plant.cpp +++ b/src/d/actor/d_a_obj_plant.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_plant.h" #include "m_Do/m_Do_ext.h" #include "d/d_cc_d.h" -#include "d/res/res_plant.h" +#include "res/Object/Plant.h" static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf @@ -129,7 +129,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-000001E0 .text CreateHeap__12daObjPlant_cFv */ BOOL daObjPlant_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Plant", PLANT_BDL_YRMWD); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Plant", dRes_INDEX_PLANT_BDL_YRMWD_e); JUT_ASSERT(0xAA, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); diff --git a/src/d/actor/d_a_obj_rcloud.cpp b/src/d/actor/d_a_obj_rcloud.cpp index aac298119..24da1f1d9 100644 --- a/src/d/actor/d_a_obj_rcloud.cpp +++ b/src/d/actor/d_a_obj_rcloud.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_rcloud.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_hostIO.h" -#include "d/res/res_bvkumo.h" +#include "res/Object/BVkumo.h" namespace { const char l_arcname[] = "BVkumo"; @@ -61,8 +61,8 @@ BOOL daObjRcloud_c::solidHeapCB(fopAc_ac_c* i_this) { /* 0000010C-00000238 .text create_heap__13daObjRcloud_cFv */ bool daObjRcloud_c::create_heap() { bool result = true;; - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcname, BVKUMO_BDL_BVKUMO)); - J3DAnmTextureSRTKey* pAnm = static_cast(dComIfG_getObjectRes(l_arcname, BVKUMO_BTK_BVKUMO)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_BVKUMO_BDL_BVKUMO_e)); + J3DAnmTextureSRTKey* pAnm = static_cast(dComIfG_getObjectRes(l_arcname, dRes_INDEX_BVKUMO_BTK_BVKUMO_e)); if (modelData == NULL || pAnm == FALSE) { JUT_ASSERT(DEMO_SELECT(216, 220), FALSE); diff --git a/src/d/actor/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp index 336f401ed..0edd077b1 100644 --- a/src/d/actor/d_a_obj_rflw.cpp +++ b/src/d/actor/d_a_obj_rflw.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rflw.h" -#include "d/res/res_rflw.h" +#include "res/Object/Rflw.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "d/d_cc_d.h" @@ -49,7 +49,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-000001E0 .text CreateHeap__11daObjRflw_cFv */ BOOL daObjRflw_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Rflw", RFLW_BDL_PHANA); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Rflw", dRes_INDEX_RFLW_BDL_PHANA_e); JUT_ASSERT(0xAA, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); diff --git a/src/d/actor/d_a_obj_rforce.cpp b/src/d/actor/d_a_obj_rforce.cpp index caa8c24d1..3a98bed62 100644 --- a/src/d/actor/d_a_obj_rforce.cpp +++ b/src/d/actor/d_a_obj_rforce.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_rforce.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" -#include "d/res/res_stptetu.h" +#include "res/Object/StpTetu.h" const char daObjRforce::Act_c::M_arcname[] = "StpTetu"; @@ -18,13 +18,13 @@ BOOL daObjRforce::Act_c::solidHeapCB(fopAc_ac_c* this_i) { /* 0000009C-00000220 .text create_heap__Q211daObjRforce5Act_cFv */ bool daObjRforce::Act_c::create_heap() { - J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, STPTETU_BDL_STPTETU)); + J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_STPTETU_BDL_STPTETU_e)); JUT_ASSERT(0x57, mdl_data != NULL); mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002); set_mtx(); - cBgD_t* bgw_data = static_cast(dComIfG_getObjectRes(M_arcname, STPTETU_DZB_STPTETU)); + cBgD_t* bgw_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_STPTETU_DZB_STPTETU_e)); JUT_ASSERT(0x64, bgw_data != NULL); #if VERSION > VERSION_DEMO if(bgw_data != NULL) diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index 6a919b7ab..2f076cd47 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_roten.h" -#include "d/res/res_roten.h" +#include "res/Object/Roten.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" @@ -36,14 +36,14 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000001A8-000002E4 .text CreateHeap__13daObj_Roten_cFv */ BOOL daObj_Roten_c::CreateHeap() { static u32 bdl_arc_idx[] = { - ROTEN_INDEX_BDL_ROTEN02, - ROTEN_INDEX_BDL_ROTEN03, - ROTEN_INDEX_BDL_ROTEN04 + dRes_INDEX_ROTEN_BDL_ROTEN02_e, + dRes_INDEX_ROTEN_BDL_ROTEN03_e, + dRes_INDEX_ROTEN_BDL_ROTEN04_e }; static u32 dzb_arc_idx[] = { - ROTEN_INDEX_DZB_ROTEN02, - ROTEN_INDEX_DZB_ROTEN03, - ROTEN_INDEX_DZB_ROTEN04 + dRes_INDEX_ROTEN_DZB_ROTEN02_e, + dRes_INDEX_ROTEN_DZB_ROTEN03_e, + dRes_INDEX_ROTEN_DZB_ROTEN04_e }; J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, bdl_arc_idx[mType])); diff --git a/src/d/actor/d_a_obj_shelf.cpp b/src/d/actor/d_a_obj_shelf.cpp index 6f19ae05a..6bdfec559 100644 --- a/src/d/actor/d_a_obj_shelf.cpp +++ b/src/d/actor/d_a_obj_shelf.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_shelf.h" -#include "d/res/res_otana.h" +#include "res/Object/Otana.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_npc_ba1.h" #include "m_Do/m_Do_mtx.h" @@ -56,7 +56,7 @@ const char daObjShelf::Act_c::M_arcname[] = "Otana"; /* 00000078-0000012C .text CreateHeap__Q210daObjShelf5Act_cFv */ int daObjShelf::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData *)dComIfG_getObjectRes(M_arcname, OTANA_BDL_OTANA); + J3DModelData* model_data = (J3DModelData *)dComIfG_getObjectRes(M_arcname, dRes_INDEX_OTANA_BDL_OTANA_e); JUT_ASSERT(0x12c, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000022); return mpModel != NULL; @@ -77,7 +77,7 @@ cPhs_State daObjShelf::Act_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, OTANA_DZB_OTANA, dBgS_MoveBGProc_Trans, 0xb00); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_OTANA_DZB_OTANA_e, dBgS_MoveBGProc_Trans, 0xb00); JUT_ASSERT(0x15b, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp index 84fdd9bec..d26cd6f55 100644 --- a/src/d/actor/d_a_obj_shmrgrd.cpp +++ b/src/d/actor/d_a_obj_shmrgrd.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_shmrgrd.h" -#include "d/res/res_shmrgrd.h" +#include "res/Object/Shmrgrd.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -177,14 +177,14 @@ BOOL daObjShmrgrd_c::solidHeapCB(fopAc_ac_c* i_this) { /* 000005C8-000006E0 .text create_heap__14daObjShmrgrd_cFv */ BOOL daObjShmrgrd_c::create_heap() { BOOL rt = FALSE; - J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, SHMRGRD_BDL_SHMRGRD)); + J3DModelData* mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_SHMRGRD_BDL_SHMRGRD_e)); JUT_ASSERT(0x21A, mdl_data != NULL); if (mdl_data != NULL) { mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203); if (mpModel) { mdl_data->getJointNodePointer(2)->setCallBack(jnodeCB); mpModel->setUserArea((u32) this); - mpBgW = dBgW_NewSet((cBgD_t *)dComIfG_getObjectRes(M_arcname, SHMRGRD_DZB_HGBASE), cBgW::MOVE_BG_e, &mMtx); + mpBgW = dBgW_NewSet((cBgD_t *)dComIfG_getObjectRes(M_arcname, dRes_INDEX_SHMRGRD_DZB_HGBASE_e), cBgW::MOVE_BG_e, &mMtx); if (mpBgW) { rt = TRUE; } diff --git a/src/d/actor/d_a_obj_smplbg.cpp b/src/d/actor/d_a_obj_smplbg.cpp index aa163bf8d..b507e5f3f 100644 --- a/src/d/actor/d_a_obj_smplbg.cpp +++ b/src/d/actor/d_a_obj_smplbg.cpp @@ -6,13 +6,13 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smplbg.h" #include "d/d_com_inf_game.h" -#include "d/res/res_qtkhd.h" +#include "res/Object/Qtkhd.h" const daObjSmplbg::Act_c::Attr_c daObjSmplbg::Act_c::M_attr[] = { /* mHeapSize */ DEMO_SELECT(0x8000, 0x15E0), /* mResName */ "Qtkhd", - /* mBDLFileIndex */ QTKHD_BDL_QTKHD, - /* mDZBFileIndex */ QTKHD_DZB_QTKHD, + /* mBDLFileIndex */ dRes_INDEX_QTKHD_BDL_QTKHD_e, + /* mDZBFileIndex */ dRes_INDEX_QTKHD_DZB_QTKHD_e, /* mMoveBGProc */ dBgS_MoveBGProc_TypicalRotY, /* mFlags */ 1 | 4 | 8, /* mCullMinX */ 0, diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index 411118714..ae0c3e9b0 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_stair.h" #include "d/d_bg_w.h" #include "d/d_cc_d.h" -#include "d/res/res_mkdan.h" +#include "res/Object/Mkdan.h" #include "d/d_com_inf_game.h" #include "d/d_meter.h" @@ -81,7 +81,7 @@ void ride_call_back(dBgW* i_arg0, fopAc_ac_c* i_arg1, fopAc_ac_c* i_arg2) { /* 000001D8-000002C4 .text CreateHeap__13daObj_Stair_cFv */ BOOL daObj_Stair_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKDAN_BDL_MKDAN1); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MKDAN_BDL_MKDAN1_e); JUT_ASSERT(0xcc, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); if(l_HIO.mNo < 0){ @@ -156,7 +156,7 @@ cPhs_State daObj_Stair_c::_create() { Quaternion quat = {0.0f, 0.0f, 0.0f, 1.0f}; f32 sin = cM_ssin(current.angle.y >> 1); f32 cos = cM_scos(current.angle.y >> 1); - phase_state = MoveBGCreate(M_arcname, MKDAN_DZB_MKDAN1, NULL, 0x8A0); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_MKDAN_DZB_MKDAN1_e, NULL, 0x8A0); JUT_ASSERT(0x10f, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); field_0x4A0.x = 0.0f; diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp index 24e4c80c8..d386252f8 100644 --- a/src/d/actor/d_a_obj_swhammer.cpp +++ b/src/d/actor/d_a_obj_swhammer.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swhammer.h" -#include "d/res/res_mhmrsw.h" +#include "res/Object/MhmrSW.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -113,7 +113,7 @@ daObjSwhammer::Act_c::Act_c() { /* 000004B0-0000058C .text CreateHeap__Q213daObjSwhammer5Act_cFv */ BOOL daObjSwhammer::Act_c::CreateHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, MHMRSW_BDL_MHMRSW)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MHMRSW_BDL_MHMRSW_e)); JUT_ASSERT(0x18b, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); if (mpModel) { @@ -170,7 +170,7 @@ cPhs_State daObjSwhammer::Act_c::_create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, MHMRSW_DZB_MHMRSW, NULL, 0xa80); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_MHMRSW_DZB_MHMRSW_e, NULL, 0xa80); JUT_ASSERT(0x1e9, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; diff --git a/src/d/actor/d_a_obj_swheavy.cpp b/src/d/actor/d_a_obj_swheavy.cpp index fbce8fc18..d70ff0961 100644 --- a/src/d/actor/d_a_obj_swheavy.cpp +++ b/src/d/actor/d_a_obj_swheavy.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swheavy.h" -#include "d/res/res_hhbot.h" +#include "res/Object/Hhbot.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -60,18 +60,18 @@ BOOL daObjSwheavy::Act_c::solidHeapCB(fopAc_ac_c* i_this) { /* 0000009C-0000032C .text create_heap__Q212daObjSwheavy5Act_cFv */ u8 daObjSwheavy::Act_c::create_heap() { - J3DModelData* mdl_1_data = (J3DModelData*) dComIfG_getObjectRes(M_arcname, HHBOT_BDL_HHBOT1); + J3DModelData* mdl_1_data = (J3DModelData*) dComIfG_getObjectRes(M_arcname, dRes_INDEX_HHBOT_BDL_HHBOT1_e); JUT_ASSERT(0x116, mdl_1_data != NULL); mpModel1 = mDoExt_J3DModel__create(mdl_1_data, 0x80000, 0x11000022); - J3DModelData* mdl_2_data = (J3DModelData*) dComIfG_getObjectRes(M_arcname, HHBOT_BDL_HHBOT2); + J3DModelData* mdl_2_data = (J3DModelData*) dComIfG_getObjectRes(M_arcname, dRes_INDEX_HHBOT_BDL_HHBOT2_e); JUT_ASSERT(0x11F, mdl_2_data != NULL); mpModel2 = mDoExt_J3DModel__create(mdl_2_data, 0x80000, 0x11000022); bool b1 = false; mpBgW1 = new dBgW(); if (mpBgW1 != NULL) { - cBgD_t* bgw_1_data = (cBgD_t*) dComIfG_getObjectRes(M_arcname, HHBOT_DZB_HHBOT1); + cBgD_t* bgw_1_data = (cBgD_t*) dComIfG_getObjectRes(M_arcname, dRes_INDEX_HHBOT_DZB_HHBOT1_e); JUT_ASSERT(0x137, bgw_1_data != NULL); if (!mpBgW1->Set(bgw_1_data, dBgW::MOVE_BG_e, &mMtx1)) { b1 = true; @@ -81,7 +81,7 @@ u8 daObjSwheavy::Act_c::create_heap() { bool b2 = false; mpBgW2 = new dBgW(); if (mpBgW2 != NULL) { - cBgD_t* bgw_2_data = (cBgD_t*) dComIfG_getObjectRes(M_arcname, HHBOT_DZB_HHBOT2); + cBgD_t* bgw_2_data = (cBgD_t*) dComIfG_getObjectRes(M_arcname, dRes_INDEX_HHBOT_DZB_HHBOT2_e); JUT_ASSERT(0x146, bgw_2_data != NULL); if (!mpBgW2->Set(bgw_2_data, dBgW::MOVE_BG_e, &mMtx2)) { b2 = true; diff --git a/src/d/actor/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp index bf06e9b23..f365eb42d 100644 --- a/src/d/actor/d_a_obj_swlight.cpp +++ b/src/d/actor/d_a_obj_swlight.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swlight.h" -#include "d/res/res_mmirror.h" +#include "res/Object/Mmirror.h" namespace daObjSwlight { namespace { @@ -61,7 +61,7 @@ BOOL Act_c::solidHeapCB(fopAc_ac_c* i_this) { /* 00000178-0000045C .text create_heap__Q212daObjSwlight5Act_cFv */ bool Act_c::create_heap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, MMIRROR_BDL_MSUSW)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_BDL_MSUSW_e)); JUT_ASSERT(317, modelData != NULL); m298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x31000202); @@ -74,12 +74,12 @@ bool Act_c::create_heap() { m298->setUserArea((u32)this); } - J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(M_arcname, MMIRROR_BTK_MSUSW)); + J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_BTK_MSUSW_e)); JUT_ASSERT(344, btk != NULL); BOOL iVar4 = m29C.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); - J3DAnmTransform* bck = static_cast(dComIfG_getObjectRes(M_arcname, MMIRROR_BCK_MSUSW)); + J3DAnmTransform* bck = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_BCK_MSUSW_e)); JUT_ASSERT(351, bck != NULL); BOOL iVar6 = m2B0.init(modelData, bck, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); @@ -87,7 +87,7 @@ bool Act_c::create_heap() { m2C0 = new dBgW(); if (m2C0 != NULL) { - cBgD_t* bgw_data = static_cast(dComIfG_getObjectRes(M_arcname, MMIRROR_DZB_MSUSW)); + cBgD_t* bgw_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_DZB_MSUSW_e)); JUT_ASSERT(361, bgw_data != NULL); if (!m2C0->Set(bgw_data, cBgW::MOVE_BG_e, &mF38)) { bVar1 = true; diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 88d1ddf28..639db5f05 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -5,8 +5,8 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swpush.h" -#include "d/res/res_kbota_00.h" -#include "d/res/res_hhbot.h" +#include "res/Object/Kbota_00.h" +#include "res/Object/Hhbot.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w_sv.h" #include "d/actor/d_a_player.h" @@ -24,8 +24,8 @@ const daObjSwpush::Attr_c daObjSwpush::Act_c::M_attr[] = { /* mBgArcName */ daObjSwpush::Act_c::M_arcname_kbota, /* mModelArcName */ daObjSwpush::Act_c::M_arcname_kbota, /* mBtpArcName */ NULL, - /* mBgResIndex */ KBOTA_00_DZB_KBOTA_00, - /* mModelResIndices */ { KBOTA_00_BDL_KBOTA_00, KBOTA_00_BDL_KBOTA_00 }, + /* mBgResIndex */ dRes_INDEX_KBOTA_00_DZB_KBOTA_00_e, + /* mModelResIndices */ { dRes_INDEX_KBOTA_00_BDL_KBOTA_00_e, dRes_INDEX_KBOTA_00_BDL_KBOTA_00_e }, /* mBtpResIndex */ -1, /* mSpring */ 0.9f, /* mSpeedDecay */ 0.6f, @@ -48,8 +48,8 @@ const daObjSwpush::Attr_c daObjSwpush::Act_c::M_attr[] = { /* mBgArcName */ daObjSwpush::Act_c::M_arcname_kbota, /* mModelArcName */ daObjSwpush::Act_c::M_arcname_kbota, /* mBtpArcName */ NULL, - /* mBgResIndex */ KBOTA_00_DZB_KBOTA_00, - /* mModelResIndices */ { KBOTA_00_BDL_KBOTA_00, KBOTA_00_BDL_KBOTA_00 }, + /* mBgResIndex */ dRes_INDEX_KBOTA_00_DZB_KBOTA_00_e, + /* mModelResIndices */ { dRes_INDEX_KBOTA_00_BDL_KBOTA_00_e, dRes_INDEX_KBOTA_00_BDL_KBOTA_00_e }, /* mBtpResIndex */ -1, /* mSpring */ 0.9f, /* mSpeedDecay */ 0.6f, @@ -72,8 +72,8 @@ const daObjSwpush::Attr_c daObjSwpush::Act_c::M_attr[] = { /* mBgArcName */ daObjSwpush::Act_c::M_arcname_kbota, /* mModelArcName */ daObjSwpush::Act_c::M_arcname_kbota, /* mBtpArcName */ NULL, - /* mBgResIndex */ KBOTA_00_DZB_KBOTA_00, - /* mModelResIndices */ { KBOTA_00_BDL_KBOTA_00, KBOTA_00_BDL_KBOTA_00 }, + /* mBgResIndex */ dRes_INDEX_KBOTA_00_DZB_KBOTA_00_e, + /* mModelResIndices */ { dRes_INDEX_KBOTA_00_BDL_KBOTA_00_e, dRes_INDEX_KBOTA_00_BDL_KBOTA_00_e }, /* mBtpResIndex */ -1, /* mSpring */ 0.9f, /* mSpeedDecay */ 0.6f, @@ -96,8 +96,8 @@ const daObjSwpush::Attr_c daObjSwpush::Act_c::M_attr[] = { /* mBgArcName */ daObjSwpush::Act_c::M_arcname_kbota, /* mModelArcName */ daObjSwpush::Act_c::M_arcname_hhbot, /* mBtpArcName */ NULL, - /* mBgResIndex */ KBOTA_00_DZB_KBOTA_00, - /* mModelResIndices */ { HHBOT_BDL_HHBOT1, HHBOT_BDL_HHBOT1 }, + /* mBgResIndex */ dRes_INDEX_KBOTA_00_DZB_KBOTA_00_e, + /* mModelResIndices */ { dRes_INDEX_HHBOT_BDL_HHBOT1_e, dRes_INDEX_HHBOT_BDL_HHBOT1_e }, /* mBtpResIndex */ 0xFFFF, /* mSpring */ 0.93f, /* mSpeedDecay */ 0.42f, diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 80de69691..ff6ef81c0 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -12,7 +12,7 @@ #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" -#include "d/res/res_table.h" +#include "res/Object/Table.h" Mtx daObjTable::Act_c::M_tmp_mtx; const char daObjTable::Act_c::M_arcname[6] = "Table"; @@ -23,13 +23,13 @@ BOOL daObjTable::Act_c::CreateHeap() { J3DModel *model; if (prm_get_mdl() == 0) { - model_data = (J3DModelData*) dComIfG_getObjectRes(M_arcname, TABLE_BDL_YTBLE); + model_data = (J3DModelData*) dComIfG_getObjectRes(M_arcname, dRes_INDEX_TABLE_BDL_YTBLE_e); JUT_ASSERT(0x51, model_data != NULL); model = mDoExt_J3DModel__create(model_data, 0, 0x11020203); mpModel = model; } else { - model_data = (J3DModelData *) dComIfG_getObjectRes(M_arcname, TABLE_BDL_QCFIS); + model_data = (J3DModelData *) dComIfG_getObjectRes(M_arcname, dRes_INDEX_TABLE_BDL_QCFIS_e); JUT_ASSERT(0x57, model_data != NULL); @@ -60,9 +60,9 @@ cPhs_State daObjTable::Act_c::Mthd_Create() { phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (prm_get_mdl() == 0) { - phase_state = MoveBGCreate(M_arcname, TABLE_DZB_YTBLE, NULL, -1); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_TABLE_DZB_YTBLE_e, NULL, -1); } else { - phase_state = MoveBGCreate(M_arcname, TABLE_DZB_QCFIS, NULL, -1); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_TABLE_DZB_QCFIS_e, NULL, -1); } JUT_ASSERT(0x8c, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); diff --git a/src/d/actor/d_a_obj_tenmado.cpp b/src/d/actor/d_a_obj_tenmado.cpp index badbdad47..e7f2d87d9 100644 --- a/src/d/actor/d_a_obj_tenmado.cpp +++ b/src/d/actor/d_a_obj_tenmado.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tenmado.h" -#include "d/res/res_tenmado.h" +#include "res/Object/Tenmado.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -14,7 +14,7 @@ const char daObjTenmado::Act_c::M_arcname[] = "Tenmado"; /* 00000078-000001B4 .text CreateHeap__Q212daObjTenmado5Act_cFv */ BOOL daObjTenmado::Act_c::CreateHeap() { - J3DModelData* model_data_l = (J3DModelData*)dComIfG_getObjectRes(M_arcname, TENMADO_BDL_MMADOL); + J3DModelData* model_data_l = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_TENMADO_BDL_MMADOL_e); JUT_ASSERT(85, model_data_l != NULL); mModel1 = mDoExt_J3DModel__create(model_data_l, 0, 0x11020203); @@ -22,7 +22,7 @@ BOOL daObjTenmado::Act_c::CreateHeap() { return FALSE; } - J3DModelData* model_data_r = (J3DModelData*)dComIfG_getObjectRes(M_arcname, TENMADO_BDL_MMADOR); + J3DModelData* model_data_r = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_TENMADO_BDL_MMADOR_e); JUT_ASSERT(94, model_data_r != NULL); mModel2 = mDoExt_J3DModel__create(model_data_r, 0, 0x11020203); @@ -56,7 +56,7 @@ cPhs_State daObjTenmado::Act_c::Mthd_Create() { phase_state = dComIfG_resLoad(&mPhase, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, TENMADO_DZB_MMADO, NULL, 0xF00); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_TENMADO_DZB_MMADO_e, NULL, 0xF00); JUT_ASSERT(146, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)) } return phase_state; diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 0016b4651..d65ceb17f 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_toripost.h" -#include "d/res/res_toripost.h" +#include "res/Object/Toripost.h" #include "JSystem/JUtility/JUTAssert.h" #include "f_op/f_op_actor_mng.h" #include "d/actor/d_a_player.h" @@ -100,7 +100,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { /* 0000010C-0000022C .text _createHeap__12daObjTpost_cFv */ BOOL daObjTpost_c::_createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, TORIPOST_BDL_VPOST); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_TORIPOST_BDL_VPOST_e); JUT_ASSERT(132, modelData != NULL); mMorf = new mDoExt_McaMorf( @@ -581,9 +581,9 @@ void daObjTpost_c::setAttention() { /* 00000EA4-0000100C .text setAnm__12daObjTpost_cFScb */ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) { static const int a_anm_bcks_tbl[] = { - TORIPOST_BCK_POST_GET, - TORIPOST_BCK_POST_PUTOUT, - TORIPOST_BCK_POST_WAIT, + dRes_INDEX_TORIPOST_BCK_POST_GET_e, + dRes_INDEX_TORIPOST_BCK_POST_PUTOUT_e, + dRes_INDEX_TORIPOST_BCK_POST_WAIT_e, }; static const dLib_anm_prm_c a_anm_prm_tbl[] = { { diff --git a/src/d/actor/d_a_obj_tousekiki.cpp b/src/d/actor/d_a_obj_tousekiki.cpp index fa62077c8..236c0940b 100644 --- a/src/d/actor/d_a_obj_tousekiki.cpp +++ b/src/d/actor/d_a_obj_tousekiki.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tousekiki.h" #include "d/actor/d_a_obj_pirateship.h" -#include "d/res/res_touseki.h" +#include "res/Object/Touseki.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -22,10 +22,10 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) { /* 0000010C-000002BC .text CreateHeap__17daObj_Tousekiki_cFv */ BOOL daObj_Tousekiki_c::CreateHeap() { mMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes(M_arcname, TOUSEKI_INDEX_BDL_ATOSK_A), + (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_TOUSEKI_BDL_ATOSK_A_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, TOUSEKI_INDEX_BCK_ATOSK_NAGE), + (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_TOUSEKI_BCK_ATOSK_NAGE_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -39,7 +39,7 @@ BOOL daObj_Tousekiki_c::CreateHeap() { return false; } - mMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, TOUSEKI_INDEX_BCK_ATOSK_NAGE), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL); + mMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_TOUSEKI_BCK_ATOSK_NAGE_e), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL); m2D0 = 0xFFFF; mMorf->setFrame(mMorf->getEndFrame() - 1.0f); mModel = mMorf->getModel(); diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp index 085f1b572..54a81dee2 100644 --- a/src/d/actor/d_a_obj_tower.cpp +++ b/src/d/actor/d_a_obj_tower.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tower.h" -#include "d/res/res_x_tower.h" +#include "res/Object/X_tower.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -16,7 +16,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000098-0000020C .text CreateHeap__12daObjTower_cFv */ BOOL daObjTower_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("X_tower", X_TOWER_BDL_X_TOWER); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("X_tower", dRes_INDEX_X_TOWER_BDL_X_TOWER_e); JUT_ASSERT(0x56, modelData != NULL); @@ -35,7 +35,7 @@ BOOL daObjTower_c::CreateHeap() { if (mpBgW == NULL) return FALSE; - cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("X_tower", X_TOWER_DZB_X_TOWER); + cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("X_tower", dRes_INDEX_X_TOWER_DZB_X_TOWER_e); return mpBgW->Set(pData, cBgW::MOVE_BG_e, &mMtx) ? FALSE : TRUE; } diff --git a/src/d/actor/d_a_obj_usovmc.cpp b/src/d/actor/d_a_obj_usovmc.cpp index e0ed9e83d..57d75c300 100644 --- a/src/d/actor/d_a_obj_usovmc.cpp +++ b/src/d/actor/d_a_obj_usovmc.cpp @@ -6,14 +6,14 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_usovmc.h" #include "d/d_com_inf_game.h" -#include "d/res/res_usovmc.h" +#include "res/Object/Usovmc.h" const char daObjUsovmc::Act_c::M_arcname[7] = "Usovmc"; Mtx daObjUsovmc::Act_c::M_tmp_mtx; /* 00000078-0000012C .text CreateHeap__Q211daObjUsovmc5Act_cFv */ BOOL daObjUsovmc::Act_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, USOVMC_BDL_VMCBX); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_USOVMC_BDL_VMCBX_e); JUT_ASSERT(0x4a, model_data != NULL); mModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); return mModel != NULL; @@ -33,7 +33,7 @@ cPhs_State daObjUsovmc::Act_c::Mthd_Create() { cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, USOVMC_DZB_VMCBS, NULL, 0); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_USOVMC_DZB_VMCBS_e, NULL, 0); JUT_ASSERT(0x74, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 7a859e7b3..8db57746a 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vfan.h" -#include "d/res/res_vfan.h" +#include "res/Object/Vfan.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -48,7 +48,7 @@ static dCcD_SrcCyl cyl_check_src = { /* 00000078-00000134 .text CreateHeap__Q29daObjVfan5Act_cFv */ BOOL daObjVfan::Act_c::CreateHeap() { - J3DModelData* model_data = static_cast(dComIfG_getObjectRes(M_arcname, VFAN_BDL_V_FAN_00)); + J3DModelData* model_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_VFAN_BDL_V_FAN_00_e)); JUT_ASSERT(0x8c, model_data != NULL); @@ -92,7 +92,7 @@ cPhs_State daObjVfan::Act_c::Mthd_Create() { } else { phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, VFAN_DZB_V_FAN_00, NULL, 0xa60); + phase_state = MoveBGCreate(M_arcname, dRes_INDEX_VFAN_DZB_V_FAN_00_e, NULL, 0xa60); JUT_ASSERT(0xc6, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index dc2ac0d9e..928088e0a 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -6,26 +6,26 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vgnfd.h" #include "d/d_com_inf_game.h" -#include "d/res/res_vgnfd.h" +#include "res/Object/VgnFD.h" #include "JSystem/JUtility/JUTAssert.h" const s32 daObjVgnfd_c::M_bdl_table[] = { - VGNFD_BDL_VGNFD0, - VGNFD_BDL_VGNFD1, - VGNFD_BDL_VGNFD2, - VGNFD_BDL_VGNFD3, - VGNFD_BDL_VGNFD4, + dRes_INDEX_VGNFD_BDL_VGNFD0_e, + dRes_INDEX_VGNFD_BDL_VGNFD1_e, + dRes_INDEX_VGNFD_BDL_VGNFD2_e, + dRes_INDEX_VGNFD_BDL_VGNFD3_e, + dRes_INDEX_VGNFD_BDL_VGNFD4_e, }; const s32 daObjVgnfd_c::M_brk_table[] = { - VGNFD_BRK_VGNFD0, - VGNFD_BRK_VGNFD1, - VGNFD_BRK_VGNFD2, - VGNFD_BRK_VGNFD3, - VGNFD_BRK_VGNFD4, + dRes_INDEX_VGNFD_BRK_VGNFD0_e, + dRes_INDEX_VGNFD_BRK_VGNFD1_e, + dRes_INDEX_VGNFD_BRK_VGNFD2_e, + dRes_INDEX_VGNFD_BRK_VGNFD3_e, + dRes_INDEX_VGNFD_BRK_VGNFD4_e, }; const s32 daObjVgnfd_c::M_door_bdl_table[] = { - VGNFD_BDL_VGNFD5, - VGNFD_BDL_YGCBD00, + dRes_INDEX_VGNFD_BDL_VGNFD5_e, + dRes_INDEX_VGNFD_BDL_YGCBD00_e, }; const u16 daObjVgnfd_c::M_door_ev_table[] = { dSv_event_flag_c::TRIALS_DOOR_LIGHT_GOHMA, @@ -138,7 +138,7 @@ BOOL daObjVgnfd_c::create_heap() { } if (ret) { - J3DAnmTextureSRTKey* btk_data = static_cast(dComIfG_getObjectRes(M_arcname, VGNFD_BTK_YGCBD00)); + J3DAnmTextureSRTKey* btk_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_VGNFD_BTK_YGCBD00_e)); JUT_ASSERT(0x144, btk_data != NULL); if (btk_data == NULL || !mBtkAnm.init(mModel2[1]->getModelData(), btk_data, TRUE, J3DFrameCtrl::EMode_NONE)) { @@ -148,7 +148,7 @@ BOOL daObjVgnfd_c::create_heap() { if (ret) { M_bgw = dBgW_NewSet( - (cBgD_t*)dComIfG_getObjectRes(M_arcname, VGNFD_DZB_VGNFD), + (cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VGNFD_DZB_VGNFD_e), dBgW::MOVE_BG_e, &mModel[0]->getBaseTRMtx() ); diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index e4b27034f..b2cf20581 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmc.h" #include "d/d_com_inf_game.h" -#include "d/res/res_vmc.h" +#include "res/Object/Vmc.h" enum { STATE_BASE_MAIN, @@ -87,20 +87,20 @@ BOOL daObjVmc::Act_c::solidHeapCB(fopAc_ac_c* i_ac) { /* 0000009C-00000400 .text create_heap__Q28daObjVmc5Act_cFv */ bool daObjVmc::Act_c::create_heap() { /* Nonmatching */ - J3DModelData* mdl_bs_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, VMC_BDL_VMCBS); + J3DModelData* mdl_bs_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMC_BDL_VMCBS_e); JUT_ASSERT(200, mdl_bs_data != NULL); mModelBase = mDoExt_J3DModel__create(mdl_bs_data, 0, 0x11020203); if (mModelBase == NULL) return false; - J3DModelData* mdl_wd_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, VMC_BDL_VMCWD); + J3DModelData* mdl_wd_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMC_BDL_VMCWD_e); JUT_ASSERT(207, mdl_wd_data != NULL); mModelTree = mDoExt_J3DModel__create(mdl_wd_data, 0, 0x11020203); if (mModelTree == NULL) return false; { - J3DAnmTransform* bck_wg = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, VMC_BCK_VMCWG); + J3DAnmTransform* bck_wg = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMC_BCK_VMCWG_e); JUT_ASSERT(215, bck_wg != NULL); BOOL ret = mBckAnmGrow.init(mdl_wd_data, bck_wg, TRUE, J3DFrameCtrl::EMode_NONE); mBckAnmGrow.setPlaySpeed(0.75f); @@ -109,7 +109,7 @@ bool daObjVmc::Act_c::create_heap() { } { - J3DAnmTransform* bck_wh = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, VMC_BCK_VMCWH); + J3DAnmTransform* bck_wh = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMC_BCK_VMCWH_e); JUT_ASSERT(226, bck_wh != NULL); if (!mBckAnmHookshot.init(mdl_wd_data, bck_wh, TRUE, J3DFrameCtrl::EMode_NONE)) return false; @@ -123,11 +123,11 @@ bool daObjVmc::Act_c::create_heap() { mDoMtx_copy(mDoMtx_stack_c::get(), mMtxTree); mpBgBase = new dBgW(); - if (mpBgBase == NULL || mpBgBase->Set((cBgD_t*)dComIfG_getObjectRes(M_arcname, VMC_DZB_VMCBS), dBgW::MOVE_BG_e, &mMtxBase)) + if (mpBgBase == NULL || mpBgBase->Set((cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMC_DZB_VMCBS_e), dBgW::MOVE_BG_e, &mMtxBase)) ret = false; mpBgTree = new dBgW(); - if (mpBgTree == NULL || mpBgTree->Set((cBgD_t*)dComIfG_getObjectRes(M_arcname, VMC_DZB_VMCWD), dBgW::MOVE_BG_e, &mMtxTree)) + if (mpBgTree == NULL || mpBgTree->Set((cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMC_DZB_VMCWD_e), dBgW::MOVE_BG_e, &mMtxTree)) ret = false; if (ret != true) @@ -267,7 +267,7 @@ void daObjVmc::Act_c::daObjVmc_tree_demo_main() { void daObjVmc::Act_c::daObjVmc_tree_main() { if (!mHookshotAnim) { if (mCyl.ChkCoHit()) { - J3DAnmTransform* bck_wh = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, VMC_BCK_VMCWH); + J3DAnmTransform* bck_wh = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMC_BCK_VMCWH_e); JUT_ASSERT(DEMO_SELECT(430, 429), bck_wh != NULL); mBckAnmHookshot.init(mModelTree->getModelData(), bck_wh, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true); mHookshotAnim = true; diff --git a/src/d/actor/d_a_obj_vmsdz.cpp b/src/d/actor/d_a_obj_vmsdz.cpp index 6bec73272..9dceebbe5 100644 --- a/src/d/actor/d_a_obj_vmsdz.cpp +++ b/src/d/actor/d_a_obj_vmsdz.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmsdz.h" #include "d/d_com_inf_game.h" -#include "d/res/res_vmsdz.h" +#include "res/Object/VmsDZ.h" const char daObjVmsdz_c::M_arcname[6] = "VmsDZ"; @@ -20,7 +20,7 @@ BOOL daObjVmsdz_c::create_heap() { J3DModelData* mdl_data; BOOL ret = FALSE; - mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, VMSDZ_BDL_VMSDZ); + mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMSDZ_BDL_VMSDZ_e); JUT_ASSERT(0x59, mdl_data != NULL); if (mdl_data != NULL) { diff --git a/src/d/actor/d_a_obj_vmsms.cpp b/src/d/actor/d_a_obj_vmsms.cpp index 5febba1e6..3fa258594 100644 --- a/src/d/actor/d_a_obj_vmsms.cpp +++ b/src/d/actor/d_a_obj_vmsms.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmsms.h" #include "d/d_com_inf_game.h" -#include "d/res/res_vmsms.h" +#include "res/Object/VmsMS.h" const char daObjVmsms_c::M_arcname[6] = "VmsMS"; @@ -20,7 +20,7 @@ BOOL daObjVmsms_c::create_heap() { J3DModelData* mdl_data; BOOL ret = FALSE; - mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, VMSMS_BDL_VMSMS); + mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VMSMS_BDL_VMSMS_e); JUT_ASSERT(0x5b, mdl_data != NULL); if (mdl_data != NULL) { diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index 850fa54aa..4476461e6 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_volcano.h" #include "d/d_particle_name.h" -#include "d/res/res_ykzyg.h" +#include "res/Object/Ykzyg.h" #include "d/d_cc_d.h" static dCcD_SrcCyl cyl_check_src = { @@ -114,24 +114,24 @@ void daObjVolcano::Act_c::StopFire() { /* 00000470-00000758 .text CreateHeap__Q212daObjVolcano5Act_cFv */ BOOL daObjVolcano::Act_c::CreateHeap() { - J3DModelData * model_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, YKZYG_BDL_QKZYG)); + J3DModelData * model_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YKZYG_BDL_QKZYG_e)); JUT_ASSERT(0xbf, model_data != NULL); field_0x2F8 = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000222); - J3DAnmTextureSRTKey * btk = static_cast(dComIfG_getObjectRes(M_arcname, YKZYG_BTK_QKZYG)); + J3DAnmTextureSRTKey * btk = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YKZYG_BTK_QKZYG_e)); JUT_ASSERT(0xca, btk != NULL); s32 btkRet = field_0x2FC.init(model_data, btk, TRUE, J3DFrameCtrl::EMode_LOOP); - J3DModelData * model_data_fire = static_cast(dComIfG_getObjectRes(M_arcname, YKZYG_BDL_YMNKZ00)); + J3DModelData * model_data_fire = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YKZYG_BDL_YMNKZ00_e)); JUT_ASSERT(0xe1, model_data_fire != NULL); field_0x310 = mDoExt_J3DModel__create(model_data_fire, 0x80000, 0x11000222); - J3DAnmTextureSRTKey * btk_f = static_cast(dComIfG_getObjectRes(M_arcname, YKZYG_BTK_YMNKZ00)); + J3DAnmTextureSRTKey * btk_f = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YKZYG_BTK_YMNKZ00_e)); JUT_ASSERT(0xec, btk_f != NULL); s32 btkFRet = field_0x314.init(model_data_fire, btk_f, TRUE, J3DFrameCtrl::EMode_LOOP); - J3DAnmTevRegKey * brk_f = static_cast(dComIfG_getObjectRes(M_arcname, YKZYG_BRK_YMNKZ00)); + J3DAnmTevRegKey * brk_f = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YKZYG_BRK_YMNKZ00_e)); JUT_ASSERT(0xf3, brk_f != NULL); s32 brkRet = field_0x328.init(model_data_fire, brk_f, TRUE, J3DFrameCtrl::EMode_NONE); diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index c0dc8e730..07523ba4f 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_warpt.h" #include "d/actor/d_a_player.h" -#include "d/res/res_ltubw.h" +#include "res/Object/ltubw.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" @@ -158,7 +158,7 @@ BOOL daObj_Warpt_c::_createHeap() { /* 00000270-00000488 .text createHutaHeap__13daObj_Warpt_cFv */ bool daObj_Warpt_c::createHutaHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, LTUBW_BDL_ITUHU); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_LTUBW_BDL_ITUHU_e); JUT_ASSERT(264, modelData); mpLidModel1 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -171,11 +171,11 @@ bool daObj_Warpt_c::createHutaHeap() { return false; } - if (mpLidBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arc_name, LTUBW_DZB_ITUHT), cBgW::MOVE_BG_e, &m344) == TRUE) { + if (mpLidBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_LTUBW_DZB_ITUHT_e), cBgW::MOVE_BG_e, &m344) == TRUE) { return false; } - J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, LTUBW_BDL_YWPFM00); + J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_LTUBW_BDL_YWPFM00_e); modelData = modelData2; if (modelData == NULL) { return false; @@ -186,7 +186,7 @@ bool daObj_Warpt_c::createHutaHeap() { return false; } - J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arc_name, LTUBW_BRK_YWPFM00); + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_LTUBW_BRK_YWPFM00_e); JUT_ASSERT(291, brk); if (!mLidBrk.init(modelData, brk, true, J3DFrameCtrl::EMode_LOOP)) { @@ -197,7 +197,7 @@ bool daObj_Warpt_c::createHutaHeap() { /* 00000488-00000620 .text createBodyHeap__13daObj_Warpt_cFv */ bool daObj_Warpt_c::createBodyHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, LTUBW_BDL_ITUBW); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_LTUBW_BDL_ITUBW_e); JUT_ASSERT(305, modelData); mpBodyModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -210,7 +210,7 @@ bool daObj_Warpt_c::createBodyHeap() { return false; } - if (mpBodyBgW2->Set((cBgD_t*)dComIfG_getObjectRes(m_arc_name, LTUBW_DZB_ITUBW), cBgW::MOVE_BG_e, &m310) == TRUE) { + if (mpBodyBgW2->Set((cBgD_t*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_LTUBW_DZB_ITUBW_e), cBgW::MOVE_BG_e, &m310) == TRUE) { return false; } @@ -219,7 +219,7 @@ bool daObj_Warpt_c::createBodyHeap() { return false; } - if (mpBodyBgW1->Set((cBgD_t*)dComIfG_getObjectRes(m_arc_name, LTUBW_DZB_ITUSO), cBgW::MOVE_BG_e, &m2DC) == TRUE) { + if (mpBodyBgW1->Set((cBgD_t*)dComIfG_getObjectRes(m_arc_name, dRes_INDEX_LTUBW_DZB_ITUSO_e), cBgW::MOVE_BG_e, &m2DC) == TRUE) { return false; } return true; diff --git a/src/d/actor/d_a_obj_xfuta.cpp b/src/d/actor/d_a_obj_xfuta.cpp index ba700106f..3a6d467e8 100644 --- a/src/d/actor/d_a_obj_xfuta.cpp +++ b/src/d/actor/d_a_obj_xfuta.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_xfuta.h" #include "d/d_com_inf_game.h" -#include "d/res/res_x_futa.h" +#include "res/Object/X_futa.h" #include "dolphin/types.h" namespace daObjXfuta { @@ -39,7 +39,7 @@ BOOL Act_c::solidHeapCB(fopAc_ac_c* i_this) { bool Act_c::create_heap() { J3DModelData* mdl_data; - mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, X_FUTA_BDL_X_FUTA)); + mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, dRes_INDEX_X_FUTA_BDL_X_FUTA_e)); JUT_ASSERT(0x105, mdl_data != NULL); diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 93d6e80a7..c83251576 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zouK.h" -#include "d/res/res_vzouk.h" +#include "res/Object/VzouK.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" @@ -65,9 +65,9 @@ BOOL daObjZouk::Act_c::solidHeapCB(fopAc_ac_c* i_this) { /* 0000009C-00000468 .text create_heap__Q29daObjZouk5Act_cFv */ bool daObjZouk::Act_c::create_heap() { - J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_BDL_VZOUK); + J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VZOUK_BDL_VZOUK_e); JUT_ASSERT(369, mdl_data != NULL); - M_bck_data = (J3DAnmTransformKey*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_BCK_VZOUK); + M_bck_data = (J3DAnmTransformKey*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VZOUK_BCK_VZOUK_e); JUT_ASSERT(373, M_bck_data != NULL); #if VERSION > VERSION_DEMO @@ -96,7 +96,7 @@ bool daObjZouk::Act_c::create_heap() { } set_mtx(); - cBgD_t* bgw_data_before = (cBgD_t*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_DZB_MAEKISI); + cBgD_t* bgw_data_before = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VZOUK_DZB_MAEKISI_e); JUT_ASSERT(DEMO_SELECT(404, 406), bgw_data_before != NULL); #if VERSION > VERSION_DEMO if (bgw_data_before != NULL) @@ -112,7 +112,7 @@ bool daObjZouk::Act_c::create_heap() { } } - cBgD_t* bgw_data_after = (cBgD_t*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_DZB_ATOKISI); + cBgD_t* bgw_data_after = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_VZOUK_DZB_ATOKISI_e); JUT_ASSERT(DEMO_SELECT(414, 420), bgw_data_after != NULL); #if VERSION > VERSION_DEMO if (bgw_data_after != NULL) diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp index 528d09857..23951810a 100644 --- a/src/d/actor/d_a_oship.cpp +++ b/src/d/actor/d_a_oship.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_salvage.h" #include "d/actor/d_a_ship.h" -#include "d/res/res_oship.h" +#include "res/Object/Oship.h" #include "d/d_cc_d.h" const s32 daOship_c::m_heapsize = 0x1280; @@ -960,9 +960,9 @@ void daOship_c::createInit() { BOOL daOship_c::_createHeap() { int file_index; - file_index = OSHIP_BDL_VBTSP; + file_index = dRes_INDEX_OSHIP_BDL_VBTSP_e; if (isSpecial()) { - file_index = OSHIP_BDL_VBTST; + file_index = dRes_INDEX_OSHIP_BDL_VBTST_e; } J3DModelData* modelData = (J3DModelData *) dComIfG_getObjectRes(m_arc_name, file_index); diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 570757756..0b67d958a 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_pedestal.h" #include "d/d_com_inf_game.h" -#include "d/res/res_hdai1.h" +#include "res/Object/Hdai1.h" namespace daPedestal { @@ -31,7 +31,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000000FC-00000244 .text CreateHeap__Q210daPedestal7daPds_cFv */ BOOL daPds_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HDAI1_BDL_HDAI1); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HDAI1_BDL_HDAI1_e); JUT_ASSERT(0xC1, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U); @@ -46,7 +46,7 @@ BOOL daPds_c::CreateHeap() { mpBgW = new dBgW(); if (mpBgW != NULL) { - if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, HDAI1_DZB_HDAI), cBgW::MOVE_BG_e, &mMtx) == true) { + if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HDAI1_DZB_HDAI_e), cBgW::MOVE_BG_e, &mMtx) == true) { return FALSE; } else { return TRUE; @@ -345,7 +345,7 @@ BOOL daPds_c::initBrkAnm(u8 param_1, bool param_2) { J3DModelData* modelData = mpModel->getModelData(); bool ret = false; - J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, HDAI1_BRK_HDAI1); + J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HDAI1_BRK_HDAI1_e); JUT_ASSERT(0x28C, a_brk != NULL); if (mBrk.init(modelData, a_brk, TRUE, brkAnmTbl[param_1].loopMode, brkAnmTbl[param_1].speed, 0, -1, param_2, 0)) { diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index 6ee625054..baec29adb 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -5,8 +5,8 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_pirate_flag.h" -#include "d/res/res_kaizokusen.h" -#include "d/res/res_cloth.h" +#include "res/Object/Kaizokusen.h" +#include "res/Object/Cloth.h" #include "d/actor/d_a_obj_pirateship.h" #include "d/d_kankyo_wether.h" @@ -240,7 +240,7 @@ void daPirate_Flag_packet_c::draw() { GXSetArray(GX_VA_TEX0, l_texCoord, sizeof(*l_texCoord)); GXTexObj texObj; - ResTIMG* timg = static_cast(dComIfG_getObjectRes("Kaizokusen", KAIZOKUSEN_INDEX_BTI_TXA_KAIZOKU_HATA)); + ResTIMG* timg = static_cast(dComIfG_getObjectRes("Kaizokusen", dRes_INDEX_KAIZOKUSEN_BTI_TXA_KAIZOKU_HATA_e)); GXInitTexObj(&texObj, (char*)timg + timg->imageOffset, timg->width, timg->height, (GXTexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT, (GXBool)(timg->mipmapCount > 1)); @@ -250,7 +250,7 @@ void daPirate_Flag_packet_c::draw() { (GXAnisotropy)timg->maxAnisotropy); GXLoadTexObj(&texObj, GX_TEXMAP0); - timg = static_cast(dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON)); + timg = static_cast(dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e)); GXInitTexObj(&texObj, (char*)timg + timg->imageOffset, timg->width, timg->height, (GXTexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT, (GXBool)(timg->mipmapCount > 1)); diff --git a/src/d/actor/d_a_player_battle.inc b/src/d/actor/d_a_player_battle.inc index b99088aa3..a27871846 100644 --- a/src/d/actor/d_a_player_battle.inc +++ b/src/d/actor/d_a_player_battle.inc @@ -153,9 +153,9 @@ BOOL daPy_lk_c::procBtJumpCut_init(cXyz* param_0) { m_HIO->mBattle.mBJump.m.field_0x2C ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MJMPCA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_MJMPCA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MJMPCMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_MJMPCMS_e)); } m35EC = m_HIO->mBattle.mBJump.m.field_0x30; mNormalSpeed = 0.0f; @@ -165,7 +165,7 @@ BOOL daPy_lk_c::procBtJumpCut_init(cXyz* param_0) { mProcVar6.m3570 = 0; dComIfGp_setPlayerStatus0(0, (daPyStts0_UNK2_e | daPyStts0_UNK400_e)); voiceStart(1); - setBlurPosResource(LKANM__BTJUMPCUT_POS); + setBlurPosResource(dRes_INDEX_LKANM__BTJUMPCUT_POS_e); setExtraFinishCutAtParam(CUT_TYPE_BT_JUMPCUT); dComIfGp_getVibration().StartShock(6, -0x21, cXyz(0.0f, 1.0f, 0.0f)); return true; @@ -316,12 +316,12 @@ BOOL daPy_lk_c::procBtRollCut_init(cXyz* param_0) { dVar4 = ANM_MROLLLC; mProcVar6.m3570 = 1; m34EC = 1; - setBlurPosResource(LKANM__BTROTATECUTL_POS); + setBlurPosResource(dRes_INDEX_LKANM__BTROTATECUTL_POS_e); } else { dVar4 = ANM_MROLLRC; mProcVar6.m3570 = -1; m34EC = -1; - setBlurPosResource(LKANM__BTROTATECUTR_POS); + setBlurPosResource(dRes_INDEX_LKANM__BTROTATECUTR_POS_e); } setSingleMoveAnime( @@ -333,9 +333,9 @@ BOOL daPy_lk_c::procBtRollCut_init(cXyz* param_0) { ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MROLLCA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_MROLLCA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MROLLCMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_MROLLCMS_e)); } m35EC = m_HIO->mBattle.mBRoll.m.field_0x20; diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc index b6b9b1c22..c5c34039c 100644 --- a/src/d/actor/d_a_player_boomerang.inc +++ b/src/d/actor/d_a_player_boomerang.inc @@ -74,7 +74,7 @@ BOOL daPy_lk_c::returnBoomerang() { BOOL daPy_lk_c::checkNextActionBoomerangReady() { if (!itemButton() && (mpAttnActorLockOn != NULL || dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000010_e))) { setActAnimeUpper( - LKANM_BCK_BOOMTHROW, + dRes_INDEX_LKANM_BCK_BOOMTHROW_e, UPPER_MOVE2_e, m_HIO->mItem.mBoom.m.field_0x4, m_HIO->mItem.mBoom.m.field_0x8, @@ -93,7 +93,7 @@ void daPy_lk_c::checkNextActionBoomerangFly() { checkNextActionBoomerangReady(); } else if (itemTrigger() && mEquipItem == getReadyItem()) { setActAnimeUpper( - LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, m_HIO->mItem.mBoom.m.field_0x18, 0.0f, -1, m_HIO->mBasic.m.field_0xC + dRes_INDEX_LKANM_BCK_BOOMWAIT_e, UPPER_MOVE2_e, m_HIO->mItem.mBoom.m.field_0x18, 0.0f, -1, m_HIO->mBasic.m.field_0xC ); } } @@ -117,7 +117,7 @@ BOOL daPy_lk_c::changeBoomerangCatchProc() { (checkNoUpperAnime() || checkBoomerangThrowAnime())) { setActAnimeUpper( - LKANM_BCK_BOOMCATCH, + dRes_INDEX_LKANM_BCK_BOOMCATCH_e, UPPER_MOVE2_e, m_HIO->mItem.mBoom.m.field_0x20, m_HIO->mItem.mBoom.m.field_0x24, @@ -145,7 +145,7 @@ BOOL daPy_lk_c::procBoomerangSubject_init() { mNormalSpeed = 0.0f; - setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_BOOMWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); dComIfGp_setPlayerStatus0(0, daPyStts0_BOOMERANG_AIM_e); @@ -201,7 +201,7 @@ BOOL daPy_lk_c::procBoomerangMove_init() { mDirection = DIR_RIGHT; current.angle.y = shape_angle.y + -0x4000; } - setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, m_HIO->mItem.mBoom.m.field_0x18, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_BOOMWAIT_e, UPPER_MOVE2_e, m_HIO->mItem.mBoom.m.field_0x18, 0.0f, -1, -1.0f); setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); dComIfGp_setPlayerStatus0(0, daPyStts0_BOOMERANG_AIM_e); return true; diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc index b9b7f704b..d115fb5ae 100644 --- a/src/d/actor/d_a_player_bottle.inc +++ b/src/d/actor/d_a_player_bottle.inc @@ -29,9 +29,9 @@ int daPy_lk_c::changeBottleDrinkFace(int param_0) { void daPy_lk_c::setBottleModel(u16 param_0) { mEquipItem = param_0; JKRHeap* oldHeap = setItemHeap(); - J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_BOTTLEEMP, 0x37221222); + J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_BOTTLEEMP_e, 0x37221222); u8* buffer = new (0x20) u8[0x400]; - JKRReadIdxResource(buffer, 0x400, LKANM_BTK_TBOTTLE, dComIfGp_getAnmArchive()); + JKRReadIdxResource(buffer, 0x400, dRes_INDEX_LKANM_BTK_TBOTTLE_e, dComIfGp_getAnmArchive()); mpEquipItemBtk = static_cast(J3DAnmLoaderDataBase::load(buffer)); mpEquipItemBtk->setFrame(0.0f); mpEquipItemBtk->searchUpdateMaterialID(tmp_modelData); @@ -42,13 +42,13 @@ void daPy_lk_c::setBottleModel(u16 param_0) { { u16 bdl; if (param_0 == dItemNo_HALF_SOUP_BOTTLE_e) { - bdl = LINK_BDL_BINLIQUIDH; + bdl = dRes_INDEX_LINK_BDL_BINLIQUIDH_e; } else { - bdl = LINK_BDL_BINLIQUID; + bdl = dRes_INDEX_LINK_BDL_BINLIQUID_e; } tmp_modelData = initModel(&mpBottleContentsModel, bdl, 0x13000022); buffer = new (0x20) u8[0x400]; - JKRReadIdxResource(buffer, 0x400, LKANM_BRK_TBINLIQUID, dComIfGp_getAnmArchive()); + JKRReadIdxResource(buffer, 0x400, dRes_INDEX_LKANM_BRK_TBINLIQUID_e, dComIfGp_getAnmArchive()); mpEquipItemBrk = static_cast(J3DAnmLoaderDataBase::load(buffer)); if (param_0 == dItemNo_RED_POTION_e) { mpEquipItemBrk->setFrame(0.0f); @@ -64,18 +64,18 @@ void daPy_lk_c::setBottleModel(u16 param_0) { mpEquipItemBrk->searchUpdateMaterialID(tmp_modelData); tmp_modelData->entryTevRegAnimator(mpEquipItemBrk); } else if (param_0 == dItemNo_FAIRY_BOTTLE_e) { - tmp_modelData = initModel(&mpBottleContentsModel, LINK_BDL_BINFAIRY, 0x13000022); + tmp_modelData = initModel(&mpBottleContentsModel, dRes_INDEX_LINK_BDL_BINFAIRY_e, 0x13000022); } else if (param_0 == dItemNo_FIREFLY_BOTTLE_e) { - tmp_modelData = initModel(&mpBottleContentsModel, LINK_BDL_BINHO, 0x13000022); + tmp_modelData = initModel(&mpBottleContentsModel, dRes_INDEX_LINK_BDL_BINHO_e, 0x13000022); buffer = new (0x20) u8[0x400]; - JKRReadIdxResource(buffer, 0x400, LKANM_BRK_TBINHO, dComIfGp_getAnmArchive()); + JKRReadIdxResource(buffer, 0x400, dRes_INDEX_LKANM_BRK_TBINHO_e, dComIfGp_getAnmArchive()); mpEquipItemBrk = static_cast(J3DAnmLoaderDataBase::load(buffer)); mpEquipItemBrk->searchUpdateMaterialID(tmp_modelData); tmp_modelData->entryTevRegAnimator(mpEquipItemBrk); m3600 = 0.0f; } if (param_0 != dItemNo_EMPTY_BOTTLE_e && mCurProc != daPyProc_BOTTLE_DRINK_e) { - tmp_modelData = initModel(&mpBottleCapModel, LINK_BDL_BOTTLECAP, 0x13000022); + tmp_modelData = initModel(&mpBottleCapModel, dRes_INDEX_LINK_BDL_BOTTLECAP_e, 0x13000022); m355E = 1; } mDoExt_setCurrentHeap(oldHeap); @@ -130,7 +130,7 @@ BOOL daPy_lk_c::procBottleDrink() { setShipRidePosUseItem(); J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; u16 uVar1 = m_anm_heap_under[UNDER_MOVE0_e].mIdx; - if (uVar1 == LKANM_BCK_BINDRINKPRE) { + if (uVar1 == dRes_INDEX_LKANM_BCK_BINDRINKPRE_e) { if (frameCtrl.getRate() < 0.01f) { setSingleMoveAnime(ANM_BINDRINKING, m_HIO->mItem.mBottle.m.field_0x64, 0.0f, -1, 0.0f); if (changeBottleDrinkFace(mEquipItem)) { @@ -151,7 +151,7 @@ BOOL daPy_lk_c::procBottleDrink() { voiceStart(39); } } - } else if (uVar1 == LKANM_BCK_BINDRINKING) { + } else if (uVar1 == dRes_INDEX_LKANM_BCK_BINDRINKING_e) { if (dComIfGp_getItemNowLife() == dComIfGs_getLife() && dComIfGp_getItemNowMagic() == dComIfGs_getMagic()) { @@ -252,7 +252,7 @@ BOOL daPy_lk_c::procBottleOpen() { setShipRidePosUseItem(); - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_BINOPENPRE) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_BINOPENPRE_e) { if (frameCtrl.getRate() < 0.01f) { if (mEquipItem == dItemNo_FAIRY_BOTTLE_e) { setSingleMoveAnime( diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index 07be27d90..51d3bf52b 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -91,14 +91,14 @@ void daPy_lk_c::deleteArrow() { /* 8014A1CC-8014A2A0 .text setBowReadyAnime__9daPy_lk_cFv */ void daPy_lk_c::setBowReadyAnime() { setActAnimeUpper( - LKANM_BCK_ARROWSHOOT, + dRes_INDEX_LKANM_BCK_ARROWSHOOT_e, UPPER_MOVE2_e, 1.0f, m_HIO->mItem.mBow.m.field_0x0 - 0.001f, m_HIO->mItem.mBow.m.field_0x0, 10.0f ); - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWSHOOTA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_ARROWSHOOTA_e)); m35EC = m_HIO->mItem.mBow.m.field_0x0 - 0.001f; setPriTextureAnime(0x70, 0); m355E = 10; @@ -108,7 +108,7 @@ void daPy_lk_c::setBowReadyAnime() { /* 8014A2A0-8014A328 .text setBowReloadAnime__9daPy_lk_cFv */ void daPy_lk_c::setBowReloadAnime() { setActAnimeUpper( - LKANM_BCK_ARROWRELORD, + dRes_INDEX_LKANM_BCK_ARROWRELORD_e, UPPER_MOVE2_e, m_HIO->mItem.mBow.m.field_0x10, m_HIO->mItem.mBow.m.field_0x14, @@ -116,7 +116,7 @@ void daPy_lk_c::setBowReloadAnime() { m_HIO->mItem.mBow.m.field_0x18 ); setPriTextureAnime(0x8d, 0); - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWRELORDA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_ARROWRELORDA_e)); m35EC = 0.0f; seStartOnlyReverb(JA_SE_LK_DRAW_BOW); } @@ -127,7 +127,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() { daArrow_c* arrow = (daArrow_c*)mActorKeepEquip.getActor(); if (m355C != 0) { setActAnimeUpper( - LKANM_BCK_ARROWSHOOT, + dRes_INDEX_LKANM_BCK_ARROWSHOOT_e, UPPER_MOVE2_e, m_HIO->mItem.mBow.m.field_0x4, m_HIO->mItem.mBow.m.field_0x8, @@ -135,7 +135,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() { m_HIO->mItem.mBow.m.field_0xC ); setPriTextureAnime(0x70, 0); - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWSHOOTA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_ARROWSHOOTA_e)); m35EC = 0.0f; } else if (bowButton() == NULL) { if (arrow != NULL) { @@ -160,8 +160,8 @@ BOOL daPy_lk_c::checkNextActionBowReady() { } } else if (checkBowReloadAnime()) { if (mFrameCtrlUpper[UPPER_MOVE2_e].getRate() < 0.01f) { - setActAnimeUpper(LKANM_BCK_BOWWAIT, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_BOWWAITA)); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_BOWWAIT_e, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_BOWWAITA_e)); m35EC = 0.0f; setPriTextureAnime(0x70, 0); } @@ -214,9 +214,9 @@ BOOL daPy_lk_c::checkNextBowMode() { /* 8014A6F4-8014A834 .text setBowModel__9daPy_lk_cFv */ void daPy_lk_c::setBowModel() { - J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_ARROWRELORDA); + J3DAnmTransform* bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_ARROWRELORDA_e); JKRHeap* oldHeap = setItemHeap(); - J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_BOW, 0x37221222); + J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_BOW_e, 0x37221222); int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(394, FALSE); diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index 14c1dd452..5a7a9aeb8 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -43,15 +43,15 @@ fopAc_ac_c* daPy_lk_c::getDemoLookActor() { /* 8012CDD4-8012CE2C .text setTinkleCeiverModel__9daPy_lk_cFv */ void daPy_lk_c::setTinkleCeiverModel() { JKRHeap* oldHeap = setItemHeap(); - initModel(&mpEquipItemModel, LINK_BDL_TCEIVER, 0x13000022); + initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_TCEIVER_e, 0x13000022); mDoExt_setCurrentHeap(oldHeap); } /* 8012CE2C-8012CEFC .text setTalismanModel__9daPy_lk_cFv */ void daPy_lk_c::setTalismanModel() { - J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_TETOLACH); + J3DAnmTransform* bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_TETOLACH_e); JKRHeap* oldHeap = setItemHeap(); - J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_TETOLACH, 0x13000022); + J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_TETOLACH_e, 0x13000022); int ret = mSwordAnim.init(tmp_modelData, bck, true, J3DFrameCtrl::EMode_LOOP, 0.2f, 0, -1, false); if (!ret) { JUT_ASSERT(82, FALSE); @@ -62,9 +62,9 @@ void daPy_lk_c::setTalismanModel() { /* 8012CEFC-8012CFE8 .text setLetterModel__9daPy_lk_cFv */ void daPy_lk_c::setLetterModel() { if (mEquipItem != daPyItem_UNK104_e) { - J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_GETLETTERA); + J3DAnmTransform* bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_GETLETTERA_e); JKRHeap* oldHeap = setItemHeap(); - J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_LETTER, 0x13000022); + J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_LETTER_e, 0x13000022); int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(120, FALSE); @@ -664,7 +664,7 @@ BOOL daPy_lk_c::dProcGetItem_init() { if (mCurProc == daPyProc_DEMO_OPEN_TREASURE_e) { m34C2 = 10; mAcch.ClrWallNone(); - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_BOXOPENLINK) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != dRes_INDEX_LKANM_BCK_BOXOPENLINK_e) { sVar5 = TRUE; } } else if (mCurProc == daPyProc_DEMO_OPEN_SALVAGE_TREASURE_e) { @@ -2026,20 +2026,20 @@ BOOL daPy_lk_c::dProcLetterRead() { setShipRidePosUseItem(); if (checkNoResetFlg1(daPyFlg1_LETTER_READ_EYE_MOVE)) { offNoResetFlg1(daPyFlg1_LETTER_READ_EYE_MOVE); - m_tex_scroll_heap.mIdx = LKANM_BTK_TEDL; - setTextureScrollResource(loadTextureScrollResource(LKANM_BTK_TEDL, 0), 0); + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEDL_e; + setTextureScrollResource(loadTextureScrollResource(dRes_INDEX_LKANM_BTK_TEDL_e, 0), 0); mProcVar0.m34D0 = 4; } else { if (0 < mProcVar0.m34D0) { mProcVar0.m34D0--; if (mProcVar0.m34D0 == 0) { - if (m_tex_scroll_heap.mIdx == LKANM_BTK_TEDL) { + if (m_tex_scroll_heap.mIdx == dRes_INDEX_LKANM_BTK_TEDL_e) { mProcVar0.m34D0 = 4; - m_tex_scroll_heap.mIdx = LKANM_BTK_TEDR; - setTextureScrollResource(loadTextureScrollResource(LKANM_BTK_TEDR, 0), 0); + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEDR_e; + setTextureScrollResource(loadTextureScrollResource(dRes_INDEX_LKANM_BTK_TEDR_e, 0), 0); } else { - m_tex_scroll_heap.mIdx = LKANM_BTK_TEDW; - setTextureScrollResource(loadTextureScrollResource(LKANM_BTK_TEDW, 0), 0); + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEDW_e; + setTextureScrollResource(loadTextureScrollResource(dRes_INDEX_LKANM_BTK_TEDW_e, 0), 0); } } } @@ -2178,7 +2178,7 @@ BOOL daPy_lk_c::dProcBottleOpenFairy_init() { BOOL daPy_lk_c::dProcBottleOpenFairy() { J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_BINOPENPRE) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_BINOPENPRE_e) { if (frameCtrl.getRate() < 0.01f) { setSingleMoveAnime( ANM_BINOPENB, @@ -2413,14 +2413,14 @@ BOOL daPy_lk_c::dProcLastCombo_init() { setSwordModel(FALSE); #endif } - bck = getItemAnimeResource(LKANM_BCK_COMBO_KEN); + bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_COMBO_KEN_e); mSwordAnim.changeBckOnly(bck); m35E8 = m35EC = 0.0f; - bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_COMBO_TATE); + bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BCK_COMBO_TATE_e); mAtngshaBck.init(mpShmsModel->getModelData(), bck, false, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, true); setFootEffectPosType(4); offNoResetFlg1(daPyFlg1_LAST_COMBO_WAIT); - setBlurPosResource(LKANM__LASTCOMBO_POS); + setBlurPosResource(dRes_INDEX_LKANM__LASTCOMBO_POS_e); mProcVar6.m3570 = 1; mProcVar7.m3574 = 0; seStartOnlyReverb(JA_SE_LK_V_TURN_INTO_GN); diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 22974fcd1..ccee7af3a 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -118,9 +118,9 @@ BOOL daPy_lk_c::checkFanGlideProc(int param_0) { /* 8014BEEC-8014BFBC .text setFanModel__9daPy_lk_cFv */ void daPy_lk_c::setFanModel() { - J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_USEFANAA); + J3DAnmTransform* bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_USEFANAA_e); JKRHeap* oldHeap = setItemHeap(); - J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_FAN, 0x37221222); + J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_FAN_e, 0x37221222); int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(242, FALSE); @@ -131,9 +131,9 @@ void daPy_lk_c::setFanModel() { /* 8014BFBC-8014C0C0 .text setSmallFanModel__9daPy_lk_cFv */ void daPy_lk_c::setSmallFanModel() { J3DModelData* tmp_modelData; - J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_FANWAIT); + J3DAnmTransform* bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_FANWAIT_e); JKRHeap* oldHeap = setItemHeap(); - tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_FANSMALL, 0x37221222); + tmp_modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_FANSMALL_e, 0x37221222); int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(275, FALSE); @@ -148,9 +148,9 @@ void daPy_lk_c::setSmallFanModel() { /* 8014C0C0-8014C254 .text setParachuteFanModel__9daPy_lk_cFf */ void daPy_lk_c::setParachuteFanModel(f32 f31) { J3DModelData* modelData; - J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_FANBA); + J3DAnmTransform* bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_FANBA_e); JKRHeap* oldHeap = setItemHeap(); - modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_FANB)); + modelData = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BDL_FANB_e)); mpParachuteFanMorf = new mDoExt_McaMorf( modelData, @@ -455,7 +455,7 @@ BOOL daPy_lk_c::procFanGlide() { m_HIO->mItem.mFan.m.field_0x2C ); mpParachuteFanMorf->setAnm( - getItemAnimeResource(LKANM_BCK_FANBA), + getItemAnimeResource(dRes_INDEX_LKANM_BCK_FANBA_e), 0, m_HIO->mItem.mFan.m.field_0x2C, m_HIO->mItem.mFan.m.field_0x20, @@ -511,7 +511,7 @@ BOOL daPy_lk_c::procFanGlide() { mProcVar6.m3570 = 1; setSingleMoveAnime(ANM_USEFANB2, fVar1, 0.0f, -1, m_HIO->mItem.mFan.m.field_0x30); mpParachuteFanMorf->setAnm( - getItemAnimeResource(LKANM_BCK_FANB2A), + getItemAnimeResource(dRes_INDEX_LKANM_BCK_FANB2A_e), 0, m_HIO->mItem.mFan.m.field_0x30, 1.0f, @@ -541,7 +541,7 @@ BOOL daPy_lk_c::procFanGlide() { m_HIO->mItem.mFan.m.field_0x34 ); mpParachuteFanMorf->setAnm( - getItemAnimeResource(LKANM_BCK_FANBA), + getItemAnimeResource(dRes_INDEX_LKANM_BCK_FANBA_e), 0, m_HIO->mItem.mFan.m.field_0x34, m_HIO->mItem.mFan.m.field_0x20, diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index 9fd66bfcf..f11a9f0d5 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -23,7 +23,7 @@ void daPy_lk_c::setHyoiModel() { return; } JKRHeap* oldHeap = setItemHeap(); - initModel(&mpEquipItemModel, LINK_BDL_HYOINOMI, 0x13000022); + initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_HYOINOMI_e, 0x13000022); mDoExt_setCurrentHeap(oldHeap); mEquipItem = dItemNo_HYOI_PEAR_e; } diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index b3c6d324e..c4c250e8e 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -131,7 +131,7 @@ void daPy_lk_c::setGrabItemPos() { grab_actor->current.pos = ((mLeftHandPos + mRightHandPos) * 0.5f); grab_actor->current.pos.y += field_0x2b0; f32 fVar1; - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_GRABUP) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_GRABUP_e) { dVar10 = 1.0f - ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() - mFrameCtrlUnder[UNDER_MOVE0_e].getStart()) / (mFrameCtrlUnder[UNDER_MOVE0_e].getEnd() - mFrameCtrlUnder[UNDER_MOVE0_e].getStart())); @@ -288,14 +288,14 @@ void daPy_lk_c::initGrabNextMode() { procGrabHeavyWait_init(); } else { if (!checkGrabAnime()) { - setActAnimeUpper(LKANM_BCK_GRABWAITB, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_GRABWAITB_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); } m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f); checkNextMode(0); } } else { if (!checkGrabAnime()) { - setActAnimeUpper(LKANM_BCK_GRABWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_GRABWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); } m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f); checkNextMode(0); @@ -452,7 +452,7 @@ BOOL daPy_lk_c::procGrabUp() { } } else { if (!checkGrabAnime()) { - setActAnimeUpper(LKANM_BCK_GRABWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_GRABWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f); } if (checkNextMode(1)) { @@ -711,12 +711,12 @@ BOOL daPy_lk_c::procGrabWait_init() { if (checkGrabSpecialHeavyState()) { setSingleMoveAnime(ANM_GRABWAITB, m_HIO->mGrab.m.field_0x90, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); if (!checkGrabAnime()) { - setActAnimeUpper(LKANM_BCK_GRABWAITB, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_GRABWAITB_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); } } else { setSingleMoveAnime(ANM_GRABWAIT, m_HIO->mGrab.m.field_0x78, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); if (!checkGrabAnime()) { - setActAnimeUpper(LKANM_BCK_GRABWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_GRABWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); } } m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f); @@ -748,7 +748,7 @@ BOOL daPy_lk_c::procGrabWait() { if (m35D8 <= -29.0f) { if ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > 0.0f) && mProcVar6.m3570 == 0) { mProcVar6.m3570 = 1; - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_GRABWAIT) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_GRABWAIT_e) { seStartMapInfo(JA_SE_LK_BARREL_PUT_ON); } } @@ -788,7 +788,7 @@ BOOL daPy_lk_c::procGrabWait() { BOOL daPy_lk_c::procGrabHeavyWait_init() { commonProcInit(daPyProc_GRAB_HEAVY_WAIT_e); setSingleMoveAnime(ANM_GRABWAITB, m_HIO->mGrab.m.field_0x90, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); - setActAnimeUpper(LKANM_BCK_GRABWAITB, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_GRABWAITB_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f); current.angle.y = shape_angle.y; mNormalSpeed = 0.0f; diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc index c889f2a53..32a51f1f4 100644 --- a/src/d/actor/d_a_player_hammer.inc +++ b/src/d/actor/d_a_player_hammer.inc @@ -18,9 +18,9 @@ extern JGeometry::TVec3 l_hammer_splash_particle_scale; /* 8015023C-80150324 .text setHammerModel__9daPy_lk_cFv */ void daPy_lk_c::setHammerModel() { - J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_HAMMERDAM); + J3DAnmTransform* bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_HAMMERDAM_e); JKRHeap* oldHeap = setItemHeap(); - J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_HAMMER, 0x37221222); + J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_HAMMER_e, 0x37221222); int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(32, FALSE); @@ -181,9 +181,9 @@ BOOL daPy_lk_c::procHammerSideSwing_init() { mNormalSpeed = 0.0f; voiceStart(1); mProcVar2.m34D4 = shape_angle.y; - setBlurPosResource(LKANM__HAMMERSIDE_POS); + setBlurPosResource(dRes_INDEX_LKANM__HAMMERSIDE_POS_e); setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK0, dCcG_SE_METAL, dCcG_AtHitMark_Nrm_e, CUT_TYPE_HAMMER_SIDESWING, 50.0f); - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGAA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_HAMSWINGAA_e)); m35EC = m_HIO->mItem.mHam.m.field_0xC; return true; } @@ -256,7 +256,7 @@ BOOL daPy_lk_c::procHammerFrontSwingReady_init() { } setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK0, dCcG_SE_METAL, dCcG_AtHitMark_Nrm_e, CUT_TYPE_HAMMER_FRONTSWING, 50.0f); voiceStart(7); - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGBPREA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_HAMSWINGBPREA_e)); m35EC = m_HIO->mItem.mHam.m.field_0x24; m355C = 0; return true; @@ -303,12 +303,12 @@ BOOL daPy_lk_c::procHammerFrontSwing_init() { mProcVar2.m34D4 = m34E8; } mProcVar2.m34D4 = shape_angle.y; - setBlurPosResource(LKANM__HAMMERFRONT_POS); + setBlurPosResource(dRes_INDEX_LKANM__HAMMERFRONT_POS_e); mCutType = CUT_TYPE_HAMMER_FRONTSWING; offResetFlg0(daPyRFlg0_NOT_ATTACKING); onResetFlg0(daPy_RFLG0(daPyRFlg0_UNK1 | daPyRFlg0_UNK2)); mProcVar0.m34D0 = 0; - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGBHITA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_HAMSWINGBHITA_e)); m35EC = m_HIO->mItem.mHam.m.field_0x30; return true; } diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index 3eae5959e..603869e6b 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -43,9 +43,9 @@ BOOL daPy_lk_c::setHookshotCarryOffset(fpc_ProcID carryActorID, const cXyz* offs /* 8014ABF4-8014ACCC .text setHookshotModel__9daPy_lk_cFv */ void daPy_lk_c::setHookshotModel() { - J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_HOOKSHOTA); + J3DAnmTransform* bck = getItemAnimeResource(dRes_INDEX_LKANM_BCK_HOOKSHOTA_e); JKRHeap* oldHeap = setItemHeap(); - J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_HOOKSHOT, 0x37221222); + J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_HOOKSHOT_e, 0x37221222); int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(100, FALSE); @@ -204,7 +204,7 @@ BOOL daPy_lk_c::procHookshotSubject_init() { mNormalSpeed = 0.0f; - setActAnimeUpper(LKANM_BCK_HOOKSHOTWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_HOOKSHOTWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); setSingleMoveAnime(ANM_ATNLS, 0.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e); @@ -257,7 +257,7 @@ BOOL daPy_lk_c::procHookshotMove_init() { } daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); if (hookshot->checkWait()) { - setActAnimeUpper(LKANM_BCK_HOOKSHOTWAIT, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_HOOKSHOTWAIT_e, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); } dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 5d07fd510..ccd575676 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -363,8 +363,8 @@ BOOL daPy_lk_c::jointBeforeCB(int jnt_no, J3DTransformInfo* param_2, Quaternion* } if ((checkUpperGuardAnime() && mCurProc != daPyProc_BACK_JUMP_e) || checkGrabAnime() || - m_anm_heap_upper[UPPER_MOVE0_e].mIdx == LKANM_BCK_ATNBOKO || - m_anm_heap_upper[UPPER_MOVE0_e].mIdx == LKANM_BCK_ATNHAM || + m_anm_heap_upper[UPPER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_ATNBOKO_e || + m_anm_heap_upper[UPPER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_ATNHAM_e || checkUpperReadyThrowAnime()) { if (jnt_no == 0) { @@ -431,7 +431,7 @@ BOOL daPy_lk_c::jointCB0(int param_1) { } } } else if (checkUpperReadyAnime() || - checkUpperAnime(LKANM_BCK_ROPETHROW) || + checkUpperAnime(dRes_INDEX_LKANM_BCK_ROPETHROW_e) || (mCurProc != daPyProc_GRAB_WAIT_e && checkGrabAnime())) { if (param_1 == 0xF) { @@ -669,7 +669,7 @@ BOOL daPy_lk_c::checkBossBgm() { /* 801046CC-801046EC .text checkMabaAnimeBtp__9daPy_lk_cFi */ BOOL daPy_lk_c::checkMabaAnimeBtp(int anmIdx) { - if (anmIdx >= LKANM_BTP_TMABAA && anmIdx <= LKANM_BTP_TMABAJ) { + if (anmIdx >= dRes_INDEX_LKANM_BTP_TMABAA_e && anmIdx <= dRes_INDEX_LKANM_BTP_TMABAJ_e) { return TRUE; } return FALSE; @@ -686,10 +686,10 @@ u16 daPy_lk_c::checkNormalFace() { if (checkResetFlg0(daPyRFlg0_UNK40000)) { return daPyFace_TMABAG; } - if (checkUpperAnime(LKANM_BCK_GRABWAITB)) { + if (checkUpperAnime(dRes_INDEX_LKANM_BCK_GRABWAITB_e)) { return daPyFace_TMABAJ_TEYORIME; } - if (checkUpperAnime(LKANM_BCK_GRABWAIT)) { + if (checkUpperAnime(dRes_INDEX_LKANM_BCK_GRABWAIT_e)) { return daPyFace_TMABAE; } if (daPy_dmEcallBack_c::checkCurse() || checkRestHPAnime()) { @@ -726,7 +726,7 @@ u16 daPy_lk_c::checkNormalFace() { if (mEquipItem != daPyItem_NONE_e) { return daPyFace_TMABAB; } - if (m_anm_heap_under[UNDER_MOVE1_e].mIdx == LKANM_BCK_WALKSLOPE) { + if (m_anm_heap_under[UNDER_MOVE1_e].mIdx == dRes_INDEX_LKANM_BCK_WALKSLOPE_e) { return daPyFace_TMABAC; } if (mCurProc == daPyProc_MOVE_e) { @@ -742,8 +742,8 @@ u16 daPy_lk_c::checkNormalFace() { } if (mCurProc == daPyProc_WAIT_e && !dComIfGp_event_runCheck()) { f32 dVar7 = cM_rnd(); - if (((m_tex_anm_heap.mIdx == LKANM_BTP_TMABAA || m_tex_anm_heap.mIdx == LKANM_BTP_TMABAB) && dVar7 < 0.01f) || - (m_tex_anm_heap.mIdx == LKANM_BTP_TMABACC && dVar7 >= 0.01f)) + if (((m_tex_anm_heap.mIdx == dRes_INDEX_LKANM_BTP_TMABAA_e || m_tex_anm_heap.mIdx == dRes_INDEX_LKANM_BTP_TMABAB_e) && dVar7 < 0.01f) || + (m_tex_anm_heap.mIdx == dRes_INDEX_LKANM_BTP_TMABACC_e && dVar7 >= 0.01f)) { return daPyFace_TMABACC; } @@ -791,29 +791,29 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) { daPy_matAnm_c::getMabaFlg() != 0 && !dComIfGp_event_runCheck() && mpAttnActorLockOn == NULL && - btk_idx == LKANM_BTK_TMABA) + btk_idx == dRes_INDEX_LKANM_BTK_TMABA_e) { if (daPy_matAnm_c::getMabaTimer() == 0) { if (dVar9 < 0.44f) { - btk_idx = LKANM_BTK_TMABA; + btk_idx = dRes_INDEX_LKANM_BTK_TMABA_e; } else { param_2 = 0; if (dVar9 < 0.51f) { - btk_idx = LKANM_BTK_TEUP; + btk_idx = dRes_INDEX_LKANM_BTK_TEUP_e; } else if (dVar9 < 0.58f) { - btk_idx = LKANM_BTK_TEDW; + btk_idx = dRes_INDEX_LKANM_BTK_TEDW_e; } else if (dVar9 < 0.65f) { - btk_idx = LKANM_BTK_TEL; + btk_idx = dRes_INDEX_LKANM_BTK_TEL_e; } else if (dVar9 < 0.72f) { - btk_idx = LKANM_BTK_TER; + btk_idx = dRes_INDEX_LKANM_BTK_TER_e; } else if (dVar9 < 0.79f) { - btk_idx = LKANM_BTK_TEDL; + btk_idx = dRes_INDEX_LKANM_BTK_TEDL_e; } else if (dVar9 < 0.86f) { - btk_idx = LKANM_BTK_TEDR; + btk_idx = dRes_INDEX_LKANM_BTK_TEDR_e; } else if (dVar9 < 0.93f) { - btk_idx = LKANM_BTK_TEUR; + btk_idx = dRes_INDEX_LKANM_BTK_TEUR_e; } else { - btk_idx = LKANM_BTK_TEUL; + btk_idx = dRes_INDEX_LKANM_BTK_TEUL_e; } } m_tex_scroll_heap.mIdx = btk_idx; @@ -822,7 +822,7 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) { { setTextureScrollResource(loadTextureScrollResource(btk_idx, 0), param_2); } - if (btk_idx != LKANM_BTK_TMABA) { + if (btk_idx != dRes_INDEX_LKANM_BTK_TMABA_e) { daPy_matAnm_c::onMabaFlg(); } } @@ -834,25 +834,25 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) { } } } else if (bVar3 && checkModeFlg(ModeFlg_00000001) && !dComIfGp_event_runCheck() && - daPy_matAnm_c::getMabaTimer() == 0 && mpAttnActorLockOn == NULL && btk_idx == LKANM_BTK_TMABA && + daPy_matAnm_c::getMabaTimer() == 0 && mpAttnActorLockOn == NULL && btk_idx == dRes_INDEX_LKANM_BTK_TMABA_e && m_tex_scroll_heap.field_0x2 == 0xFFFF && m_tex_scroll_heap.field_0x4 == 0xFFFF && cM_rnd() < 0.025f) { if (dVar9 < 0.125f) { - m_tex_scroll_heap.mIdx = LKANM_BTK_TEUP; + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEUP_e; } else if (dVar9 < 0.25f) { - m_tex_scroll_heap.mIdx = LKANM_BTK_TEDW; + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEDW_e; } else if (dVar9 < 0.375f) { - m_tex_scroll_heap.mIdx = LKANM_BTK_TEL; + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEL_e; } else if (dVar9 < 0.5f) { - m_tex_scroll_heap.mIdx = LKANM_BTK_TER; + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TER_e; } else if (dVar9 < 0.625f) { - m_tex_scroll_heap.mIdx = LKANM_BTK_TEDL; + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEDL_e; } else if (dVar9 < 0.75f) { - m_tex_scroll_heap.mIdx = LKANM_BTK_TEDR; + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEDR_e; } else if (dVar9 < 0.875f) { - m_tex_scroll_heap.mIdx = LKANM_BTK_TEUL; + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEUL_e; } else { - m_tex_scroll_heap.mIdx = LKANM_BTK_TEUR; + m_tex_scroll_heap.mIdx = dRes_INDEX_LKANM_BTK_TEUR_e; } setTextureScrollResource(loadTextureScrollResource(m_tex_scroll_heap.mIdx, 0), 0); daPy_matAnm_c::onMabaFlg(); @@ -1008,7 +1008,7 @@ void daPy_lk_c::playTextureAnime() { m3530++; } } - if (m_tex_scroll_heap.mIdx == LKANM_BTK_TABEKOBE) { + if (m_tex_scroll_heap.mIdx == dRes_INDEX_LKANM_BTK_TABEKOBE_e) { m3532++; if (m3532 >= mpTexScrollResData->getFrameMax()) { m3532 = 0; @@ -1321,10 +1321,10 @@ s32 daPy_lk_c::setItemModel() { mDoMtx_stack_c::ZrotM(-0x4000); mDoMtx_stack_c::revConcat(pMVar14); mpEquippedShieldModel->setBaseTRMtx(mDoMtx_stack_c::get()); - if (r27_2 == 2 && (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WALK || - m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WALKS || - m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_DASHS || - m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_DASH)) + if (r27_2 == 2 && (m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_WALK_e || + m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_WALKS_e || + m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_DASHS_e || + m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_DASH_e)) { Vec temp; mDoMtx_stack_c::multVecZero(&temp); @@ -1450,7 +1450,7 @@ s32 daPy_lk_c::setDrawHandModel() { uVar4 = 1; uVar5 = mRightHandIdx; } else { - if (mEquipItem == daPyItem_NONE_e && checkUpperAnime(LKANM_BCK_TAKEBOTH)) { + if (mEquipItem == daPyItem_NONE_e && checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKEBOTH_e)) { uVar4 = 1; } else if (mEquipItem == daPyItem_NONE_e && checkItemEquipAnime()) { uVar4 = 0; @@ -1459,7 +1459,7 @@ s32 daPy_lk_c::setDrawHandModel() { } if (checkPlayerGuard() || mCurProc == daPyProc_GUARD_CRASH_e) { uVar5 = 8; - } else if (mEquipItem == daPyItem_NONE_e && checkUpperAnime(LKANM_BCK_TAKEBOTH)) { + } else if (mEquipItem == daPyItem_NONE_e && checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKEBOTH_e)) { uVar5 = 7; } else if (mEquipItem == daPyItem_NONE_e && checkItemEquipAnime()) { uVar5 = 0; @@ -3128,7 +3128,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { if ((checkNoResetFlg1(daPyFlg1_CONFUSE) && !checkPlayerDemoMode()) && !dComIfGp_event_runCheck()) { - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_WAITQ) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != dRes_INDEX_LKANM_BCK_WAITQ_e) { setSingleMoveAnime(ANM_WAITQ, m_HIO->mMove.m.field_0x84, f1, -1, m_HIO->mBasic.m.field_0xC); m34C3 = 2; } @@ -3424,7 +3424,7 @@ void daPy_lk_c::setAnimeEquipSword(BOOL r4) { return; } m3562 = daPyItem_SWORD_e; - setActAnimeUpper(LKANM_BCK_REST, UPPER_MOVE2_e, m_HIO->mCut.m.field_0x8, m_HIO->mCut.m.field_0xC, m_HIO->mCut.m.field_0x0, m_HIO->mCut.m.field_0x10); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_REST_e, UPPER_MOVE2_e, m_HIO->mCut.m.field_0x8, m_HIO->mCut.m.field_0xC, m_HIO->mCut.m.field_0x0, m_HIO->mCut.m.field_0x10); setPriTextureAnime(0x72, 0); dComIfGp_clearPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e); if (mActorKeepThrow.getActor() != NULL) { @@ -3496,7 +3496,7 @@ void daPy_lk_c::setAnimeUnequipSword() { f3 = m_HIO->mCut.m.field_0x1C; } - setActAnimeUpper(LKANM_BCK_REST, UPPER_MOVE2_e, rate, start, end, f3); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_REST_e, UPPER_MOVE2_e, rate, start, end, f3); setPriTextureAnime(0x72, 0); } @@ -3512,12 +3512,12 @@ void daPy_lk_c::setAnimeUnequipItem(u16 i_itemNo) { i_itemNo == dItemNo_WIND_WAKER_e || checkBottleItem(i_itemNo) ) { - setAnimeEquipSingleItem(LKANM_BCK_TAKEL); + setAnimeEquipSingleItem(dRes_INDEX_LKANM_BCK_TAKEL_e); } else if (checkBowItem(i_itemNo)) { - setAnimeEquipSingleItem(LKANM_BCK_TAKER); + setAnimeEquipSingleItem(dRes_INDEX_LKANM_BCK_TAKER_e); } else if (i_itemNo == dItemNo_SKULL_HAMMER_e) { setActAnimeUpper( - LKANM_BCK_TAKEBOTH, + dRes_INDEX_LKANM_BCK_TAKEBOTH_e, UPPER_MOVE2_e, m_HIO->mItem.m.field_0x24, m_HIO->mItem.m.field_0x28, @@ -3526,7 +3526,7 @@ void daPy_lk_c::setAnimeUnequipItem(u16 i_itemNo) { ); } else { setActAnimeUpper( - LKANM_BCK_TAKE, + dRes_INDEX_LKANM_BCK_TAKE_e, UPPER_MOVE2_e, m_HIO->mItem.m.field_0x8, m_HIO->mItem.m.field_0xC, @@ -3562,20 +3562,20 @@ BOOL daPy_lk_c::checkBossGomaStage() { /* 8010C4A4-8010C4C8 .text checkSingleItemEquipAnime__9daPy_lk_cCFv */ BOOL daPy_lk_c::checkSingleItemEquipAnime() const { - return checkUpperAnime(LKANM_BCK_TAKEL) || - checkUpperAnime(LKANM_BCK_TAKER); + return checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKEL_e) || + checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKER_e); } /* 8010C4C8-8010C528 .text checkItemEquipAnime__9daPy_lk_cCFv */ BOOL daPy_lk_c::checkItemEquipAnime() const { - return checkUpperAnime(LKANM_BCK_TAKE) || + return checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKE_e) || checkSingleItemEquipAnime() || - checkUpperAnime(LKANM_BCK_TAKEBOTH); + checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKEBOTH_e); } /* 8010C528-8010C570 .text checkEquipAnime__9daPy_lk_cCFv */ BOOL daPy_lk_c::checkEquipAnime() const { - return checkUpperAnime(LKANM_BCK_REST) || + return checkUpperAnime(dRes_INDEX_LKANM_BCK_REST_e) || checkItemEquipAnime(); } @@ -3700,7 +3700,7 @@ void daPy_lk_c::makeItemType() { mActorKeepGrab.setData(bomb); mEquipItem = daPyItem_NONE_e; if (mActorKeepGrab.getActor() != NULL) { - setActAnimeUpper(LKANM_BCK_GRABWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, 5.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_GRABWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, 5.0f); mActivePlayerBombs++; fopAcM_setCarryNow(mActorKeepGrab.getActor(), FALSE); dComIfGp_setItemBombNumCount(-1); @@ -3745,14 +3745,14 @@ void daPy_lk_c::makeItemType() { /* 8010CB70-8010CBC8 .text setScopeModel__9daPy_lk_cFv */ void daPy_lk_c::setScopeModel() { JKRHeap* oldHeap = setItemHeap(); - initModel(&mpEquipItemModel, LINK_BDL_TELESCOPE, 0x37221222); + initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_TELESCOPE_e, 0x37221222); mDoExt_setCurrentHeap(oldHeap); } /* 8010CBC8-8010CC78 .text setPhotoBoxModel__9daPy_lk_cFv */ void daPy_lk_c::setPhotoBoxModel() { JKRHeap* oldHeap = setItemHeap(); - initModel(&mpEquipItemModel, LINK_BDL_CAMERA, 0x37221222); + initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_CAMERA_e, 0x37221222); mDoExt_setCurrentHeap(oldHeap); if (mEquipItem == dItemNo_PICTO_BOX_e) { mpEquipItemModel->getModelData()->getJointNodePointer(0x02)->getMesh()->getShape()->hide(); // frash joint @@ -3913,11 +3913,11 @@ void daPy_lk_c::checkItemAction() { { mReadyItemBtn = dItemBtn_Z_e; } - if (checkEquipAnime() || checkUpperAnime(LKANM_BCK_BOOMTHROW) || checkUpperAnime(LKANM_BCK_BOOMCATCH) || - checkUpperAnime(LKANM_BCK_ROPETHROW)) + if (checkEquipAnime() || checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMTHROW_e) || checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMCATCH_e) || + checkUpperAnime(dRes_INDEX_LKANM_BCK_ROPETHROW_e)) { J3DFrameCtrl& frameCtrl = mFrameCtrlUpper[UPPER_MOVE2_e]; - if (checkUpperAnime(LKANM_BCK_BOOMCATCH)) { + if (checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMCATCH_e)) { if (!(frameCtrl.getRate() < 0.01f)) { if (!(mStickDistance > 0.05f)) { return; @@ -3930,7 +3930,7 @@ void daPy_lk_c::checkItemAction() { if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { procShipPaddle_init(); } - } else if (checkUpperAnime(LKANM_BCK_BOOMTHROW)) { + } else if (checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMTHROW_e)) { if (frameCtrl.getRate() < 0.01f || ((mStickDistance > 0.05f && (frameCtrl.getFrame() > m_HIO->mItem.mBoom.m.field_0x10)))) @@ -3941,7 +3941,7 @@ void daPy_lk_c::checkItemAction() { throwBoomerang(); } } - } else if (checkUpperAnime(LKANM_BCK_ROPETHROW)) { + } else if (checkUpperAnime(dRes_INDEX_LKANM_BCK_ROPETHROW_e)) { if (frameCtrl.getRate() < 0.01f) { mFrameCtrlUnder[UNDER_MOVE0_e].setRate(0.0f); mFrameCtrlUnder[UNDER_MOVE1_e].setRate(0.0f); @@ -3950,9 +3950,9 @@ void daPy_lk_c::checkItemAction() { } } else if (checkEquipAnime()) { if (mEquipItem == daPyItem_SWORD_e && - ((checkUpperAnime(LKANM_BCK_REST) && frameCtrl.checkPass(7.0f - frameCtrl.getRate())) || - (checkUpperAnime(LKANM_BCK_TAKE) && frameCtrl.checkPass(7.0f - frameCtrl.getRate())) || - (checkUpperAnime(LKANM_BCK_TAKEBOTH) && + ((checkUpperAnime(dRes_INDEX_LKANM_BCK_REST_e) && frameCtrl.checkPass(7.0f - frameCtrl.getRate())) || + (checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKE_e) && frameCtrl.checkPass(7.0f - frameCtrl.getRate())) || + (checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKEBOTH_e) && frameCtrl.checkPass(m_HIO->mItem.m.field_0x30 - frameCtrl.getRate())) || (checkSingleItemEquipAnime() && frameCtrl.checkPass(m_HIO->mItem.m.field_0x20 - frameCtrl.getRate())))) @@ -3961,9 +3961,9 @@ void daPy_lk_c::checkItemAction() { } if (std::fabsf(frameCtrl.getRate()) < 0.01f) { resetActAnimeUpper(UPPER_MOVE2_e, m_HIO->mBasic.m.field_0xC); - } else if ((checkUpperAnime(LKANM_BCK_REST) && frameCtrl.checkPass(7.0f)) || - (checkUpperAnime(LKANM_BCK_TAKE) && frameCtrl.checkPass(7.0f)) || - (checkUpperAnime(LKANM_BCK_TAKEBOTH) && frameCtrl.checkPass(m_HIO->mItem.m.field_0x30)) || + } else if ((checkUpperAnime(dRes_INDEX_LKANM_BCK_REST_e) && frameCtrl.checkPass(7.0f)) || + (checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKE_e) && frameCtrl.checkPass(7.0f)) || + (checkUpperAnime(dRes_INDEX_LKANM_BCK_TAKEBOTH_e) && frameCtrl.checkPass(m_HIO->mItem.m.field_0x30)) || (checkSingleItemEquipAnime() && frameCtrl.checkPass(m_HIO->mItem.m.field_0x20))) { if ((mEquipItem != daPyItem_NONE_e && mEquipItem != daPyItem_SWORD_e) || @@ -4353,9 +4353,9 @@ void daPy_lk_c::setShieldGuard() { } u16 uVar3; if (mEquipItem == dItemNo_SKULL_HAMMER_e) { - uVar3 = LKANM_BCK_ATNGHAM; + uVar3 = dRes_INDEX_LKANM_BCK_ATNGHAM_e; } else { - uVar3 = LKANM_BCK_ATNG; + uVar3 = dRes_INDEX_LKANM_BCK_ATNG_e; } if (!checkGuardSlip()) { if (spActionButton() && dComIfGp_getRStatus() == dActStts_DEFEND_e) { @@ -4374,8 +4374,8 @@ void daPy_lk_c::setShieldGuard() { m_pbCalc[PART_UPPER_e]->setRatio(2, local_18); } } - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_ATNLS || - m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_ATNRS) + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_ATNLS_e || + m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_ATNRS_e) { mAnmRatioUpper[UPPER_MOVE2_e].getAnmTransform()->setFrame( mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); @@ -4925,7 +4925,7 @@ int daPy_lk_c::changeSlideProc() { BOOL daPy_lk_c::changeWaitProc() { if (checkGrabAnime()) { return procGrabWait_init(); - } else if (checkUpperAnime(LKANM_BCK_BOOMCATCH)) { + } else if (checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMCATCH_e)) { return procBoomerangCatch_init(); } else if (daPy_getPlayerActorClass() != this) { return procControllWait_init(); @@ -5030,7 +5030,7 @@ BOOL daPy_lk_c::checkNormalDamage(int param_1) { /* 80110448-801104E4 .text setDashDamage__9daPy_lk_cFv */ void daPy_lk_c::setDashDamage() { - setActAnimeUpper(LKANM_BCK_DAMDASH, UPPER_MOVE2_e, m_HIO->mMove.m.field_0x48, 0.0f, -1, + setActAnimeUpper(dRes_INDEX_LKANM_BCK_DAMDASH_e, UPPER_MOVE2_e, m_HIO->mMove.m.field_0x48, 0.0f, -1, m_HIO->mBasic.m.field_0xC); setPriTextureAnime(0x40, 0); mFrameCtrlUpper[UPPER_MOVE2_e].setFrame(mFrameCtrlUnder[UNDER_MOVE1_e].getFrame()); @@ -5895,9 +5895,9 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { m35EC = 0.0f; if (mEquipItem == dItemNo_SKULL_HAMMER_e) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMMERDAM)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_HAMMERDAM_e)); } else if (checkBowItem(mEquipItem) && !checkBowAnime()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWRELORDA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_ARROWRELORDA_e)); } m35E8 = 0.0f; @@ -6057,7 +6057,7 @@ BOOL daPy_lk_c::procControllWait() { /* 80112E60-80113044 .text procWait_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procWait_init() { if (mDemo.getDemoMode() == daPy_demo_c::DEMO_KM_WAIT_e && m_tex_scroll_heap.field_0x6 == 0xFFFF) { - changeTextureAnime(LKANM_BTP_TMABACC, LKANM_BTK_TEUR, -1); + changeTextureAnime(dRes_INDEX_LKANM_BTP_TMABACC_e, dRes_INDEX_LKANM_BTK_TEUR_e, -1); voiceStart(38); mProcVar0.m34D0 = 20; } @@ -6128,7 +6128,7 @@ BOOL daPy_lk_c::procWait() { onModeFlg(ModeFlg_00000100); } } else if (checkRestHPAnime() && - m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_WAITB) + m_anm_heap_under[UNDER_MOVE0_e].mIdx != dRes_INDEX_LKANM_BCK_WAITB_e) { s32 uVar3 = m_tex_anm_heap.mIdx == mTexAnmIndexTable[daPyFace_TMABAF].mBtpIdx; u16 uVar1 = m3530; @@ -6151,7 +6151,7 @@ BOOL daPy_lk_c::procWait() { mProcVar0.m34D0 = 20; } } - if (!dComIfGp_event_runCheck() && m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WAITS && + if (!dComIfGp_event_runCheck() && m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_WAITS_e && checkNoUpperAnime() && daPy_matAnm_c::getEyeMoveFlg() == 0 && m3564.y == 0 && m3564.z == 0 && m3564.x == 0) { mProcVar1.m34D2--; @@ -6483,7 +6483,7 @@ BOOL daPy_lk_c::procCrouchDefenseSlip_init() { mProcVar6.m3570 = 0; } if (mEquipItem == dItemNo_SKULL_HAMMER_e) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ATNGAHAMA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_ATNGAHAMA_e)); m35EC = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); } else { m35E8 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); @@ -8246,7 +8246,7 @@ BOOL daPy_lk_c::procGuardSlip_init() { commonProcInit(daPyProc_GUARD_SLIP_e); if (mEquipItem == dItemNo_SKULL_HAMMER_e) { dVar5 = ANM_ATNGAHAM; - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ATNGAHAMA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_ATNGAHAMA_e)); } else if (mDirection == DIR_LEFT) { dVar5 = ANM_ATNGAL; } else { @@ -9002,7 +9002,7 @@ void daPy_lk_c::setNeckAngle() { sp18 = dComIfGp_getShipActor()->m0434; r28 = true; } - } else if (m_tex_anm_heap.mIdx == LKANM_BTP_TDASHKAZE) { + } else if (m_tex_anm_heap.mIdx == dRes_INDEX_LKANM_BTP_TDASHKAZE_e) { if (checkHeavyStateOn() && m373C.abs2XZ() > SQUARE(5.0f)) { spA0.set(current.pos.x - 100.0f * m373C.x, 120.0f + current.pos.y, current.pos.z - 100.0f * m373C.z); } else if (!checkHeavyStateOn() && m3730.abs2XZ() > SQUARE(5.0f)) { @@ -9088,7 +9088,7 @@ void daPy_lk_c::setNeckAngle() { r25_3 = r25_3 - m3564.y; s16 r4; s16 r23; - if (checkModeFlg(ModeFlg_00000080 | ModeFlg_08000000) && sp18 != NULL && !checkUpperAnime(LKANM_BCK_DAMDASH)) { + if (checkModeFlg(ModeFlg_00000080 | ModeFlg_08000000) && sp18 != NULL && !checkUpperAnime(dRes_INDEX_LKANM_BCK_DAMDASH_e)) { spB8 = *sp18 - spC4; r27 = cM_atan2s(-spB8.y, spB8.absXZ()); r23_3 = cM_atan2s(spB8.x, spB8.z) - m34DE; @@ -9105,8 +9105,8 @@ void daPy_lk_c::setNeckAngle() { } else if (r23_3 < -m_HIO->mShip.m.field_0x0) { r23_3 = -m_HIO->mShip.m.field_0x0; } - if (checkModeFlg(ModeFlg_00000080) && m_anm_heap_upper[UPPER_MOVE0_e].mIdx != LKANM_BCK_DASHKAZE && - m_anm_heap_upper[UPPER_MOVE1_e].mIdx != LKANM_BCK_DASHKAZE) + if (checkModeFlg(ModeFlg_00000080) && m_anm_heap_upper[UPPER_MOVE0_e].mIdx != dRes_INDEX_LKANM_BCK_DASHKAZE_e && + m_anm_heap_upper[UPPER_MOVE1_e].mIdx != dRes_INDEX_LKANM_BCK_DASHKAZE_e) { if (r28) { r30 = (r27 >> 1) - r24_4; @@ -10422,7 +10422,7 @@ void daPy_lk_c::setDemoData() { if (*face_p == 0) { resetDemoTextureAnime(); } else if (*face_p == 1) { - changeTextureAnime(LKANM_BTP_TMABAI, LKANM_BTK_TMABA, -1); + changeTextureAnime(dRes_INDEX_LKANM_BTP_TMABAI_e, dRes_INDEX_LKANM_BTK_TMABA_e, -1); } } } @@ -11824,7 +11824,7 @@ void daPy_lk_c::initTextureAnime() { m_tex_anm_heap.m_buffer = new(0x20) u8[0x1000]; JUT_ASSERT(VERSION_SELECT(20682, 20789, 20869, 20869), m_tex_anm_heap.m_buffer != NULL); - JKRReadIdxResource(m_tex_anm_heap.m_buffer, 0x1000, LKANM_BTP_TMABAA, dComIfGp_getAnmArchive()); + JKRReadIdxResource(m_tex_anm_heap.m_buffer, 0x1000, dRes_INDEX_LKANM_BTP_TMABAA_e, dComIfGp_getAnmArchive()); J3DAnmTexPattern* btp = static_cast(J3DAnmLoaderDataBase::load(m_tex_anm_heap.m_buffer)); btp->searchUpdateMaterialID(mpCLModelData); u16 material_num = btp->getUpdateMaterialNum(); @@ -11874,7 +11874,7 @@ void daPy_lk_c::initTextureScroll() { m_tex_scroll_heap.m_buffer = new(0x20) u8[0x800]; JUT_ASSERT(VERSION_SELECT(20757, 20864, 20944, 20944), m_tex_scroll_heap.m_buffer != NULL); - JKRReadIdxResource(m_tex_scroll_heap.m_buffer, 0x800, LKANM_BTK_TMABA, dComIfGp_getAnmArchive()); + JKRReadIdxResource(m_tex_scroll_heap.m_buffer, 0x800, dRes_INDEX_LKANM_BTK_TMABA_e, dComIfGp_getAnmArchive()); J3DAnmTextureSRTKey* btk = static_cast(J3DAnmLoaderDataBase::load(m_tex_scroll_heap.m_buffer)); btk->searchUpdateMaterialID(mpCLModelData); u16 material_num = btk->getUpdateMaterialNum(); @@ -11934,55 +11934,55 @@ BOOL daPy_lk_c::createHeap() { J3DAnmTevRegKey* brk; int ret; - mpCLModelData = initModel(&mpCLModel, LINK_BDL_CL, 0x37221222); - tmp_modelData = initModel(&mpHandsModel, LINK_BDL_HANDS, 0x37221222); - tmp_modelData = initModel(&mpKatsuraModel, LINK_BDL_KATSURA, 0x37221222); - tmp_modelData = initModel(&mpYamuModel, LINK_BDL_YAMU, 0x37221222); - tmp_modelData = initModel(&mpPringModel, LINK_BDL_PRING, 0x37221222); - tmp_modelData = initModel(&mpSwgripaModel, LINK_BDL_SWGRIPA, 0x37221222); + mpCLModelData = initModel(&mpCLModel, dRes_INDEX_LINK_BDL_CL_e, 0x37221222); + tmp_modelData = initModel(&mpHandsModel, dRes_INDEX_LINK_BDL_HANDS_e, 0x37221222); + tmp_modelData = initModel(&mpKatsuraModel, dRes_INDEX_LINK_BDL_KATSURA_e, 0x37221222); + tmp_modelData = initModel(&mpYamuModel, dRes_INDEX_LINK_BDL_YAMU_e, 0x37221222); + tmp_modelData = initModel(&mpPringModel, dRes_INDEX_LINK_BDL_PRING_e, 0x37221222); + tmp_modelData = initModel(&mpSwgripaModel, dRes_INDEX_LINK_BDL_SWGRIPA_e, 0x37221222); - tmp_modelData = initModel(&mpSwgripmsModel, LINK_BDL_SWGRIPMS, 0x37221222); - bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_SWGRIPMSAB); + tmp_modelData = initModel(&mpSwgripmsModel, dRes_INDEX_LINK_BDL_SWGRIPMS_e, 0x37221222); + bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BCK_SWGRIPMSAB_e); ret = mSwgripmsabBckAnim.init(mpSwgripmsModel->getModelData(), bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(VERSION_SELECT(20859, 20966, 21046, 21046), FALSE); } - mpTswgripmsabBrk = entryBrk(tmp_modelData, LINK_BRK_TSWGRIPMSAB); - mpTswgripmsBtk = entryBtk(tmp_modelData, LINK_BTK_TSWGRIPMS); + mpTswgripmsabBrk = entryBrk(tmp_modelData, dRes_INDEX_LINK_BRK_TSWGRIPMSAB_e); + mpTswgripmsBtk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_TSWGRIPMS_e); - tmp_modelData = initModel(&mpPodmsModel, LINK_BDL_PODMS, 0x37221222); + tmp_modelData = initModel(&mpPodmsModel, dRes_INDEX_LINK_BDL_PODMS_e, 0x37221222); - tmp_modelData = initModel(&mpShaModel, LINK_BDL_SHA, 0x37221222); - bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_ATNGSHA); + tmp_modelData = initModel(&mpShaModel, dRes_INDEX_LINK_BDL_SHA_e, 0x37221222); + bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BCK_ATNGSHA_e); ret = mAtngshaBck.init(mpShaModel->getModelData(), bck, false, J3DFrameCtrl::EMode_NONE); if (!ret) { JUT_ASSERT(VERSION_SELECT(20876, 20983, 21063, 21063), FALSE); } - tmp_modelData = initModel(&mpShmsModel, LINK_BDL_SHMS, 0x37221222); - mpTshmsBtk = entryBtk(tmp_modelData, LINK_BTK_TSHMS); + tmp_modelData = initModel(&mpShmsModel, dRes_INDEX_LINK_BDL_SHMS_e, 0x37221222); + mpTshmsBtk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_TSHMS_e); J3DSkinDeform* shmsSkinDeform = new J3DSkinDeform(); if (!shmsSkinDeform) { JUT_ASSERT(VERSION_SELECT(20890, 20997, 21077, 21077), FALSE); } if (mpShmsModel->setSkinDeform(shmsSkinDeform, 1) != J3DErrType_Success ) { JUT_ASSERT(VERSION_SELECT(20893, 21000, 21080, 21080), FALSE); } - tmp_modelData = initModel(&mpYmsls00Model, LINK_BDL_YMSLS00, 0x13000222); - mpYmsls00Btk = entryBtk(tmp_modelData, LINK_BTK_YMSLS00); + tmp_modelData = initModel(&mpYmsls00Model, dRes_INDEX_LINK_BDL_YMSLS00_e, 0x13000222); + mpYmsls00Btk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_YMSLS00_e); - tmp_modelData = initModel(&mpHbootsModels[0], LINK_BDL_HBOOTS, 0x37221222); - tmp_modelData = initModel(&mpHbootsModels[1], LINK_BDL_HBOOTS, 0x37221222); + tmp_modelData = initModel(&mpHbootsModels[0], dRes_INDEX_LINK_BDL_HBOOTS_e, 0x37221222); + tmp_modelData = initModel(&mpHbootsModels[1], dRes_INDEX_LINK_BDL_HBOOTS_e, 0x37221222); - tmp_modelData = initModel(&mpSuimenMunyaModel, LINK_BDL_SUIMEN_MUNYA, 0x11001222); - mpSuimenMunyaBtk = entryBtk(tmp_modelData, LINK_BTK_SUIMEN_MUNYA); + tmp_modelData = initModel(&mpSuimenMunyaModel, dRes_INDEX_LINK_BDL_SUIMEN_MUNYA_e, 0x11001222); + mpSuimenMunyaBtk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_SUIMEN_MUNYA_e); - tmp_modelData = initModel(&mpYuchw00Model, LINK_BDL_YUCHW00, 0x13000222); - bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_YUCHW00); + tmp_modelData = initModel(&mpYuchw00Model, dRes_INDEX_LINK_BDL_YUCHW00_e, 0x13000222); + bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BCK_YUCHW00_e); ret = mYuchw00Bck.init(tmp_modelData, bck, 1, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(VERSION_SELECT(20926, 21033, 21113, 21113), FALSE); } - mpYuchw00Btk = entryBtk(tmp_modelData, LINK_BTK_YUCHW00); - mpYuchw00Brk = entryBrk(tmp_modelData, LINK_BRK_YUCHW00); + mpYuchw00Btk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_YUCHW00_e); + mpYuchw00Brk = entryBrk(tmp_modelData, dRes_INDEX_LINK_BRK_YUCHW00_e); mpYuchw00Brk->setFrame(mpYuchw00Brk->getFrameMax()-0.001f); - tmp_modelData = initModel(&mpYbafo00Model, LINK_BDL_YBAFO00, 0x13000222); - mpYbafo00Btk = entryBtk(tmp_modelData, LINK_BTK_YBAFO00); + tmp_modelData = initModel(&mpYbafo00Model, dRes_INDEX_LINK_BDL_YBAFO00_e, 0x13000222); + mpYbafo00Btk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_YBAFO00_e); mpYbafo00Btk->setFrame(mpYbafo00Btk->getFrameMax()-0.001f); - tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_YAURA00)); + tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BDL_YAURA00_e)); JUT_ASSERT(VERSION_SELECT(20943, 21050, 21130, 21130), tmp_modelData != NULL); daPy_aura_c* aura_p = mMagicArmorAuraEntries; for (int i = 0; i < 6; i++) { @@ -11990,43 +11990,43 @@ BOOL daPy_lk_c::createHeap() { JUT_ASSERT(VERSION_SELECT(20952, 21059, 21139, 21139), aura_p->getModel() != NULL); aura_p++; } - mpYaura00Btk = entryBtk(tmp_modelData, LINK_BTK_YAURA00); - brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YAURA00_R); + mpYaura00Btk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_YAURA00_e); + brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BRK_YAURA00_R_e); ret = mYaura00rBrk.init(tmp_modelData, brk, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(VERSION_SELECT(20960, 21067, 21147, 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); + tmp_modelData = initModel(&mpYmgcs00Model, dRes_INDEX_LINK_BDL_YMGCS00_e, 0x11001222); + mpYmgcs00Btk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_YMGCS00_e); + brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BRK_YMGCS00_MS_e); ret = mYmgcs00Brk.init(tmp_modelData, brk, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(VERSION_SELECT(20974, 21081, 21161, 21161), FALSE); } mYmgcs00Brk.entryFrame(0.0f); - tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_BOMB)); + tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BDL_BOMB_e)); JUT_ASSERT(VERSION_SELECT(20982, 21089, 21169, 21169), tmp_modelData != NULL); - mpBombBrk = entryBrk(tmp_modelData, LINK_BRK_BOMB); + mpBombBrk = entryBrk(tmp_modelData, dRes_INDEX_LINK_BRK_BOMB_e); - tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_GWP00)); + tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BDL_GWP00_e)); JUT_ASSERT(VERSION_SELECT(20989, 21096, 21176, 21176), tmp_modelData != NULL); - mpGwp00BrkData = entryBrk(tmp_modelData, LINK_BRK_GWP00); - mpGwp00BtkData = entryBtk(tmp_modelData, LINK_BTK_GWP00); + mpGwp00BrkData = entryBrk(tmp_modelData, dRes_INDEX_LINK_BRK_GWP00_e); + mpGwp00BtkData = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_GWP00_e); - tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_ARROW)); + tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BDL_ARROW_e)); JUT_ASSERT(VERSION_SELECT(20997, 21104, 21184, 21184), tmp_modelData != NULL); - mpIceArrowBtk = entryBtk(tmp_modelData, LINK_BTK_TTIPICE); + mpIceArrowBtk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_TTIPICE_e); - tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_ARROWGLITTER)); + tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BDL_ARROWGLITTER_e)); JUT_ASSERT(VERSION_SELECT(21004, 21111, 21191, 21191), tmp_modelData != NULL); - mpLightArrowBtk = entryBtk(tmp_modelData, LINK_BTK_TARROWGLITTER); + mpLightArrowBtk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_TARROWGLITTER_e); - tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_GICER00)); + tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BDL_GICER00_e)); JUT_ASSERT(VERSION_SELECT(21011, 21118, 21198, 21198), tmp_modelData != NULL); - mpGicer00Btk = entryBtk(tmp_modelData, LINK_BTK_GICER00); + mpGicer00Btk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_GICER00_e); - tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_GICER01)); + tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BDL_GICER01_e)); JUT_ASSERT(VERSION_SELECT(21018, 21125, 21205, 21205), tmp_modelData != NULL); - mpGicer01Btk = entryBtk(tmp_modelData, LINK_BTK_GICER01); + mpGicer01Btk = entryBtk(tmp_modelData, dRes_INDEX_LINK_BTK_GICER01_e); const int numCLJoints = 0x2A; m_old_fdata = new mDoExt_MtxCalcOldFrame(new J3DTransformInfo[numCLJoints], new Quaternion[numCLJoints]); @@ -12293,7 +12293,7 @@ void daPy_lk_c::playerInit() { mTactZevPartnerId = fpcM_ERROR_PROCESS_ID_e; m3630 = fpcM_ERROR_PROCESS_ID_e; - ResTIMG* blur_img = (ResTIMG*)dComIfG_getObjectRes(l_arcName, LINK_BTI_BLUR); + ResTIMG* blur_img = (ResTIMG*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BTI_BLUR_e); mSwBlur.mpTex = blur_img; current.angle.z = 0; @@ -12302,10 +12302,10 @@ void daPy_lk_c::playerInit() { m3648.w = 1.0f; resetSeAnime(); - ResTIMG* tmp_tex = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_I4_BALL128B); + ResTIMG* tmp_tex = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_I4_BALL128B_e); JUT_ASSERT(VERSION_SELECT(21500, 21607, 21687, 21687), tmp_tex != NULL); mSightPacket.setSightTex(tmp_tex); - ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes(l_arcName, LINK_BTI_ROCK_MARK); + ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BTI_ROCK_MARK_e); JUT_ASSERT(VERSION_SELECT(21506, 21613, 21693, 21693), tmp_img != NULL); void* tmp_img_data = reinterpret_cast(reinterpret_cast(tmp_img) + tmp_img->imageOffset); mSightPacket.setLockTex(tmp_img_data); @@ -12351,7 +12351,7 @@ void daPy_lk_c::playerInit() { mFace = daPyFace_NONE; m34DE = shape_angle.y; - ResTIMG* linktex_casual = (ResTIMG*)dComIfG_getObjectRes(l_arcName, LINK_BTI_LINKTEXBCI4); + ResTIMG* linktex_casual = (ResTIMG*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BTI_LINKTEXBCI4_e); int num_linktex_headers_seen = 0; J3DTexture* texture = mpCLModelData->getTexture(); JUT_ASSERT(VERSION_SELECT(21577, 21684, 21764, 21764), texture != NULL); diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc index a57866a0a..6cd16cdf8 100644 --- a/src/d/actor/d_a_player_main_data.inc +++ b/src/d/actor/d_a_player_main_data.inc @@ -520,2149 +520,2149 @@ daPy_lk_c::ProcFunc daPy_lk_c::mDemoProcInitFuncTable[] = { }; const daPy_lk_c::TexAnmTableEntry daPy_lk_c::mTexAnmIndexTable[] = { - /* 0x00 */ {LKANM_BTP_TMABAA, LKANM_BTK_TMABA}, - /* 0x01 */ {LKANM_BTP_TMABAA, LKANM_BTK_TEUP}, - /* 0x02 */ {LKANM_BTP_TMABAB, LKANM_BTK_TMABA}, - /* 0x03 */ {LKANM_BTP_TMABAC, LKANM_BTK_TMABA}, - /* 0x04 */ {LKANM_BTP_TMABACB, LKANM_BTK_TMABA}, - /* 0x05 */ {LKANM_BTP_TMABACB, LKANM_BTK_TEDW}, - /* 0x06 */ {LKANM_BTP_TMABACC, LKANM_BTK_TMABA}, - /* 0x07 */ {LKANM_BTP_TMABAD, LKANM_BTK_TMABA}, - /* 0x08 */ {LKANM_BTP_TMABAD, LKANM_BTK_TEDW}, - /* 0x09 */ {LKANM_BTP_TMABAE, LKANM_BTK_TMABA}, - /* 0x0A */ {LKANM_BTP_TMABAE, LKANM_BTK_TEUP}, - /* 0x0B */ {LKANM_BTP_TMABAE, LKANM_BTK_TEDW}, - /* 0x0C */ {LKANM_BTP_TMABAE, LKANM_BTK_TEL}, - /* 0x0D */ {LKANM_BTP_TMABAE, LKANM_BTK_TER}, - /* 0x0E */ {LKANM_BTP_TMABAF, LKANM_BTK_TMABA}, - /* 0x0F */ {LKANM_BTP_TMABAG, LKANM_BTK_TMABA}, - /* 0x10 */ {LKANM_BTP_TMABAH, LKANM_BTK_TMABA}, - /* 0x11 */ {LKANM_BTP_TMABAI, LKANM_BTK_TMABA}, - /* 0x12 */ {LKANM_BTP_TMABAJ, LKANM_BTK_TEYORIME}, - /* 0x13 */ {LKANM_BTP_TMABAD, LKANM_BTK_TWAITPICKUP}, - /* 0x14 */ {LKANM_BTP_TMABAC, LKANM_BTK_THOOKSHOTJMP}, - /* 0x15 */ {LKANM_BTP_TGRABP, LKANM_BTK_TGRABP}, - /* 0x16 */ {LKANM_BTP_TGRABUP, LKANM_BTK_TGRABUP}, - /* 0x17 */ {LKANM_BTP_TGRABNG, LKANM_BTK_TGRABNG}, - /* 0x18 */ {LKANM_BTP_TGRABTHROW, LKANM_BTK_TGRABTHROW}, - /* 0x19 */ {LKANM_BTP_TGRABRE, LKANM_BTK_TECN}, - /* 0x1A */ {LKANM_BTP_TWALLWL, LKANM_BTK_TER}, - /* 0x1B */ {LKANM_BTP_TWALLWR, LKANM_BTK_TEL}, - /* 0x1C */ {LKANM_BTP_TWALLPL, LKANM_BTK_TWALLPL}, - /* 0x1D */ {LKANM_BTP_TWALLPR, LKANM_BTK_TWALLPR}, - /* 0x1E */ {LKANM_BTP_TCUT, LKANM_BTK_TECN}, - /* 0x1F */ {LKANM_BTP_TCUTEA, LKANM_BTK_TCUTEA}, - /* 0x20 */ {LKANM_BTP_TCUTEA, LKANM_BTK_TECN}, - /* 0x21 */ {LKANM_BTP_TEXCA1, LKANM_BTK_TEXCA1}, - /* 0x22 */ {LKANM_BTP_TEXCB1, LKANM_BTK_TEXCB1}, - /* 0x23 */ {LKANM_BTP_TJATTACK, LKANM_BTK_TJATTACK}, - /* 0x24 */ {LKANM_BTP_TJATTACK, LKANM_BTK_TEUP}, - /* 0x25 */ {LKANM_BTP_TCUTTURNP, LKANM_BTK_TECN}, - /* 0x26 */ {LKANM_BTP_TCUTTURN, LKANM_BTK_TCUTTURN}, - /* 0x27 */ {LKANM_BTP_TMJMP, LKANM_BTK_TMJMP}, - /* 0x28 */ {LKANM_BTP_TMJMPC, LKANM_BTK_TMJMPC}, - /* 0x29 */ {LKANM_BTP_TMROLLL, LKANM_BTK_TMROLLL}, - /* 0x2A */ {LKANM_BTP_TMROLLR, LKANM_BTK_TMROLLR}, - /* 0x2B */ {LKANM_BTP_TMROLLLRC, LKANM_BTK_TMROLLLC}, - /* 0x2C */ {LKANM_BTP_TMROLLLRC, LKANM_BTK_TMROLLRC}, - /* 0x2D */ {LKANM_BTP_TMSTEPOVER, LKANM_BTK_TMSTEPOVER}, - /* 0x2E */ {LKANM_BTP_TMSTEPOVERA, LKANM_BTK_TMSTEPOVERA}, - /* 0x2F */ {LKANM_BTP_TMSTEPOVERLAND, LKANM_BTK_TMSTEPOVERLAND}, - /* 0x30 */ {LKANM_BTP_TATNJLR, LKANM_BTK_TATNJL}, - /* 0x31 */ {LKANM_BTP_TATNJLR, LKANM_BTK_TATNJR}, - /* 0x32 */ {LKANM_BTP_TJMP, LKANM_BTK_TJMP}, - /* 0x33 */ {LKANM_BTP_TROLLF, LKANM_BTK_TROLLF}, - /* 0x34 */ {LKANM_BTP_TROLLB, LKANM_BTK_TROLLB}, - /* 0x35 */ {LKANM_BTP_TROLLBLAND, LKANM_BTK_TECN}, - /* 0x36 */ {LKANM_BTP_TROLLFMIS, LKANM_BTK_TROLLFMIS}, - /* 0x37 */ {LKANM_BTP_TFALL, LKANM_BTK_TEDW}, - /* 0x38 */ {LKANM_BTP_TLANDDAMA, LKANM_BTK_TLANDDAMA}, - /* 0x39 */ {LKANM_BTP_TLANDDAMAST, LKANM_BTK_TLANDDAMAST}, - /* 0x3A */ {LKANM_BTP_TDAM, LKANM_BTK_TDAM}, - /* 0x3B */ {LKANM_BTP_TDAMF, LKANM_BTK_TECN}, - /* 0x3C */ {LKANM_BTP_TDAMFFUP, LKANM_BTK_TDAMFFUP}, - /* 0x3D */ {LKANM_BTP_TDAMFBUP, LKANM_BTK_TDAMFBUP}, - /* 0x3E */ {LKANM_BTP_TDAMFLRUP, LKANM_BTK_TDAMFLUP}, - /* 0x3F */ {LKANM_BTP_TDAMFLRUP, LKANM_BTK_TDAMFRUP}, - /* 0x40 */ {LKANM_BTP_TDAMDASH, LKANM_BTK_TECN}, - /* 0x41 */ {LKANM_BTP_TGUARD, LKANM_BTK_TGUARD}, - /* 0x42 */ {LKANM_BTP_TSLIDEF, LKANM_BTK_TSLIDEF}, - /* 0x43 */ {LKANM_BTP_TSLIDEFLAND, LKANM_BTK_TSLIDEFLAND}, - /* 0x44 */ {LKANM_BTP_TSLIDEB, LKANM_BTK_TEDW}, - /* 0x45 */ {LKANM_BTP_TSLIDEBLAND, LKANM_BTK_TSLIDEFLAND}, - /* 0x46 */ {LKANM_BTP_TSWIMP, LKANM_BTK_TSWIMP}, - /* 0x47 */ {LKANM_BTP_TSWIMING, LKANM_BTK_TSWIMING}, - /* 0x48 */ {LKANM_BTP_TBOOMTHROW, LKANM_BTK_TBOOMTHROW}, - /* 0x49 */ {LKANM_BTP_TBOOMCATCH, LKANM_BTK_TBOOMCATCH}, - /* 0x4A */ {LKANM_BTP_TWALKPUSH, LKANM_BTK_TWALKPUSH}, - /* 0x4B */ {LKANM_BTP_TWALKPULL, LKANM_BTK_TWALKPULL}, - /* 0x4C */ {LKANM_BTP_TVJMPCHA, LKANM_BTK_TVJMPCHA}, - /* 0x4D */ {LKANM_BTP_TVJMPCL, LKANM_BTK_TVJMPCL}, - /* 0x4E */ {LKANM_BTP_TROPECLIMB, LKANM_BTK_TEUP}, - /* 0x4F */ {LKANM_BTP_TROPEDOWN, LKANM_BTK_TEDW}, - /* 0x50 */ {LKANM_BTP_TLADDERUPST, LKANM_BTK_TLADDERUPST}, - /* 0x51 */ {LKANM_BTP_TLADDERDWST, LKANM_BTK_TLADDERDWST}, - /* 0x52 */ {LKANM_BTP_TLADDERUPED, LKANM_BTK_TLADDERUPED}, - /* 0x53 */ {LKANM_BTP_TLADDERDWED, LKANM_BTK_TLADDERDWED}, - /* 0x54 */ {LKANM_BTP_THANGING, LKANM_BTK_THANGING}, - /* 0x55 */ {LKANM_BTP_THANGUP, LKANM_BTK_THANGUP}, - /* 0x56 */ {LKANM_BTP_TLAVADAM, LKANM_BTK_TLAVADAM}, - /* 0x57 */ {LKANM_BTP_TCUTRE, LKANM_BTK_TCUTRE}, - /* 0x58 */ {LKANM_BTP_TCUTTURNB, LKANM_BTK_TCUTTURNB}, - /* 0x59 */ {LKANM_BTP_TWAITATOB, LKANM_BTK_TWAITATOB}, - /* 0x5A */ {LKANM_BTP_TCOMEOUT, LKANM_BTK_TCOMEOUT}, - /* 0x5B */ {LKANM_BTP_THOLDUP, LKANM_BTK_TMABA}, - /* 0x5C */ {LKANM_BTP_TWALLHOLDUP, LKANM_BTK_TWALLHOLDUP}, - /* 0x5D */ {LKANM_BTP_TITEMGET, LKANM_BTK_TITEMGET}, - /* 0x5E */ {LKANM_BTP_TSALTATION, LKANM_BTK_TSALTATION}, - /* 0x5F */ {LKANM_BTP_TWHO, LKANM_BTK_TWHO}, - /* 0x60 */ {LKANM_BTP_TPICKUP, LKANM_BTK_TPICKUP}, - /* 0x61 */ {LKANM_BTP_TBOXOPENLINK, LKANM_BTK_TBOXOPENLINK}, - /* 0x62 */ {LKANM_BTP_TBOXOPENSHORTLINK, LKANM_BTK_TBOXOPENSHORTLINK}, - /* 0x63 */ {LKANM_BTP_TDIELONG, LKANM_BTK_TDIELONG}, - /* 0x64 */ {LKANM_BTP_TSWIMDIE, LKANM_BTK_TECN}, - /* 0x65 */ {LKANM_BTP_TSURPRISED, LKANM_BTK_TSURPRISED}, - /* 0x66 */ {LKANM_BTP_TTURNBACK, LKANM_BTK_TTURNBACK}, - /* 0x67 */ {LKANM_BTP_TLOOKUP, LKANM_BTK_TLOOKUP}, - /* 0x68 */ {LKANM_BTP_TWAITQ, LKANM_BTK_TECN}, - /* 0x69 */ {LKANM_BTP_TGLAD, LKANM_BTK_TECN}, - /* 0x6A */ {LKANM_BTP_TCUTBOKO, LKANM_BTK_TCUTBOKO}, - /* 0x6B */ {LKANM_BTP_SHIP_JUMP1, LKANM_BTK_TECN}, - /* 0x6C */ {LKANM_BTP_SHIP_JUMP2, LKANM_BTK_TECN}, - /* 0x6D */ {LKANM_BTP_TUSEFANA, LKANM_BTK_TUSEFANA}, - /* 0x6E */ {LKANM_BTP_TUSEFANB, LKANM_BTK_TUSEFANB}, - /* 0x6F */ {LKANM_BTP_TUSEFANB2, LKANM_BTK_TEDW}, - /* 0x70 */ {LKANM_BTP_TBOWWAIT, LKANM_BTK_TBOWWAIT}, - /* 0x71 */ {LKANM_BTP_TVOMITJMP, LKANM_BTK_TEDW}, - /* 0x72 */ {LKANM_BTP_TREST, LKANM_BTK_TREST}, - /* 0x73 */ {LKANM_BTP_TTAKE, LKANM_BTK_TTAKE}, - /* 0x74 */ {LKANM_BTP_TTAKELR, LKANM_BTK_TECN}, - /* 0x75 */ {LKANM_BTP_TSLIPICE, LKANM_BTK_TECN}, - /* 0x76 */ {LKANM_BTP_THAMSWINGA, LKANM_BTK_THAMSWINGA}, - /* 0x77 */ {LKANM_BTP_THAMSWINGBPRE, LKANM_BTK_THAMSWINGBPRE}, - /* 0x78 */ {LKANM_BTP_THAMSWINGBHIT, LKANM_BTK_THAMSWINGBHIT}, - /* 0x79 */ {LKANM_BTP_THAMSWINGBEND, LKANM_BTK_THAMSWINGBEND}, - /* 0x7A */ {LKANM_BTP_TSETBOOTS, LKANM_BTK_TECN}, - /* 0x7B */ {LKANM_BTP_TDOOROPENALINK, LKANM_BTK_TDOOROPENALINK}, - /* 0x7C */ {LKANM_BTP_TDOOROPENBLINK, LKANM_BTK_TDOOROPENBLINK}, - /* 0x7D */ {LKANM_BTP_TSEYYES, LKANM_BTK_TSEYYES}, - /* 0x7E */ {LKANM_BTP_TPRESENTATION, LKANM_BTK_TPRESENTATIONA}, - /* 0x7F */ {LKANM_BTP_TWIND, LKANM_BTK_TWINDL}, - /* 0x80 */ {LKANM_BTP_TWIND, LKANM_BTK_TWINDR}, - /* 0x81 */ {LKANM_BTP_TPRESENTATION, LKANM_BTK_TPRESENTATIONB}, - /* 0x82 */ {LKANM_BTP_TBINDRINKPRE, LKANM_BTK_TBINDRINKPRE}, - /* 0x83 */ {LKANM_BTP_TBINDRINKING, LKANM_BTK_TECN}, - /* 0x84 */ {LKANM_BTP_TBINDRINKAFTER, LKANM_BTK_TBINDRINKAFTER}, - /* 0x85 */ {LKANM_BTP_TBINDRINKPRE2, LKANM_BTK_TBINDRINKPRE}, - /* 0x86 */ {LKANM_BTP_TBINDRINKING2, LKANM_BTK_TECN}, - /* 0x87 */ {LKANM_BTP_TBINDRINKAFTER2, LKANM_BTK_TBINDRINKAFTER2}, - /* 0x88 */ {LKANM_BTP_TBINOPENPRE, LKANM_BTK_TBINOPENPRE}, - /* 0x89 */ {LKANM_BTP_TBINOPENA, LKANM_BTK_TBINOPENA}, - /* 0x8A */ {LKANM_BTP_TBINOPENB, LKANM_BTK_TBINOPENB}, - /* 0x8B */ {LKANM_BTP_TBINSWING, LKANM_BTK_TBINSWING}, - /* 0x8C */ {LKANM_BTP_TBINGET, LKANM_BTK_TBINGET}, - /* 0x8D */ {LKANM_BTP_TARROWRELORD, LKANM_BTK_TARROWRELORD}, - /* 0x8E */ {LKANM_BTP_TSURPRISEDB, LKANM_BTK_TSURPRISEDB}, - /* 0x8F */ {LKANM_BTP_TFAN, LKANM_BTK_TFAN}, - /* 0x90 */ {LKANM_BTP_TNENRIKI, LKANM_BTK_TECN}, - /* 0x91 */ {LKANM_BTP_TMABAB, LKANM_BTK_TEDL}, - /* 0x92 */ {LKANM_BTP_TMABAH, LKANM_BTK_TABEKOBE}, - /* 0x93 */ {LKANM_BTP_TSETHYOINOMI, LKANM_BTK_TSETHYOINOMI}, - /* 0x94 */ {LKANM_BTP_LINK_FREEZ, LKANM_BTK_TECN}, - /* 0x95 */ {LKANM_BTP_LINK_MOGAKI, LKANM_BTK_TECN}, - /* 0x96 */ {LKANM_BTP_TDAMBIRI, LKANM_BTK_TDAMBIRI}, - /* 0x97 */ {LKANM_BTP_SALVLR, LKANM_BTK_SALVWAIT}, - /* 0x98 */ {LKANM_BTP_SALVWAIT, LKANM_BTK_SALVWAIT}, - /* 0x99 */ {LKANM_BTP_SALVBAD, LKANM_BTK_SALVWAIT}, - /* 0x9A */ {LKANM_BTP_SALVGOOD, LKANM_BTK_SALVWAIT}, - /* 0x9B */ {LKANM_BTP_SEARESET, LKANM_BTK_SEARESET}, - /* 0x9C */ {LKANM_BTP_TWARPIN, LKANM_BTK_TWARPIN}, - /* 0x9D */ {LKANM_BTP_TWARPOUT, LKANM_BTK_TWARPOUT}, - /* 0x9E */ {LKANM_BTP_TPOWUPWAIT, LKANM_BTK_TPOWUPWAIT}, - /* 0x9F */ {LKANM_BTP_TPOWUP, LKANM_BTK_TPOWUP}, - /* 0xA0 */ {LKANM_BTP_TCUTKESA, LKANM_BTK_TCUTKESA}, - /* 0xA1 */ {LKANM_BTP_TWARPOUTFIRST, LKANM_BTK_TWARPOUTFIRST}, - /* 0xA2 */ {LKANM_BTP_TDASHKAZE, LKANM_BTK_TDASHKAZE}, - /* 0xA3 */ {LKANM_BTP_TIYAYA, LKANM_BTK_TECN}, - /* 0xA4 */ {LKANM_BTP_TFREEA, LKANM_BTK_TFREEA}, - /* 0xA5 */ {LKANM_BTP_TFREEB, LKANM_BTK_TFREEB}, - /* 0xA6 */ {LKANM_BTP_TFREED, LKANM_BTK_TFREED}, - /* 0xA7 */ {LKANM_BTP_TTAKTKAZE, LKANM_BTK_TECN}, - /* 0xA8 */ {LKANM_BTP_TTAKTSIPPU, LKANM_BTK_TECN}, - /* 0xA9 */ {LKANM_BTP_TTAKTCHUYA, LKANM_BTK_TECN}, - /* 0xAA */ {LKANM_BTP_TTAKTFUJIN, LKANM_BTK_TECN}, - /* 0xAB */ {LKANM_BTP_TTAKTAYATSURI, LKANM_BTK_TECN}, - /* 0xAC */ {LKANM_BTP_TTAKTCHISIN, LKANM_BTK_TECN}, + /* 0x00 */ {dRes_INDEX_LKANM_BTP_TMABAA_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x01 */ {dRes_INDEX_LKANM_BTP_TMABAA_e, dRes_INDEX_LKANM_BTK_TEUP_e}, + /* 0x02 */ {dRes_INDEX_LKANM_BTP_TMABAB_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x03 */ {dRes_INDEX_LKANM_BTP_TMABAC_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x04 */ {dRes_INDEX_LKANM_BTP_TMABACB_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x05 */ {dRes_INDEX_LKANM_BTP_TMABACB_e, dRes_INDEX_LKANM_BTK_TEDW_e}, + /* 0x06 */ {dRes_INDEX_LKANM_BTP_TMABACC_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x07 */ {dRes_INDEX_LKANM_BTP_TMABAD_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x08 */ {dRes_INDEX_LKANM_BTP_TMABAD_e, dRes_INDEX_LKANM_BTK_TEDW_e}, + /* 0x09 */ {dRes_INDEX_LKANM_BTP_TMABAE_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x0A */ {dRes_INDEX_LKANM_BTP_TMABAE_e, dRes_INDEX_LKANM_BTK_TEUP_e}, + /* 0x0B */ {dRes_INDEX_LKANM_BTP_TMABAE_e, dRes_INDEX_LKANM_BTK_TEDW_e}, + /* 0x0C */ {dRes_INDEX_LKANM_BTP_TMABAE_e, dRes_INDEX_LKANM_BTK_TEL_e}, + /* 0x0D */ {dRes_INDEX_LKANM_BTP_TMABAE_e, dRes_INDEX_LKANM_BTK_TER_e}, + /* 0x0E */ {dRes_INDEX_LKANM_BTP_TMABAF_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x0F */ {dRes_INDEX_LKANM_BTP_TMABAG_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x10 */ {dRes_INDEX_LKANM_BTP_TMABAH_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x11 */ {dRes_INDEX_LKANM_BTP_TMABAI_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x12 */ {dRes_INDEX_LKANM_BTP_TMABAJ_e, dRes_INDEX_LKANM_BTK_TEYORIME_e}, + /* 0x13 */ {dRes_INDEX_LKANM_BTP_TMABAD_e, dRes_INDEX_LKANM_BTK_TWAITPICKUP_e}, + /* 0x14 */ {dRes_INDEX_LKANM_BTP_TMABAC_e, dRes_INDEX_LKANM_BTK_THOOKSHOTJMP_e}, + /* 0x15 */ {dRes_INDEX_LKANM_BTP_TGRABP_e, dRes_INDEX_LKANM_BTK_TGRABP_e}, + /* 0x16 */ {dRes_INDEX_LKANM_BTP_TGRABUP_e, dRes_INDEX_LKANM_BTK_TGRABUP_e}, + /* 0x17 */ {dRes_INDEX_LKANM_BTP_TGRABNG_e, dRes_INDEX_LKANM_BTK_TGRABNG_e}, + /* 0x18 */ {dRes_INDEX_LKANM_BTP_TGRABTHROW_e, dRes_INDEX_LKANM_BTK_TGRABTHROW_e}, + /* 0x19 */ {dRes_INDEX_LKANM_BTP_TGRABRE_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x1A */ {dRes_INDEX_LKANM_BTP_TWALLWL_e, dRes_INDEX_LKANM_BTK_TER_e}, + /* 0x1B */ {dRes_INDEX_LKANM_BTP_TWALLWR_e, dRes_INDEX_LKANM_BTK_TEL_e}, + /* 0x1C */ {dRes_INDEX_LKANM_BTP_TWALLPL_e, dRes_INDEX_LKANM_BTK_TWALLPL_e}, + /* 0x1D */ {dRes_INDEX_LKANM_BTP_TWALLPR_e, dRes_INDEX_LKANM_BTK_TWALLPR_e}, + /* 0x1E */ {dRes_INDEX_LKANM_BTP_TCUT_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x1F */ {dRes_INDEX_LKANM_BTP_TCUTEA_e, dRes_INDEX_LKANM_BTK_TCUTEA_e}, + /* 0x20 */ {dRes_INDEX_LKANM_BTP_TCUTEA_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x21 */ {dRes_INDEX_LKANM_BTP_TEXCA1_e, dRes_INDEX_LKANM_BTK_TEXCA1_e}, + /* 0x22 */ {dRes_INDEX_LKANM_BTP_TEXCB1_e, dRes_INDEX_LKANM_BTK_TEXCB1_e}, + /* 0x23 */ {dRes_INDEX_LKANM_BTP_TJATTACK_e, dRes_INDEX_LKANM_BTK_TJATTACK_e}, + /* 0x24 */ {dRes_INDEX_LKANM_BTP_TJATTACK_e, dRes_INDEX_LKANM_BTK_TEUP_e}, + /* 0x25 */ {dRes_INDEX_LKANM_BTP_TCUTTURNP_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x26 */ {dRes_INDEX_LKANM_BTP_TCUTTURN_e, dRes_INDEX_LKANM_BTK_TCUTTURN_e}, + /* 0x27 */ {dRes_INDEX_LKANM_BTP_TMJMP_e, dRes_INDEX_LKANM_BTK_TMJMP_e}, + /* 0x28 */ {dRes_INDEX_LKANM_BTP_TMJMPC_e, dRes_INDEX_LKANM_BTK_TMJMPC_e}, + /* 0x29 */ {dRes_INDEX_LKANM_BTP_TMROLLL_e, dRes_INDEX_LKANM_BTK_TMROLLL_e}, + /* 0x2A */ {dRes_INDEX_LKANM_BTP_TMROLLR_e, dRes_INDEX_LKANM_BTK_TMROLLR_e}, + /* 0x2B */ {dRes_INDEX_LKANM_BTP_TMROLLLRC_e, dRes_INDEX_LKANM_BTK_TMROLLLC_e}, + /* 0x2C */ {dRes_INDEX_LKANM_BTP_TMROLLLRC_e, dRes_INDEX_LKANM_BTK_TMROLLRC_e}, + /* 0x2D */ {dRes_INDEX_LKANM_BTP_TMSTEPOVER_e, dRes_INDEX_LKANM_BTK_TMSTEPOVER_e}, + /* 0x2E */ {dRes_INDEX_LKANM_BTP_TMSTEPOVERA_e, dRes_INDEX_LKANM_BTK_TMSTEPOVERA_e}, + /* 0x2F */ {dRes_INDEX_LKANM_BTP_TMSTEPOVERLAND_e, dRes_INDEX_LKANM_BTK_TMSTEPOVERLAND_e}, + /* 0x30 */ {dRes_INDEX_LKANM_BTP_TATNJLR_e, dRes_INDEX_LKANM_BTK_TATNJL_e}, + /* 0x31 */ {dRes_INDEX_LKANM_BTP_TATNJLR_e, dRes_INDEX_LKANM_BTK_TATNJR_e}, + /* 0x32 */ {dRes_INDEX_LKANM_BTP_TJMP_e, dRes_INDEX_LKANM_BTK_TJMP_e}, + /* 0x33 */ {dRes_INDEX_LKANM_BTP_TROLLF_e, dRes_INDEX_LKANM_BTK_TROLLF_e}, + /* 0x34 */ {dRes_INDEX_LKANM_BTP_TROLLB_e, dRes_INDEX_LKANM_BTK_TROLLB_e}, + /* 0x35 */ {dRes_INDEX_LKANM_BTP_TROLLBLAND_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x36 */ {dRes_INDEX_LKANM_BTP_TROLLFMIS_e, dRes_INDEX_LKANM_BTK_TROLLFMIS_e}, + /* 0x37 */ {dRes_INDEX_LKANM_BTP_TFALL_e, dRes_INDEX_LKANM_BTK_TEDW_e}, + /* 0x38 */ {dRes_INDEX_LKANM_BTP_TLANDDAMA_e, dRes_INDEX_LKANM_BTK_TLANDDAMA_e}, + /* 0x39 */ {dRes_INDEX_LKANM_BTP_TLANDDAMAST_e, dRes_INDEX_LKANM_BTK_TLANDDAMAST_e}, + /* 0x3A */ {dRes_INDEX_LKANM_BTP_TDAM_e, dRes_INDEX_LKANM_BTK_TDAM_e}, + /* 0x3B */ {dRes_INDEX_LKANM_BTP_TDAMF_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x3C */ {dRes_INDEX_LKANM_BTP_TDAMFFUP_e, dRes_INDEX_LKANM_BTK_TDAMFFUP_e}, + /* 0x3D */ {dRes_INDEX_LKANM_BTP_TDAMFBUP_e, dRes_INDEX_LKANM_BTK_TDAMFBUP_e}, + /* 0x3E */ {dRes_INDEX_LKANM_BTP_TDAMFLRUP_e, dRes_INDEX_LKANM_BTK_TDAMFLUP_e}, + /* 0x3F */ {dRes_INDEX_LKANM_BTP_TDAMFLRUP_e, dRes_INDEX_LKANM_BTK_TDAMFRUP_e}, + /* 0x40 */ {dRes_INDEX_LKANM_BTP_TDAMDASH_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x41 */ {dRes_INDEX_LKANM_BTP_TGUARD_e, dRes_INDEX_LKANM_BTK_TGUARD_e}, + /* 0x42 */ {dRes_INDEX_LKANM_BTP_TSLIDEF_e, dRes_INDEX_LKANM_BTK_TSLIDEF_e}, + /* 0x43 */ {dRes_INDEX_LKANM_BTP_TSLIDEFLAND_e, dRes_INDEX_LKANM_BTK_TSLIDEFLAND_e}, + /* 0x44 */ {dRes_INDEX_LKANM_BTP_TSLIDEB_e, dRes_INDEX_LKANM_BTK_TEDW_e}, + /* 0x45 */ {dRes_INDEX_LKANM_BTP_TSLIDEBLAND_e, dRes_INDEX_LKANM_BTK_TSLIDEFLAND_e}, + /* 0x46 */ {dRes_INDEX_LKANM_BTP_TSWIMP_e, dRes_INDEX_LKANM_BTK_TSWIMP_e}, + /* 0x47 */ {dRes_INDEX_LKANM_BTP_TSWIMING_e, dRes_INDEX_LKANM_BTK_TSWIMING_e}, + /* 0x48 */ {dRes_INDEX_LKANM_BTP_TBOOMTHROW_e, dRes_INDEX_LKANM_BTK_TBOOMTHROW_e}, + /* 0x49 */ {dRes_INDEX_LKANM_BTP_TBOOMCATCH_e, dRes_INDEX_LKANM_BTK_TBOOMCATCH_e}, + /* 0x4A */ {dRes_INDEX_LKANM_BTP_TWALKPUSH_e, dRes_INDEX_LKANM_BTK_TWALKPUSH_e}, + /* 0x4B */ {dRes_INDEX_LKANM_BTP_TWALKPULL_e, dRes_INDEX_LKANM_BTK_TWALKPULL_e}, + /* 0x4C */ {dRes_INDEX_LKANM_BTP_TVJMPCHA_e, dRes_INDEX_LKANM_BTK_TVJMPCHA_e}, + /* 0x4D */ {dRes_INDEX_LKANM_BTP_TVJMPCL_e, dRes_INDEX_LKANM_BTK_TVJMPCL_e}, + /* 0x4E */ {dRes_INDEX_LKANM_BTP_TROPECLIMB_e, dRes_INDEX_LKANM_BTK_TEUP_e}, + /* 0x4F */ {dRes_INDEX_LKANM_BTP_TROPEDOWN_e, dRes_INDEX_LKANM_BTK_TEDW_e}, + /* 0x50 */ {dRes_INDEX_LKANM_BTP_TLADDERUPST_e, dRes_INDEX_LKANM_BTK_TLADDERUPST_e}, + /* 0x51 */ {dRes_INDEX_LKANM_BTP_TLADDERDWST_e, dRes_INDEX_LKANM_BTK_TLADDERDWST_e}, + /* 0x52 */ {dRes_INDEX_LKANM_BTP_TLADDERUPED_e, dRes_INDEX_LKANM_BTK_TLADDERUPED_e}, + /* 0x53 */ {dRes_INDEX_LKANM_BTP_TLADDERDWED_e, dRes_INDEX_LKANM_BTK_TLADDERDWED_e}, + /* 0x54 */ {dRes_INDEX_LKANM_BTP_THANGING_e, dRes_INDEX_LKANM_BTK_THANGING_e}, + /* 0x55 */ {dRes_INDEX_LKANM_BTP_THANGUP_e, dRes_INDEX_LKANM_BTK_THANGUP_e}, + /* 0x56 */ {dRes_INDEX_LKANM_BTP_TLAVADAM_e, dRes_INDEX_LKANM_BTK_TLAVADAM_e}, + /* 0x57 */ {dRes_INDEX_LKANM_BTP_TCUTRE_e, dRes_INDEX_LKANM_BTK_TCUTRE_e}, + /* 0x58 */ {dRes_INDEX_LKANM_BTP_TCUTTURNB_e, dRes_INDEX_LKANM_BTK_TCUTTURNB_e}, + /* 0x59 */ {dRes_INDEX_LKANM_BTP_TWAITATOB_e, dRes_INDEX_LKANM_BTK_TWAITATOB_e}, + /* 0x5A */ {dRes_INDEX_LKANM_BTP_TCOMEOUT_e, dRes_INDEX_LKANM_BTK_TCOMEOUT_e}, + /* 0x5B */ {dRes_INDEX_LKANM_BTP_THOLDUP_e, dRes_INDEX_LKANM_BTK_TMABA_e}, + /* 0x5C */ {dRes_INDEX_LKANM_BTP_TWALLHOLDUP_e, dRes_INDEX_LKANM_BTK_TWALLHOLDUP_e}, + /* 0x5D */ {dRes_INDEX_LKANM_BTP_TITEMGET_e, dRes_INDEX_LKANM_BTK_TITEMGET_e}, + /* 0x5E */ {dRes_INDEX_LKANM_BTP_TSALTATION_e, dRes_INDEX_LKANM_BTK_TSALTATION_e}, + /* 0x5F */ {dRes_INDEX_LKANM_BTP_TWHO_e, dRes_INDEX_LKANM_BTK_TWHO_e}, + /* 0x60 */ {dRes_INDEX_LKANM_BTP_TPICKUP_e, dRes_INDEX_LKANM_BTK_TPICKUP_e}, + /* 0x61 */ {dRes_INDEX_LKANM_BTP_TBOXOPENLINK_e, dRes_INDEX_LKANM_BTK_TBOXOPENLINK_e}, + /* 0x62 */ {dRes_INDEX_LKANM_BTP_TBOXOPENSHORTLINK_e, dRes_INDEX_LKANM_BTK_TBOXOPENSHORTLINK_e}, + /* 0x63 */ {dRes_INDEX_LKANM_BTP_TDIELONG_e, dRes_INDEX_LKANM_BTK_TDIELONG_e}, + /* 0x64 */ {dRes_INDEX_LKANM_BTP_TSWIMDIE_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x65 */ {dRes_INDEX_LKANM_BTP_TSURPRISED_e, dRes_INDEX_LKANM_BTK_TSURPRISED_e}, + /* 0x66 */ {dRes_INDEX_LKANM_BTP_TTURNBACK_e, dRes_INDEX_LKANM_BTK_TTURNBACK_e}, + /* 0x67 */ {dRes_INDEX_LKANM_BTP_TLOOKUP_e, dRes_INDEX_LKANM_BTK_TLOOKUP_e}, + /* 0x68 */ {dRes_INDEX_LKANM_BTP_TWAITQ_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x69 */ {dRes_INDEX_LKANM_BTP_TGLAD_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x6A */ {dRes_INDEX_LKANM_BTP_TCUTBOKO_e, dRes_INDEX_LKANM_BTK_TCUTBOKO_e}, + /* 0x6B */ {dRes_INDEX_LKANM_BTP_SHIP_JUMP1_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x6C */ {dRes_INDEX_LKANM_BTP_SHIP_JUMP2_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x6D */ {dRes_INDEX_LKANM_BTP_TUSEFANA_e, dRes_INDEX_LKANM_BTK_TUSEFANA_e}, + /* 0x6E */ {dRes_INDEX_LKANM_BTP_TUSEFANB_e, dRes_INDEX_LKANM_BTK_TUSEFANB_e}, + /* 0x6F */ {dRes_INDEX_LKANM_BTP_TUSEFANB2_e, dRes_INDEX_LKANM_BTK_TEDW_e}, + /* 0x70 */ {dRes_INDEX_LKANM_BTP_TBOWWAIT_e, dRes_INDEX_LKANM_BTK_TBOWWAIT_e}, + /* 0x71 */ {dRes_INDEX_LKANM_BTP_TVOMITJMP_e, dRes_INDEX_LKANM_BTK_TEDW_e}, + /* 0x72 */ {dRes_INDEX_LKANM_BTP_TREST_e, dRes_INDEX_LKANM_BTK_TREST_e}, + /* 0x73 */ {dRes_INDEX_LKANM_BTP_TTAKE_e, dRes_INDEX_LKANM_BTK_TTAKE_e}, + /* 0x74 */ {dRes_INDEX_LKANM_BTP_TTAKELR_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x75 */ {dRes_INDEX_LKANM_BTP_TSLIPICE_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x76 */ {dRes_INDEX_LKANM_BTP_THAMSWINGA_e, dRes_INDEX_LKANM_BTK_THAMSWINGA_e}, + /* 0x77 */ {dRes_INDEX_LKANM_BTP_THAMSWINGBPRE_e, dRes_INDEX_LKANM_BTK_THAMSWINGBPRE_e}, + /* 0x78 */ {dRes_INDEX_LKANM_BTP_THAMSWINGBHIT_e, dRes_INDEX_LKANM_BTK_THAMSWINGBHIT_e}, + /* 0x79 */ {dRes_INDEX_LKANM_BTP_THAMSWINGBEND_e, dRes_INDEX_LKANM_BTK_THAMSWINGBEND_e}, + /* 0x7A */ {dRes_INDEX_LKANM_BTP_TSETBOOTS_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x7B */ {dRes_INDEX_LKANM_BTP_TDOOROPENALINK_e, dRes_INDEX_LKANM_BTK_TDOOROPENALINK_e}, + /* 0x7C */ {dRes_INDEX_LKANM_BTP_TDOOROPENBLINK_e, dRes_INDEX_LKANM_BTK_TDOOROPENBLINK_e}, + /* 0x7D */ {dRes_INDEX_LKANM_BTP_TSEYYES_e, dRes_INDEX_LKANM_BTK_TSEYYES_e}, + /* 0x7E */ {dRes_INDEX_LKANM_BTP_TPRESENTATION_e, dRes_INDEX_LKANM_BTK_TPRESENTATIONA_e}, + /* 0x7F */ {dRes_INDEX_LKANM_BTP_TWIND_e, dRes_INDEX_LKANM_BTK_TWINDL_e}, + /* 0x80 */ {dRes_INDEX_LKANM_BTP_TWIND_e, dRes_INDEX_LKANM_BTK_TWINDR_e}, + /* 0x81 */ {dRes_INDEX_LKANM_BTP_TPRESENTATION_e, dRes_INDEX_LKANM_BTK_TPRESENTATIONB_e}, + /* 0x82 */ {dRes_INDEX_LKANM_BTP_TBINDRINKPRE_e, dRes_INDEX_LKANM_BTK_TBINDRINKPRE_e}, + /* 0x83 */ {dRes_INDEX_LKANM_BTP_TBINDRINKING_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x84 */ {dRes_INDEX_LKANM_BTP_TBINDRINKAFTER_e, dRes_INDEX_LKANM_BTK_TBINDRINKAFTER_e}, + /* 0x85 */ {dRes_INDEX_LKANM_BTP_TBINDRINKPRE2_e, dRes_INDEX_LKANM_BTK_TBINDRINKPRE_e}, + /* 0x86 */ {dRes_INDEX_LKANM_BTP_TBINDRINKING2_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x87 */ {dRes_INDEX_LKANM_BTP_TBINDRINKAFTER2_e, dRes_INDEX_LKANM_BTK_TBINDRINKAFTER2_e}, + /* 0x88 */ {dRes_INDEX_LKANM_BTP_TBINOPENPRE_e, dRes_INDEX_LKANM_BTK_TBINOPENPRE_e}, + /* 0x89 */ {dRes_INDEX_LKANM_BTP_TBINOPENA_e, dRes_INDEX_LKANM_BTK_TBINOPENA_e}, + /* 0x8A */ {dRes_INDEX_LKANM_BTP_TBINOPENB_e, dRes_INDEX_LKANM_BTK_TBINOPENB_e}, + /* 0x8B */ {dRes_INDEX_LKANM_BTP_TBINSWING_e, dRes_INDEX_LKANM_BTK_TBINSWING_e}, + /* 0x8C */ {dRes_INDEX_LKANM_BTP_TBINGET_e, dRes_INDEX_LKANM_BTK_TBINGET_e}, + /* 0x8D */ {dRes_INDEX_LKANM_BTP_TARROWRELORD_e, dRes_INDEX_LKANM_BTK_TARROWRELORD_e}, + /* 0x8E */ {dRes_INDEX_LKANM_BTP_TSURPRISEDB_e, dRes_INDEX_LKANM_BTK_TSURPRISEDB_e}, + /* 0x8F */ {dRes_INDEX_LKANM_BTP_TFAN_e, dRes_INDEX_LKANM_BTK_TFAN_e}, + /* 0x90 */ {dRes_INDEX_LKANM_BTP_TNENRIKI_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x91 */ {dRes_INDEX_LKANM_BTP_TMABAB_e, dRes_INDEX_LKANM_BTK_TEDL_e}, + /* 0x92 */ {dRes_INDEX_LKANM_BTP_TMABAH_e, dRes_INDEX_LKANM_BTK_TABEKOBE_e}, + /* 0x93 */ {dRes_INDEX_LKANM_BTP_TSETHYOINOMI_e, dRes_INDEX_LKANM_BTK_TSETHYOINOMI_e}, + /* 0x94 */ {dRes_INDEX_LKANM_BTP_LINK_FREEZ_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x95 */ {dRes_INDEX_LKANM_BTP_LINK_MOGAKI_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0x96 */ {dRes_INDEX_LKANM_BTP_TDAMBIRI_e, dRes_INDEX_LKANM_BTK_TDAMBIRI_e}, + /* 0x97 */ {dRes_INDEX_LKANM_BTP_SALVLR_e, dRes_INDEX_LKANM_BTK_SALVWAIT_e}, + /* 0x98 */ {dRes_INDEX_LKANM_BTP_SALVWAIT_e, dRes_INDEX_LKANM_BTK_SALVWAIT_e}, + /* 0x99 */ {dRes_INDEX_LKANM_BTP_SALVBAD_e, dRes_INDEX_LKANM_BTK_SALVWAIT_e}, + /* 0x9A */ {dRes_INDEX_LKANM_BTP_SALVGOOD_e, dRes_INDEX_LKANM_BTK_SALVWAIT_e}, + /* 0x9B */ {dRes_INDEX_LKANM_BTP_SEARESET_e, dRes_INDEX_LKANM_BTK_SEARESET_e}, + /* 0x9C */ {dRes_INDEX_LKANM_BTP_TWARPIN_e, dRes_INDEX_LKANM_BTK_TWARPIN_e}, + /* 0x9D */ {dRes_INDEX_LKANM_BTP_TWARPOUT_e, dRes_INDEX_LKANM_BTK_TWARPOUT_e}, + /* 0x9E */ {dRes_INDEX_LKANM_BTP_TPOWUPWAIT_e, dRes_INDEX_LKANM_BTK_TPOWUPWAIT_e}, + /* 0x9F */ {dRes_INDEX_LKANM_BTP_TPOWUP_e, dRes_INDEX_LKANM_BTK_TPOWUP_e}, + /* 0xA0 */ {dRes_INDEX_LKANM_BTP_TCUTKESA_e, dRes_INDEX_LKANM_BTK_TCUTKESA_e}, + /* 0xA1 */ {dRes_INDEX_LKANM_BTP_TWARPOUTFIRST_e, dRes_INDEX_LKANM_BTK_TWARPOUTFIRST_e}, + /* 0xA2 */ {dRes_INDEX_LKANM_BTP_TDASHKAZE_e, dRes_INDEX_LKANM_BTK_TDASHKAZE_e}, + /* 0xA3 */ {dRes_INDEX_LKANM_BTP_TIYAYA_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0xA4 */ {dRes_INDEX_LKANM_BTP_TFREEA_e, dRes_INDEX_LKANM_BTK_TFREEA_e}, + /* 0xA5 */ {dRes_INDEX_LKANM_BTP_TFREEB_e, dRes_INDEX_LKANM_BTK_TFREEB_e}, + /* 0xA6 */ {dRes_INDEX_LKANM_BTP_TFREED_e, dRes_INDEX_LKANM_BTK_TFREED_e}, + /* 0xA7 */ {dRes_INDEX_LKANM_BTP_TTAKTKAZE_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0xA8 */ {dRes_INDEX_LKANM_BTP_TTAKTSIPPU_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0xA9 */ {dRes_INDEX_LKANM_BTP_TTAKTCHUYA_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0xAA */ {dRes_INDEX_LKANM_BTP_TTAKTFUJIN_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0xAB */ {dRes_INDEX_LKANM_BTP_TTAKTAYATSURI_e, dRes_INDEX_LKANM_BTK_TECN_e}, + /* 0xAC */ {dRes_INDEX_LKANM_BTP_TTAKTCHISIN_e, dRes_INDEX_LKANM_BTK_TECN_e}, }; const daPy_anmIndex_c daPy_lk_c::mSwordAnmIndexTable[] = { { // 0x00: ANM_WAITS - /* mUnderBckIdx */ LKANM_BCK_WAITS, - /* mUpperBckIdx */ LKANM_BCK_WAITS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITS_e, }, { // 0x01: ANM_WALK - /* mUnderBckIdx */ LKANM_BCK_WALKS, - /* mUpperBckIdx */ LKANM_BCK_WALKS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKS_e, }, { // 0x02: ANM_DASH - /* mUnderBckIdx */ LKANM_BCK_DASHS, - /* mUpperBckIdx */ LKANM_BCK_DASHS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DASHS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHS_e, }, { // 0x03: ANM_DASHKAZE - /* mUnderBckIdx */ LKANM_BCK_DASHS, - /* mUpperBckIdx */ LKANM_BCK_DASHKAZE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DASHS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHKAZE_e, }, { // 0x04: ANM_WALKHBOOTS - /* mUnderBckIdx */ LKANM_BCK_WALKHBOOTS, - /* mUpperBckIdx */ LKANM_BCK_WALKHBOOTS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, }, { // 0x05: ANM_WALKHBOOTSKAZE - /* mUnderBckIdx */ LKANM_BCK_WALKHBOOTS, - /* mUpperBckIdx */ LKANM_BCK_DASHKAZE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHKAZE_e, }, { // 0x06: ANM_WALKSLOPE - /* mUnderBckIdx */ LKANM_BCK_WALKSLOPE, - /* mUpperBckIdx */ LKANM_BCK_WALKSLOPE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKSLOPE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKSLOPE_e, }, { // 0x07: ANM_ATNLS - /* mUnderBckIdx */ LKANM_BCK_ATNLS, - /* mUpperBckIdx */ LKANM_BCK_ATNLS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNLS_e, }, { // 0x08: ANM_ATNRS - /* mUnderBckIdx */ LKANM_BCK_ATNRS, - /* mUpperBckIdx */ LKANM_BCK_ATNRS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNRS_e, }, { // 0x09: ANM_ATNWLS - /* mUnderBckIdx */ LKANM_BCK_ATNWLS, - /* mUpperBckIdx */ LKANM_BCK_ATNWLS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNWLS_e, }, { // 0x0A: ANM_ATNWRS - /* mUnderBckIdx */ LKANM_BCK_ATNWRS, - /* mUpperBckIdx */ LKANM_BCK_ATNWRS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNWRS_e, }, { // 0x0B: ANM_ATNDLS - /* mUnderBckIdx */ LKANM_BCK_ATNDLS, - /* mUpperBckIdx */ LKANM_BCK_ATNDLS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNDLS_e, }, { // 0x0C: ANM_ATNDRS - /* mUnderBckIdx */ LKANM_BCK_ATNDRS, - /* mUpperBckIdx */ LKANM_BCK_ATNDRS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNDRS_e, }, { // 0x0D: ANM_JMPEDS - /* mUnderBckIdx */ LKANM_BCK_JMPEDS, - /* mUpperBckIdx */ LKANM_BCK_JMPEDS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JMPEDS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JMPEDS_e, }, { // 0x0E: ANM_ATNWB - /* mUnderBckIdx */ LKANM_BCK_ATNWB, - /* mUpperBckIdx */ LKANM_BCK_ATNWB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNWB_e, }, { // 0x0F: ANM_ATNDB - /* mUnderBckIdx */ LKANM_BCK_ATNDB, - /* mUpperBckIdx */ LKANM_BCK_ATNDB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNDB_e, }, { // 0x10: ANM_ATNJL - /* mUnderBckIdx */ LKANM_BCK_ATNJL, - /* mUpperBckIdx */ LKANM_BCK_ATNJL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNJL_e, }, { // 0x11: ANM_ATNJR - /* mUnderBckIdx */ LKANM_BCK_ATNJR, - /* mUpperBckIdx */ LKANM_BCK_ATNJR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNJR_e, }, { // 0x12: ANM_ATNJLLAND - /* mUnderBckIdx */ LKANM_BCK_ATNJLLAND, - /* mUpperBckIdx */ LKANM_BCK_ATNJLLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJLLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNJLLAND_e, }, { // 0x13: ANM_ATNJRLAND - /* mUnderBckIdx */ LKANM_BCK_ATNJRLAND, - /* mUpperBckIdx */ LKANM_BCK_ATNJRLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJRLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNJRLAND_e, }, { // 0x14: ANM_ROT - /* mUnderBckIdx */ LKANM_BCK_ROT, - /* mUpperBckIdx */ LKANM_BCK_ROT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROT_e, }, { // 0x15: ANM_CUTREL - /* mUnderBckIdx */ LKANM_BCK_CUTREL, - /* mUpperBckIdx */ LKANM_BCK_CUTRER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTREL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTRER_e, }, { // 0x16: ANM_DIFENCE - /* mUnderBckIdx */ LKANM_BCK_DIFENCE, - /* mUpperBckIdx */ LKANM_BCK_DIFENCE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCE_e, }, { // 0x17: ANM_DIFENCEA - /* mUnderBckIdx */ LKANM_BCK_DIFENCEA, - /* mUpperBckIdx */ LKANM_BCK_DIFENCEA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEA_e, }, { // 0x18: ANM_CUTTURNP - /* mUnderBckIdx */ LKANM_BCK_CUTTURNP, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNP_e, }, { // 0x19: ANM_CUTTURNPWFB - /* mUnderBckIdx */ LKANM_BCK_CUTTURNPWFB, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPWFB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWFB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWFB_e, }, { // 0x1A: ANM_CUTTURNPWLR - /* mUnderBckIdx */ LKANM_BCK_CUTTURNPWLR, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPWLR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWLR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWLR_e, }, }; const daPy_anmIndex_c daPy_lk_c::mBokoAnmIndexTable[] = { { // 0x00: ANM_WAITS - /* mUnderBckIdx */ LKANM_BCK_WAITS, - /* mUpperBckIdx */ LKANM_BCK_WAITBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITBOKO_e, }, { // 0x01: ANM_WALK - /* mUnderBckIdx */ LKANM_BCK_WALKS, - /* mUpperBckIdx */ LKANM_BCK_WALKBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKBOKO_e, }, { // 0x02: ANM_DASH - /* mUnderBckIdx */ LKANM_BCK_DASHS, - /* mUpperBckIdx */ LKANM_BCK_DASHBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DASHS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHBOKO_e, }, { // 0x03: ANM_DASHKAZE - /* mUnderBckIdx */ LKANM_BCK_DASHS, - /* mUpperBckIdx */ LKANM_BCK_DASHBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DASHS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHBOKO_e, }, { // 0x04: ANM_WALKHBOOTS - /* mUnderBckIdx */ LKANM_BCK_WALKHBOOTS, - /* mUpperBckIdx */ LKANM_BCK_WALKBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKBOKO_e, }, { // 0x05: ANM_WALKHBOOTSKAZE - /* mUnderBckIdx */ LKANM_BCK_WALKHBOOTS, - /* mUpperBckIdx */ LKANM_BCK_WALKBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKBOKO_e, }, { // 0x06: ANM_WALKSLOPE - /* mUnderBckIdx */ LKANM_BCK_WALKSLOPE, - /* mUpperBckIdx */ LKANM_BCK_WALKBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKSLOPE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKBOKO_e, }, { // 0x07: ANM_ATNLS - /* mUnderBckIdx */ LKANM_BCK_ATNLS, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x08: ANM_ATNRS - /* mUnderBckIdx */ LKANM_BCK_ATNRS, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x09: ANM_ATNWLS - /* mUnderBckIdx */ LKANM_BCK_ATNWLS, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x0A: ANM_ATNWRS - /* mUnderBckIdx */ LKANM_BCK_ATNWRS, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x0B: ANM_ATNDLS - /* mUnderBckIdx */ LKANM_BCK_ATNDLS, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x0C: ANM_ATNDRS - /* mUnderBckIdx */ LKANM_BCK_ATNDRS, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x0D: ANM_JMPEDS - /* mUnderBckIdx */ LKANM_BCK_JMPEDS, - /* mUpperBckIdx */ LKANM_BCK_JMPEDS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JMPEDS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JMPEDS_e, }, { // 0x0E: ANM_ATNWB - /* mUnderBckIdx */ LKANM_BCK_ATNWB, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x0F: ANM_ATNDB - /* mUnderBckIdx */ LKANM_BCK_ATNDB, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x10: ANM_ATNJL - /* mUnderBckIdx */ LKANM_BCK_ATNJL, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x11: ANM_ATNJR - /* mUnderBckIdx */ LKANM_BCK_ATNJR, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x12: ANM_ATNJLLAND - /* mUnderBckIdx */ LKANM_BCK_ATNJLLAND, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJLLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x13: ANM_ATNJRLAND - /* mUnderBckIdx */ LKANM_BCK_ATNJRLAND, - /* mUpperBckIdx */ LKANM_BCK_ATNBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJRLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNBOKO_e, }, { // 0x14: ANM_ROT - /* mUnderBckIdx */ LKANM_BCK_ROT, - /* mUpperBckIdx */ LKANM_BCK_WAITBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITBOKO_e, }, { // 0x15: ANM_CUTREL - /* mUnderBckIdx */ LKANM_BCK_CUTREL, - /* mUpperBckIdx */ LKANM_BCK_CUTRER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTREL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTRER_e, }, { // 0x16: ANM_DIFENCE - /* mUnderBckIdx */ LKANM_BCK_DIFENCE, - /* mUpperBckIdx */ LKANM_BCK_DIFENCE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCE_e, }, { // 0x17: ANM_DIFENCEA - /* mUnderBckIdx */ LKANM_BCK_DIFENCEA, - /* mUpperBckIdx */ LKANM_BCK_DIFENCEA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEA_e, }, { // 0x18: ANM_CUTTURNP - /* mUnderBckIdx */ LKANM_BCK_CUTTURNP, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPB_e, }, { // 0x19: ANM_CUTTURNPWFB - /* mUnderBckIdx */ LKANM_BCK_CUTTURNPWFB, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWFB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPB_e, }, { // 0x1A: ANM_CUTTURNPWLR - /* mUnderBckIdx */ LKANM_BCK_CUTTURNPWLR, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWLR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPB_e, }, }; const daPy_anmIndex_c daPy_lk_c::mHammerAnmIndexTable[] = { { // 0x00: ANM_WAITS - /* mUnderBckIdx */ LKANM_BCK_WAITS, - /* mUpperBckIdx */ LKANM_BCK_WAITHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITHAM_e, }, { // 0x01: ANM_WALK - /* mUnderBckIdx */ LKANM_BCK_WALKS, - /* mUpperBckIdx */ LKANM_BCK_WALKHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKHAM_e, }, { // 0x02: ANM_DASH - /* mUnderBckIdx */ LKANM_BCK_DASHS, - /* mUpperBckIdx */ LKANM_BCK_DASHHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DASHS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHHAM_e, }, { // 0x03: ANM_DASHKAZE - /* mUnderBckIdx */ LKANM_BCK_DASHS, - /* mUpperBckIdx */ LKANM_BCK_DASHHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DASHS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHHAM_e, }, { // 0x04: ANM_WALKHBOOTS - /* mUnderBckIdx */ LKANM_BCK_WALKHBOOTS, - /* mUpperBckIdx */ LKANM_BCK_WALKHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKHAM_e, }, { // 0x05: ANM_WALKHBOOTSKAZE - /* mUnderBckIdx */ LKANM_BCK_WALKHBOOTS, - /* mUpperBckIdx */ LKANM_BCK_WALKHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKHAM_e, }, { // 0x06: ANM_WALKSLOPE - /* mUnderBckIdx */ LKANM_BCK_WALKSLOPE, - /* mUpperBckIdx */ LKANM_BCK_WALKHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKSLOPE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKHAM_e, }, { // 0x07: ANM_ATNLS - /* mUnderBckIdx */ LKANM_BCK_ATNLS, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x08: ANM_ATNRS - /* mUnderBckIdx */ LKANM_BCK_ATNRS, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x09: ANM_ATNWLS - /* mUnderBckIdx */ LKANM_BCK_ATNWLS, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x0A: ANM_ATNWRS - /* mUnderBckIdx */ LKANM_BCK_ATNWRS, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x0B: ANM_ATNDLS - /* mUnderBckIdx */ LKANM_BCK_ATNDLS, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x0C: ANM_ATNDRS - /* mUnderBckIdx */ LKANM_BCK_ATNDRS, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x0D: ANM_JMPEDS - /* mUnderBckIdx */ LKANM_BCK_JMPEDS, - /* mUpperBckIdx */ LKANM_BCK_JMPEDS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JMPEDS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JMPEDS_e, }, { // 0x0E: ANM_ATNWB - /* mUnderBckIdx */ LKANM_BCK_ATNWB, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x0F: ANM_ATNDB - /* mUnderBckIdx */ LKANM_BCK_ATNDB, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x10: ANM_ATNJL - /* mUnderBckIdx */ LKANM_BCK_ATNJL, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x11: ANM_ATNJR - /* mUnderBckIdx */ LKANM_BCK_ATNJR, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x12: ANM_ATNJLLAND - /* mUnderBckIdx */ LKANM_BCK_ATNJLLAND, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJLLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x13: ANM_ATNJRLAND - /* mUnderBckIdx */ LKANM_BCK_ATNJRLAND, - /* mUpperBckIdx */ LKANM_BCK_ATNHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJRLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNHAM_e, }, { // 0x14: ANM_ROT - /* mUnderBckIdx */ LKANM_BCK_ROT, - /* mUpperBckIdx */ LKANM_BCK_WAITHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITHAM_e, }, { // 0x15: ANM_CUTREL - /* mUnderBckIdx */ LKANM_BCK_CUTREL, - /* mUpperBckIdx */ LKANM_BCK_CUTREHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTREL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTREHAM_e, }, { // 0x16: ANM_DIFENCE - /* mUnderBckIdx */ LKANM_BCK_DIFENCE, - /* mUpperBckIdx */ LKANM_BCK_DIFENCEHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEHAM_e, }, { // 0x17: ANM_DIFENCEA - /* mUnderBckIdx */ LKANM_BCK_DIFENCEA, - /* mUpperBckIdx */ LKANM_BCK_DIFENCEAHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEAHAM_e, }, { // 0x18: ANM_CUTTURNP - /* mUnderBckIdx */ LKANM_BCK_CUTTURNP, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNP_e, }, { // 0x19: ANM_CUTTURNPWFB - /* mUnderBckIdx */ LKANM_BCK_CUTTURNPWFB, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPWFB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWFB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWFB_e, }, { // 0x1A: ANM_CUTTURNPWLR - /* mUnderBckIdx */ LKANM_BCK_CUTTURNPWLR, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPWLR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWLR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWLR_e, }, }; const daPy_lk_c::AnmDataTableEntry daPy_lk_c::mAnmDataTable[] = { { // 0x00: ANM_WAITS - /* mUnderBckIdx */ LKANM_BCK_WAITS, - /* mUpperBckIdx */ LKANM_BCK_WAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAIT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x01: ANM_WALK - /* mUnderBckIdx */ LKANM_BCK_WALK, - /* mUpperBckIdx */ LKANM_BCK_WALK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALK_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x02: ANM_DASH - /* mUnderBckIdx */ LKANM_BCK_DASH, - /* mUpperBckIdx */ LKANM_BCK_DASH, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DASH_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASH_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0000, }, { // 0x03: ANM_DASHKAZE - /* mUnderBckIdx */ LKANM_BCK_DASH, - /* mUpperBckIdx */ LKANM_BCK_DASHKAZE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DASH_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHKAZE_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0000, }, { // 0x04: ANM_WALKHBOOTS - /* mUnderBckIdx */ LKANM_BCK_WALKHBOOTS, - /* mUpperBckIdx */ LKANM_BCK_WALKHBOOTS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x05: ANM_WALKHBOOTSKAZE - /* mUnderBckIdx */ LKANM_BCK_WALKHBOOTS, - /* mUpperBckIdx */ LKANM_BCK_DASHKAZE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKHBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DASHKAZE_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x06: ANM_WALKSLOPE - /* mUnderBckIdx */ LKANM_BCK_WALKSLOPE, - /* mUpperBckIdx */ LKANM_BCK_WALKSLOPE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKSLOPE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKSLOPE_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0000, }, { // 0x07: ANM_ATNLS - /* mUnderBckIdx */ LKANM_BCK_ATNLS, - /* mUpperBckIdx */ LKANM_BCK_ATNL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x08: ANM_ATNRS - /* mUnderBckIdx */ LKANM_BCK_ATNRS, - /* mUpperBckIdx */ LKANM_BCK_ATNR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x09: ANM_ATNWLS - /* mUnderBckIdx */ LKANM_BCK_ATNWLS, - /* mUpperBckIdx */ LKANM_BCK_ATNWL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNWL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x0A: ANM_ATNWRS - /* mUnderBckIdx */ LKANM_BCK_ATNWRS, - /* mUpperBckIdx */ LKANM_BCK_ATNWR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNWR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x0B: ANM_ATNDLS - /* mUnderBckIdx */ LKANM_BCK_ATNDLS, - /* mUpperBckIdx */ LKANM_BCK_ATNDL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDLS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNDL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x0C: ANM_ATNDRS - /* mUnderBckIdx */ LKANM_BCK_ATNDRS, - /* mUpperBckIdx */ LKANM_BCK_ATNDR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDRS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNDR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x0D: ANM_JMPEDS - /* mUnderBckIdx */ LKANM_BCK_JMPEDS, - /* mUpperBckIdx */ LKANM_BCK_JMPED, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JMPEDS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JMPED_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x0E: ANM_ATNWB - /* mUnderBckIdx */ LKANM_BCK_ATNWB, - /* mUpperBckIdx */ LKANM_BCK_ATNWB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNWB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNWB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x0F: ANM_ATNDB - /* mUnderBckIdx */ LKANM_BCK_ATNDB, - /* mUpperBckIdx */ LKANM_BCK_ATNDB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNDB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNDB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x10: ANM_ATNJL - /* mUnderBckIdx */ LKANM_BCK_ATNJL, - /* mUpperBckIdx */ LKANM_BCK_ATNJL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNJL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0030, }, { // 0x11: ANM_ATNJR - /* mUnderBckIdx */ LKANM_BCK_ATNJR, - /* mUpperBckIdx */ LKANM_BCK_ATNJR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNJR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0031, }, { // 0x12: ANM_ATNJLLAND - /* mUnderBckIdx */ LKANM_BCK_ATNJLLAND, - /* mUpperBckIdx */ LKANM_BCK_ATNJLLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJLLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNJLLAND_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x13: ANM_ATNJRLAND - /* mUnderBckIdx */ LKANM_BCK_ATNJRLAND, - /* mUpperBckIdx */ LKANM_BCK_ATNJRLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNJRLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNJRLAND_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x14: ANM_ROT - /* mUnderBckIdx */ LKANM_BCK_ROT, - /* mUpperBckIdx */ LKANM_BCK_ROT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x15: ANM_CUTREL - /* mUnderBckIdx */ LKANM_BCK_CUTREL, - /* mUpperBckIdx */ LKANM_BCK_CUTRER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTREL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTRER_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0057, }, { // 0x16: ANM_DIFENCE - /* mUnderBckIdx */ LKANM_BCK_DIFENCE, - /* mUpperBckIdx */ LKANM_BCK_DIFENCE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCE_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0002, }, { // 0x17: ANM_DIFENCEA - /* mUnderBckIdx */ LKANM_BCK_DIFENCEA, - /* mUpperBckIdx */ LKANM_BCK_DIFENCEA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIFENCEA_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0041, }, { // 0x18: ANM_CUTTURNP - /* mUnderBckIdx */ LKANM_BCK_CUTTURNP, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNP_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0025, }, { // 0x19: ANM_CUTTURNPWFB - /* mUnderBckIdx */ LKANM_BCK_CUTTURNPWFB, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPWFB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWFB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWFB_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0026, }, { // 0x1A: ANM_CUTTURNPWLR - /* mUnderBckIdx */ LKANM_BCK_CUTTURNPWLR, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNPWLR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWLR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNPWLR_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0026, }, { // 0x1B: ANM_TALKA - /* mUnderBckIdx */ LKANM_BCK_TALKA, - /* mUpperBckIdx */ LKANM_BCK_TALKA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TALKA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TALKA_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x1C: ANM_WAITB - /* mUnderBckIdx */ LKANM_BCK_WAITB, - /* mUpperBckIdx */ LKANM_BCK_WAITB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x000E, }, { // 0x1D: ANM_WAITATOB - /* mUnderBckIdx */ LKANM_BCK_WAITATOB, - /* mUpperBckIdx */ LKANM_BCK_WAITATOB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITATOB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITATOB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0059, }, { // 0x1E: ANM_CUTA - /* mUnderBckIdx */ LKANM_BCK_CUTA, - /* mUpperBckIdx */ LKANM_BCK_CUTA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTA_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x001E, }, { // 0x1F: ANM_CUTF - /* mUnderBckIdx */ LKANM_BCK_CUTF, - /* mUpperBckIdx */ LKANM_BCK_CUTF, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTF_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTF_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x001E, }, { // 0x20: ANM_CUTR - /* mUnderBckIdx */ LKANM_BCK_CUTR, - /* mUpperBckIdx */ LKANM_BCK_CUTR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTR_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x001E, }, { // 0x21: ANM_CUTL - /* mUnderBckIdx */ LKANM_BCK_CUTL, - /* mUpperBckIdx */ LKANM_BCK_CUTL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTL_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x001E, }, { // 0x22: ANM_CUTEA - /* mUnderBckIdx */ LKANM_BCK_CUTEA, - /* mUpperBckIdx */ LKANM_BCK_CUTEA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTEA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTEA_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x001F, }, { // 0x23: ANM_CUTEB - /* mUnderBckIdx */ LKANM_BCK_CUTEB, - /* mUpperBckIdx */ LKANM_BCK_CUTEB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTEB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTEB_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0020, }, { // 0x24: ANM_EXCA1 - /* mUnderBckIdx */ LKANM_BCK_EXCA1, - /* mUpperBckIdx */ LKANM_BCK_EXCA1, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_EXCA1_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_EXCA1_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0021, }, { // 0x25: ANM_EXCB1 - /* mUnderBckIdx */ LKANM_BCK_EXCB1, - /* mUpperBckIdx */ LKANM_BCK_EXCB1, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_EXCB1_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_EXCB1_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0022, }, { // 0x26: ANM_CUTBOKO - /* mUnderBckIdx */ LKANM_BCK_CUTBOKO, - /* mUpperBckIdx */ LKANM_BCK_CUTBOKO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTBOKO_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTBOKO_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x006A, }, { // 0x27: ANM_CUTRER - /* mUnderBckIdx */ LKANM_BCK_CUTRER, - /* mUpperBckIdx */ LKANM_BCK_CUTRER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTRER_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTRER_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0057, }, { // 0x28: ANM_CUTTURN - /* mUnderBckIdx */ LKANM_BCK_CUTTURN, - /* mUpperBckIdx */ LKANM_BCK_CUTTURN, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURN_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURN_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0026, }, { // 0x29: ANM_CUTTURNC - /* mUnderBckIdx */ LKANM_BCK_CUTTURN, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNC, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURN_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNC_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0026, }, { // 0x2A: ANM_CUTTURNB - /* mUnderBckIdx */ LKANM_BCK_CUTTURNB, - /* mUpperBckIdx */ LKANM_BCK_CUTTURNB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTTURNB_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0058, }, { // 0x2B: ANM_JATTACK - /* mUnderBckIdx */ LKANM_BCK_JATTACK, - /* mUpperBckIdx */ LKANM_BCK_JATTACK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JATTACK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JATTACK_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0023, }, { // 0x2C: ANM_JATTCKP - /* mUnderBckIdx */ LKANM_BCK_JATTCKP, - /* mUpperBckIdx */ LKANM_BCK_JATTCKP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JATTCKP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JATTCKP_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0023, }, { // 0x2D: ANM_JATTCKCUT - /* mUnderBckIdx */ LKANM_BCK_JATTCKCUT, - /* mUpperBckIdx */ LKANM_BCK_JATTCKCUT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JATTCKCUT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JATTCKCUT_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0023, }, { // 0x2E: ANM_JATTCKCUTHAM - /* mUnderBckIdx */ LKANM_BCK_JATTCKCUTHAM, - /* mUpperBckIdx */ LKANM_BCK_JATTCKCUTHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JATTCKCUTHAM_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JATTCKCUTHAM_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0023, }, { // 0x2F: ANM_JATTACKLAND - /* mUnderBckIdx */ LKANM_BCK_JATTACKLAND, - /* mUpperBckIdx */ LKANM_BCK_JATTACKLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JATTACKLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JATTACKLAND_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0024, }, { // 0x30: ANM_LANDDAMA - /* mUnderBckIdx */ LKANM_BCK_LANDDAMA, - /* mUpperBckIdx */ LKANM_BCK_LANDDAMA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LANDDAMA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LANDDAMA_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0038, }, { // 0x31: ANM_LANDDAMAST - /* mUnderBckIdx */ LKANM_BCK_LANDDAMAST, - /* mUpperBckIdx */ LKANM_BCK_LANDDAMAST, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LANDDAMAST_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LANDDAMAST_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0039, }, { // 0x32: ANM_ROLLF - /* mUnderBckIdx */ LKANM_BCK_ROLLF, - /* mUpperBckIdx */ LKANM_BCK_ROLLF, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROLLF_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROLLF_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0033, }, { // 0x33: ANM_ROLLFMIS - /* mUnderBckIdx */ LKANM_BCK_ROLLFMIS, - /* mUpperBckIdx */ LKANM_BCK_ROLLFMIS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROLLFMIS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROLLFMIS_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0036, }, { // 0x34: ANM_SLIP - /* mUnderBckIdx */ LKANM_BCK_SLIP, - /* mUpperBckIdx */ LKANM_BCK_SLIP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SLIP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SLIP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x35: ANM_SLIDEF - /* mUnderBckIdx */ LKANM_BCK_SLIDEF, - /* mUpperBckIdx */ LKANM_BCK_SLIDEF, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SLIDEF_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SLIDEF_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0042, }, { // 0x36: ANM_SLIDEFLAND - /* mUnderBckIdx */ LKANM_BCK_SLIDEFLAND, - /* mUpperBckIdx */ LKANM_BCK_SLIDEFLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SLIDEFLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SLIDEFLAND_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0043, }, { // 0x37: ANM_SLIDEB - /* mUnderBckIdx */ LKANM_BCK_SLIDEB, - /* mUpperBckIdx */ LKANM_BCK_SLIDEB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SLIDEB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SLIDEB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0044, }, { // 0x38: ANM_SLIDEBLAND - /* mUnderBckIdx */ LKANM_BCK_SLIDEBLAND, - /* mUpperBckIdx */ LKANM_BCK_SLIDEBLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SLIDEBLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SLIDEBLAND_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0045, }, { // 0x39: ANM_ATNGAL - /* mUnderBckIdx */ LKANM_BCK_ATNGAL, - /* mUpperBckIdx */ LKANM_BCK_ATNGAL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNGAL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNGAL_e, /* mLeftHandIdx */ 0x01, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0041, }, { // 0x3A: ANM_ATNGAR - /* mUnderBckIdx */ LKANM_BCK_ATNGAR, - /* mUpperBckIdx */ LKANM_BCK_ATNGAR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNGAR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNGAR_e, /* mLeftHandIdx */ 0x01, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0041, }, { // 0x3B: ANM_ATNGAHAM - /* mUnderBckIdx */ LKANM_BCK_ATNGAHAM, - /* mUpperBckIdx */ LKANM_BCK_ATNGAHAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ATNGAHAM_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ATNGAHAM_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0041, }, { // 0x3C: ANM_JMPST - /* mUnderBckIdx */ LKANM_BCK_JMPST, - /* mUpperBckIdx */ LKANM_BCK_JMPST, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_JMPST_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JMPST_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0032, }, { // 0x3D: ANM_ROLLB - /* mUnderBckIdx */ LKANM_BCK_ROLLB, - /* mUpperBckIdx */ LKANM_BCK_ROLLB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROLLB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROLLB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0034, }, { // 0x3E: ANM_ROLLBLAND - /* mUnderBckIdx */ LKANM_BCK_ROLLBLAND, - /* mUpperBckIdx */ LKANM_BCK_ROLLBLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROLLBLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROLLBLAND_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0035, }, { // 0x3F: ANM_CROUCH - /* mUnderBckIdx */ LKANM_BCK_CROUCH, - /* mUpperBckIdx */ LKANM_BCK_CROUCH, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CROUCH_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CROUCH_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x000A, }, { // 0x40: ANM_LIE - /* mUnderBckIdx */ LKANM_BCK_LIE, - /* mUpperBckIdx */ LKANM_BCK_LIE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LIE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LIE_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x000A, }, { // 0x41: ANM_LIEFORWARD - /* mUnderBckIdx */ LKANM_BCK_LIEFORWARD, - /* mUpperBckIdx */ LKANM_BCK_LIEFORWARD, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LIEFORWARD_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LIEFORWARD_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x000A, }, { // 0x42: ANM_WALL - /* mUnderBckIdx */ LKANM_BCK_WALL, - /* mUpperBckIdx */ LKANM_BCK_WALL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x000F, }, { // 0x43: ANM_WALLDW - /* mUnderBckIdx */ LKANM_BCK_WALLDW, - /* mUpperBckIdx */ LKANM_BCK_WALLDW, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLDW_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLDW_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x000F, }, { // 0x44: ANM_WALLWL - /* mUnderBckIdx */ LKANM_BCK_WALLWL, - /* mUpperBckIdx */ LKANM_BCK_WALLWL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLWL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLWL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x001A, }, { // 0x45: ANM_WALLWR - /* mUnderBckIdx */ LKANM_BCK_WALLWR, - /* mUpperBckIdx */ LKANM_BCK_WALLWR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLWR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLWR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x001B, }, { // 0x46: ANM_WALLWLDW - /* mUnderBckIdx */ LKANM_BCK_WALLWLDW, - /* mUpperBckIdx */ LKANM_BCK_WALLWLDW, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLWLDW_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLWLDW_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x001A, }, { // 0x47: ANM_WALLWRDW - /* mUnderBckIdx */ LKANM_BCK_WALLWRDW, - /* mUpperBckIdx */ LKANM_BCK_WALLWRDW, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLWRDW_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLWRDW_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x001B, }, { // 0x48: ANM_WALLPL - /* mUnderBckIdx */ LKANM_BCK_WALLPL, - /* mUpperBckIdx */ LKANM_BCK_WALLPL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLPL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLPL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x001C, }, { // 0x49: ANM_WALLPR - /* mUnderBckIdx */ LKANM_BCK_WALLPR, - /* mUpperBckIdx */ LKANM_BCK_WALLPR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLPR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLPR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x001D, }, { // 0x4A: ANM_WALLPLDW - /* mUnderBckIdx */ LKANM_BCK_WALLPLDW, - /* mUpperBckIdx */ LKANM_BCK_WALLPLDW, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLPLDW_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLPLDW_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x001C, }, { // 0x4B: ANM_WALLPRDW - /* mUnderBckIdx */ LKANM_BCK_WALLPRDW, - /* mUpperBckIdx */ LKANM_BCK_WALLPRDW, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLPRDW_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLPRDW_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x001D, }, { // 0x4C: ANM_VJMP - /* mUnderBckIdx */ LKANM_BCK_VJMP, - /* mUpperBckIdx */ LKANM_BCK_VJMP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_VJMP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_VJMP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x4D: ANM_VJMPCHA - /* mUnderBckIdx */ LKANM_BCK_VJMPCHA, - /* mUpperBckIdx */ LKANM_BCK_VJMPCHA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_VJMPCHA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_VJMPCHA_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x004C, }, { // 0x4E: ANM_VJMPCHB - /* mUnderBckIdx */ LKANM_BCK_VJMPCHB, - /* mUpperBckIdx */ LKANM_BCK_VJMPCHB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_VJMPCHB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_VJMPCHB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x4F: ANM_VJMPCL - /* mUnderBckIdx */ LKANM_BCK_VJMPCL, - /* mUpperBckIdx */ LKANM_BCK_VJMPCL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_VJMPCL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_VJMPCL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x004D, }, { // 0x50: ANM_HANGING - /* mUnderBckIdx */ LKANM_BCK_HANGING, - /* mUpperBckIdx */ LKANM_BCK_HANGING, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HANGING_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HANGING_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0054, }, { // 0x51: ANM_HANGUP - /* mUnderBckIdx */ LKANM_BCK_HANGUP, - /* mUpperBckIdx */ LKANM_BCK_HANGUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HANGUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HANGUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0055, }, { // 0x52: ANM_HANGMOVEL - /* mUnderBckIdx */ LKANM_BCK_HANGMOVEL, - /* mUpperBckIdx */ LKANM_BCK_HANGMOVEL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HANGMOVEL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HANGMOVEL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x000C, }, { // 0x53: ANM_HANGMOVER - /* mUnderBckIdx */ LKANM_BCK_HANGMOVER, - /* mUpperBckIdx */ LKANM_BCK_HANGMOVER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HANGMOVER_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HANGMOVER_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x000D, }, { // 0x54: ANM_DAM - /* mUnderBckIdx */ LKANM_BCK_DAM, - /* mUpperBckIdx */ LKANM_BCK_DAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAM_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAM_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003A, }, { // 0x55: ANM_DAML - /* mUnderBckIdx */ LKANM_BCK_DAML, - /* mUpperBckIdx */ LKANM_BCK_DAML, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAML_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAML_e, /* mLeftHandIdx */ 0x01, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x003A, }, { // 0x56: ANM_DAMR - /* mUnderBckIdx */ LKANM_BCK_DAMR, - /* mUpperBckIdx */ LKANM_BCK_DAMR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMR_e, /* mLeftHandIdx */ 0x01, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x003A, }, { // 0x57: ANM_DAMF - /* mUnderBckIdx */ LKANM_BCK_DAMF, - /* mUpperBckIdx */ LKANM_BCK_DAMF, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMF_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMF_e, /* mLeftHandIdx */ 0x01, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x003A, }, { // 0x58: ANM_DAMB - /* mUnderBckIdx */ LKANM_BCK_DAMB, - /* mUpperBckIdx */ LKANM_BCK_DAMB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMB_e, /* mLeftHandIdx */ 0x01, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x003A, }, { // 0x59: ANM_DAMFL - /* mUnderBckIdx */ LKANM_BCK_DAMFL, - /* mUpperBckIdx */ LKANM_BCK_DAMFL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMFL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMFL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003B, }, { // 0x5A: ANM_DAMFR - /* mUnderBckIdx */ LKANM_BCK_DAMFR, - /* mUpperBckIdx */ LKANM_BCK_DAMFR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMFR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMFR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003B, }, { // 0x5B: ANM_DAMFF - /* mUnderBckIdx */ LKANM_BCK_DAMFF, - /* mUpperBckIdx */ LKANM_BCK_DAMFF, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMFF_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMFF_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003B, }, { // 0x5C: ANM_DAMFB - /* mUnderBckIdx */ LKANM_BCK_DAMFB, - /* mUpperBckIdx */ LKANM_BCK_DAMFB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMFB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMFB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003B, }, { // 0x5D: ANM_DAMFLUP - /* mUnderBckIdx */ LKANM_BCK_DAMFLUP, - /* mUpperBckIdx */ LKANM_BCK_DAMFLUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMFLUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMFLUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003E, }, { // 0x5E: ANM_DAMFRUP - /* mUnderBckIdx */ LKANM_BCK_DAMFRUP, - /* mUpperBckIdx */ LKANM_BCK_DAMFRUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMFRUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMFRUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003F, }, { // 0x5F: ANM_DAMFFUP - /* mUnderBckIdx */ LKANM_BCK_DAMFFUP, - /* mUpperBckIdx */ LKANM_BCK_DAMFFUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMFFUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMFFUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003C, }, { // 0x60: ANM_DAMFBUP - /* mUnderBckIdx */ LKANM_BCK_DAMFBUP, - /* mUpperBckIdx */ LKANM_BCK_DAMFBUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMFBUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMFBUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x003D, }, { // 0x61: ANM_LAVADAM - /* mUnderBckIdx */ LKANM_BCK_LAVADAM, - /* mUpperBckIdx */ LKANM_BCK_LAVADAM, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LAVADAM_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LAVADAM_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0056, }, { // 0x62: ANM_DIELONG - /* mUnderBckIdx */ LKANM_BCK_DIELONG, - /* mUpperBckIdx */ LKANM_BCK_DIELONG, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DIELONG_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DIELONG_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0063, }, { // 0x63: ANM_SHIPDIE - /* mUnderBckIdx */ LKANM_BCK_SHIPDIE, - /* mUpperBckIdx */ LKANM_BCK_SHIPDIE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SHIPDIE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SHIPDIE_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0063, }, { // 0x64: ANM_SWIMDIE - /* mUnderBckIdx */ LKANM_BCK_SWIMDIE, - /* mUpperBckIdx */ LKANM_BCK_SWIMDIE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SWIMDIE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SWIMDIE_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0064, }, { // 0x65: ANM_GRABP - /* mUnderBckIdx */ LKANM_BCK_GRABP, - /* mUpperBckIdx */ LKANM_BCK_GRABP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GRABP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GRABP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0015, }, { // 0x66: ANM_GRABUP - /* mUnderBckIdx */ LKANM_BCK_GRABUP, - /* mUpperBckIdx */ LKANM_BCK_GRABUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GRABUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GRABUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0016, }, { // 0x67: ANM_GRABNG - /* mUnderBckIdx */ LKANM_BCK_GRABNG, - /* mUpperBckIdx */ LKANM_BCK_GRABNG, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GRABNG_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GRABNG_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0017, }, { // 0x68: ANM_GRABWAIT - /* mUnderBckIdx */ LKANM_BCK_GRABWAIT, - /* mUpperBckIdx */ LKANM_BCK_GRABWAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GRABWAIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GRABWAIT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0009, }, { // 0x69: ANM_GRABWAITB - /* mUnderBckIdx */ LKANM_BCK_GRABWAITB, - /* mUpperBckIdx */ LKANM_BCK_GRABWAITB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GRABWAITB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GRABWAITB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0012, }, { // 0x6A: ANM_GRABTHROW - /* mUnderBckIdx */ LKANM_BCK_GRABTHROW, - /* mUpperBckIdx */ LKANM_BCK_GRABTHROW, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GRABTHROW_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GRABTHROW_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0018, }, { // 0x6B: ANM_GRABRE - /* mUnderBckIdx */ LKANM_BCK_GRABRE, - /* mUpperBckIdx */ LKANM_BCK_GRABRE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GRABRE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GRABRE_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0019, }, { // 0x6C: ANM_MJMP - /* mUnderBckIdx */ LKANM_BCK_MJMP, - /* mUpperBckIdx */ LKANM_BCK_MJMP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MJMP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MJMP_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0027, }, { // 0x6D: ANM_MJMPC - /* mUnderBckIdx */ LKANM_BCK_MJMPC, - /* mUpperBckIdx */ LKANM_BCK_MJMPC, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MJMPC_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MJMPC_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0028, }, { // 0x6E: ANM_MROLLL - /* mUnderBckIdx */ LKANM_BCK_MROLLL, - /* mUpperBckIdx */ LKANM_BCK_MROLLL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MROLLL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MROLLL_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0029, }, { // 0x6F: ANM_MROLLR - /* mUnderBckIdx */ LKANM_BCK_MROLLR, - /* mUpperBckIdx */ LKANM_BCK_MROLLR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MROLLR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MROLLR_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x002A, }, { // 0x70: ANM_MROLLLC - /* mUnderBckIdx */ LKANM_BCK_MROLLLC, - /* mUpperBckIdx */ LKANM_BCK_MROLLLC, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MROLLLC_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MROLLLC_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x002B, }, { // 0x71: ANM_MROLLRC - /* mUnderBckIdx */ LKANM_BCK_MROLLRC, - /* mUpperBckIdx */ LKANM_BCK_MROLLRC, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MROLLRC_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MROLLRC_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x002C, }, { // 0x72: ANM_MSTEPOVER - /* mUnderBckIdx */ LKANM_BCK_MSTEPOVER, - /* mUpperBckIdx */ LKANM_BCK_MSTEPOVER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MSTEPOVER_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MSTEPOVER_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x002D, }, { // 0x73: ANM_MSTEPOVERA - /* mUnderBckIdx */ LKANM_BCK_MSTEPOVERA, - /* mUpperBckIdx */ LKANM_BCK_MSTEPOVERA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MSTEPOVERA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MSTEPOVERA_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x002E, }, { // 0x74: ANM_MSTEPOVERLAND - /* mUnderBckIdx */ LKANM_BCK_MSTEPOVERLAND, - /* mUpperBckIdx */ LKANM_BCK_MSTEPOVERLAND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MSTEPOVERLAND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MSTEPOVERLAND_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x002F, }, { // 0x75: ANM_ROPECATCH - /* mUnderBckIdx */ LKANM_BCK_ROPECATCH, - /* mUpperBckIdx */ LKANM_BCK_ROPECATCH, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROPECATCH_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROPECATCH_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x004C, }, { // 0x76: ANM_ROPESWINGF - /* mUnderBckIdx */ LKANM_BCK_ROPESWINGF, - /* mUpperBckIdx */ LKANM_BCK_ROPESWINGF, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROPESWINGF_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROPESWINGF_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0008, }, { // 0x77: ANM_ROPESWINGB - /* mUnderBckIdx */ LKANM_BCK_ROPESWINGB, - /* mUpperBckIdx */ LKANM_BCK_ROPESWINGB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROPESWINGB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROPESWINGB_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0008, }, { // 0x78: ANM_ROPEWAIT - /* mUnderBckIdx */ LKANM_BCK_ROPEWAIT, - /* mUpperBckIdx */ LKANM_BCK_ROPEWAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROPEWAIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROPEWAIT_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0009, }, { // 0x79: ANM_ROPECLIMB - /* mUnderBckIdx */ LKANM_BCK_ROPECLIMB, - /* mUpperBckIdx */ LKANM_BCK_ROPECLIMB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROPECLIMB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROPECLIMB_e, /* mLeftHandIdx */ 0x01, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x004E, }, { // 0x7A: ANM_ROPEDOWN - /* mUnderBckIdx */ LKANM_BCK_ROPEDOWN, - /* mUpperBckIdx */ LKANM_BCK_ROPEDOWN, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROPEDOWN_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROPEDOWN_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x004F, }, { // 0x7B: ANM_ROPETHROWCATCH - /* mUnderBckIdx */ LKANM_BCK_ROPETHROWCATCH, - /* mUpperBckIdx */ LKANM_BCK_ROPETHROWCATCH, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ROPETHROWCATCH_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ROPETHROWCATCH_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0049, }, { // 0x7C: ANM_BOOMCATCH - /* mUnderBckIdx */ LKANM_BCK_BOOMCATCH, - /* mUpperBckIdx */ LKANM_BCK_BOOMCATCH, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BOOMCATCH_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BOOMCATCH_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0049, }, { // 0x7D: ANM_VOYAGE1 - /* mUnderBckIdx */ LKANM_BCK_VOYAGE1, - /* mUpperBckIdx */ LKANM_BCK_VOYAGE1, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_VOYAGE1_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_VOYAGE1_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x0002, }, { // 0x7E: ANM_WAITPUSHPULL - /* mUnderBckIdx */ LKANM_BCK_WAITPUSHPULL, - /* mUpperBckIdx */ LKANM_BCK_WAITPUSHPULL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITPUSHPULL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITPUSHPULL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0002, }, { // 0x7F: ANM_WALKPUSH - /* mUnderBckIdx */ LKANM_BCK_WALKPUSH, - /* mUpperBckIdx */ LKANM_BCK_WALKPUSH, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKPUSH_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKPUSH_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x004A, }, { // 0x80: ANM_WALKPULL - /* mUnderBckIdx */ LKANM_BCK_WALKPULL, - /* mUpperBckIdx */ LKANM_BCK_WALKPULL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKPULL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKPULL_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x004B, }, { // 0x81: ANM_SWIMP - /* mUnderBckIdx */ LKANM_BCK_SWIMP, - /* mUpperBckIdx */ LKANM_BCK_SWIMP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SWIMP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SWIMP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0046, }, { // 0x82: ANM_SWIMWAIT - /* mUnderBckIdx */ LKANM_BCK_SWIMWAIT, - /* mUpperBckIdx */ LKANM_BCK_SWIMWAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SWIMWAIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SWIMWAIT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0003, }, { // 0x83: ANM_SWIMING - /* mUnderBckIdx */ LKANM_BCK_SWIMING, - /* mUpperBckIdx */ LKANM_BCK_SWIMING, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SWIMING_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SWIMING_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0047, }, { // 0x84: ANM_LADDERUPST - /* mUnderBckIdx */ LKANM_BCK_LADDERUPST, - /* mUpperBckIdx */ LKANM_BCK_LADDERUPST, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LADDERUPST_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LADDERUPST_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0050, }, { // 0x85: ANM_LADDERUPEDR - /* mUnderBckIdx */ LKANM_BCK_LADDERUPEDR, - /* mUpperBckIdx */ LKANM_BCK_LADDERUPEDR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LADDERUPEDR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LADDERUPEDR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0052, }, { // 0x86: ANM_LADDERUPEDL - /* mUnderBckIdx */ LKANM_BCK_LADDERUPEDL, - /* mUpperBckIdx */ LKANM_BCK_LADDERUPEDL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LADDERUPEDL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LADDERUPEDL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0052, }, { // 0x87: ANM_LADDERDWST - /* mUnderBckIdx */ LKANM_BCK_LADDERDWST, - /* mUpperBckIdx */ LKANM_BCK_LADDERDWST, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LADDERDWST_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LADDERDWST_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0051, }, { // 0x88: ANM_LADDERDWEDR - /* mUnderBckIdx */ LKANM_BCK_LADDERDWEDR, - /* mUpperBckIdx */ LKANM_BCK_LADDERDWEDR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LADDERDWEDR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LADDERDWEDR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0053, }, { // 0x89: ANM_LADDERDWEDL - /* mUnderBckIdx */ LKANM_BCK_LADDERDWEDL, - /* mUpperBckIdx */ LKANM_BCK_LADDERDWEDL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LADDERDWEDL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LADDERDWEDL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0053, }, { // 0x8A: ANM_LADDERRTOL - /* mUnderBckIdx */ LKANM_BCK_LADDERRTOL, - /* mUpperBckIdx */ LKANM_BCK_LADDERRTOL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LADDERRTOL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LADDERRTOL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x000A, }, { // 0x8B: ANM_LADDERLTOR - /* mUnderBckIdx */ LKANM_BCK_LADDERLTOR, - /* mUpperBckIdx */ LKANM_BCK_LADDERLTOR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LADDERLTOR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LADDERLTOR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x000A, }, { // 0x8C: ANM_FCLIMBSLIDELUP - /* mUnderBckIdx */ LKANM_BCK_FCLIMBSLIDELUP, - /* mUpperBckIdx */ LKANM_BCK_FCLIMBSLIDELUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_FCLIMBSLIDELUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_FCLIMBSLIDELUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0009, }, { // 0x8D: ANM_FCLIMBSLIDERUP - /* mUnderBckIdx */ LKANM_BCK_FCLIMBSLIDERUP, - /* mUpperBckIdx */ LKANM_BCK_FCLIMBSLIDERUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_FCLIMBSLIDERUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_FCLIMBSLIDERUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0009, }, { // 0x8E: ANM_BOXOPENLINK - /* mUnderBckIdx */ LKANM_BCK_BOXOPENLINK, - /* mUpperBckIdx */ LKANM_BCK_BOXOPENLINK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BOXOPENLINK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BOXOPENLINK_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0061, }, { // 0x8F: ANM_BOXOPENSHORTLINK - /* mUnderBckIdx */ LKANM_BCK_BOXOPENSHORTLINK, - /* mUpperBckIdx */ LKANM_BCK_BOXOPENSHORTLINK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BOXOPENSHORTLINK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BOXOPENSHORTLINK_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0062, }, { // 0x90: ANM_ITEMGET - /* mUnderBckIdx */ LKANM_BCK_ITEMGET, - /* mUpperBckIdx */ LKANM_BCK_ITEMGET, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ITEMGET_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ITEMGET_e, /* mLeftHandIdx */ 0x04, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x005D, }, { // 0x91: ANM_HOLDUP - /* mUnderBckIdx */ LKANM_BCK_HOLDUP, - /* mUpperBckIdx */ LKANM_BCK_HOLDUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HOLDUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HOLDUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x005B, }, { // 0x92: ANM_WALLHOLDUP - /* mUnderBckIdx */ LKANM_BCK_WALLHOLDUP, - /* mUpperBckIdx */ LKANM_BCK_WALLHOLDUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLHOLDUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLHOLDUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x005C, }, { // 0x93: ANM_WALLHOLDUPDW - /* mUnderBckIdx */ LKANM_BCK_WALLHOLDUPDW, - /* mUpperBckIdx */ LKANM_BCK_WALLHOLDUPDW, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALLHOLDUPDW_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALLHOLDUPDW_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x005C, }, { // 0x94: ANM_COMEOUT - /* mUnderBckIdx */ LKANM_BCK_COMEOUT, - /* mUpperBckIdx */ LKANM_BCK_COMEOUT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_COMEOUT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_COMEOUT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x005A, }, { // 0x95: ANM_WALKBARREL - /* mUnderBckIdx */ LKANM_BCK_WALKBARREL, - /* mUpperBckIdx */ LKANM_BCK_WALKBARREL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WALKBARREL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WALKBARREL_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0x96: ANM_SALTATION - /* mUnderBckIdx */ LKANM_BCK_SALTATION, - /* mUpperBckIdx */ LKANM_BCK_SALTATION, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SALTATION_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SALTATION_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x005E, }, { // 0x97: ANM_WHO - /* mUnderBckIdx */ LKANM_BCK_WHO, - /* mUpperBckIdx */ LKANM_BCK_WHO, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WHO_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WHO_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x005F, }, { // 0x98: ANM_PICKUP - /* mUnderBckIdx */ LKANM_BCK_PICKUP, - /* mUpperBckIdx */ LKANM_BCK_PICKUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_PICKUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_PICKUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0060, }, { // 0x99: ANM_WAITPICKUP - /* mUnderBckIdx */ LKANM_BCK_WAITPICKUP, - /* mUpperBckIdx */ LKANM_BCK_WAITPICKUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITPICKUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITPICKUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0013, }, { // 0x9A: ANM_SURPRISED - /* mUnderBckIdx */ LKANM_BCK_SURPRISED, - /* mUpperBckIdx */ LKANM_BCK_SURPRISED, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SURPRISED_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SURPRISED_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0065, }, { // 0x9B: ANM_TURNBACK - /* mUnderBckIdx */ LKANM_BCK_TURNBACK, - /* mUpperBckIdx */ LKANM_BCK_TURNBACK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TURNBACK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TURNBACK_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0066, }, { // 0x9C: ANM_LOOKUP - /* mUnderBckIdx */ LKANM_BCK_LOOKUP, - /* mUpperBckIdx */ LKANM_BCK_LOOKUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LOOKUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LOOKUP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0067, }, { // 0x9D: ANM_WAITQ - /* mUnderBckIdx */ LKANM_BCK_WAITQ, - /* mUpperBckIdx */ LKANM_BCK_WAITQ, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITQ_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITQ_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0092, }, { // 0x9E: ANM_GLAD - /* mUnderBckIdx */ LKANM_BCK_GLAD, - /* mUpperBckIdx */ LKANM_BCK_GLAD, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GLAD_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GLAD_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0069, }, { // 0x9F: ANM_SHIP_JUMP1 - /* mUnderBckIdx */ LKANM_BCK_SHIP_JUMP1, - /* mUpperBckIdx */ LKANM_BCK_SHIP_JUMP1, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SHIP_JUMP1_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SHIP_JUMP1_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x006B, }, { // 0xA0: ANM_SHIP_JUMP2 - /* mUnderBckIdx */ LKANM_BCK_SHIP_JUMP2, - /* mUpperBckIdx */ LKANM_BCK_SHIP_JUMP2, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SHIP_JUMP2_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SHIP_JUMP2_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x006C, }, { // 0xA1: ANM_USEFANA - /* mUnderBckIdx */ LKANM_BCK_USEFANA, - /* mUpperBckIdx */ LKANM_BCK_USEFANA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_USEFANA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_USEFANA_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x006D, }, { // 0xA2: ANM_USEFANB - /* mUnderBckIdx */ LKANM_BCK_USEFANB, - /* mUpperBckIdx */ LKANM_BCK_USEFANB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_USEFANB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_USEFANB_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x006E, }, { // 0xA3: ANM_USEFANB2 - /* mUnderBckIdx */ LKANM_BCK_USEFANB2, - /* mUpperBckIdx */ LKANM_BCK_USEFANB2, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_USEFANB2_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_USEFANB2_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x006F, }, { // 0xA4: ANM_MOGAKU1 - /* mUnderBckIdx */ LKANM_BCK_MOGAKU1, - /* mUpperBckIdx */ LKANM_BCK_MOGAKU1, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MOGAKU1_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_MOGAKU1_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0000, }, { // 0xA5: ANM_FM_BATA - /* mUnderBckIdx */ LKANM_BCK_FM_BATA, - /* mUpperBckIdx */ LKANM_BCK_FM_BATA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_FM_BATA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_FM_BATA_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0000, }, { // 0xA6: ANM_HOOKSHOTJMP - /* mUnderBckIdx */ LKANM_BCK_HOOKSHOTJMP, - /* mUpperBckIdx */ LKANM_BCK_HOOKSHOTJMP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HOOKSHOTJMP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HOOKSHOTJMP_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0014, }, { // 0xA7: ANM_VOMITJMP - /* mUnderBckIdx */ LKANM_BCK_VOMITJMP, - /* mUpperBckIdx */ LKANM_BCK_VOMITJMP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_VOMITJMP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_VOMITJMP_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0071, }, { // 0xA8: ANM_WAITTAKT - /* mUnderBckIdx */ LKANM_BCK_WAITTAKT, - /* mUpperBckIdx */ LKANM_BCK_WAITTAKT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITTAKT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITTAKT_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x0A, /* mTexAnmIdx */ 0x0006, }, { // 0xA9: ANM_SLIPICE - /* mUnderBckIdx */ LKANM_BCK_SLIPICE, - /* mUpperBckIdx */ LKANM_BCK_SLIPICE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SLIPICE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SLIPICE_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0075, }, { // 0xAA: ANM_HAMSWINGA - /* mUnderBckIdx */ LKANM_BCK_HAMSWINGA, - /* mUpperBckIdx */ LKANM_BCK_HAMSWINGA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HAMSWINGA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HAMSWINGA_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0076, }, { // 0xAB: ANM_HAMSWINGBPRE - /* mUnderBckIdx */ LKANM_BCK_HAMSWINGBPRE, - /* mUpperBckIdx */ LKANM_BCK_HAMSWINGBPRE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HAMSWINGBPRE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HAMSWINGBPRE_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0077, }, { // 0xAC: ANM_HAMSWINGBHIT - /* mUnderBckIdx */ LKANM_BCK_HAMSWINGBHIT, - /* mUpperBckIdx */ LKANM_BCK_HAMSWINGBHIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HAMSWINGBHIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HAMSWINGBHIT_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0078, }, { // 0xAD: ANM_HAMSWINGBEND - /* mUnderBckIdx */ LKANM_BCK_HAMSWINGBEND, - /* mUpperBckIdx */ LKANM_BCK_HAMSWINGBEND, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_HAMSWINGBEND_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_HAMSWINGBEND_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0079, }, { // 0xAE: ANM_SETBOOTS - /* mUnderBckIdx */ LKANM_BCK_SETBOOTS, - /* mUpperBckIdx */ LKANM_BCK_SETBOOTS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SETBOOTS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SETBOOTS_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x007A, }, { // 0xAF: ANM_DOOROPENALINK - /* mUnderBckIdx */ LKANM_BCK_DOOROPENALINK, - /* mUpperBckIdx */ LKANM_BCK_DOOROPENALINK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DOOROPENALINK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DOOROPENALINK_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x007B, }, { // 0xB0: ANM_DOOROPENBLINK - /* mUnderBckIdx */ LKANM_BCK_DOOROPENBLINK, - /* mUpperBckIdx */ LKANM_BCK_DOOROPENBLINK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DOOROPENBLINK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DOOROPENBLINK_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x007C, }, { // 0xB1: ANM_SEYYES - /* mUnderBckIdx */ LKANM_BCK_SEYYES, - /* mUpperBckIdx */ LKANM_BCK_SEYYES, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SEYYES_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SEYYES_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x007D, }, { // 0xB2: ANM_PRESENTATIONA - /* mUnderBckIdx */ LKANM_BCK_PRESENTATIONA, - /* mUpperBckIdx */ LKANM_BCK_PRESENTATIONA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_PRESENTATIONA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_PRESENTATIONA_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x007E, }, { // 0xB3: ANM_WINDL - /* mUnderBckIdx */ LKANM_BCK_WINDL, - /* mUpperBckIdx */ LKANM_BCK_WINDL, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WINDL_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WINDL_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x007F, }, { // 0xB4: ANM_WINDR - /* mUnderBckIdx */ LKANM_BCK_WINDR, - /* mUpperBckIdx */ LKANM_BCK_WINDR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WINDR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WINDR_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0080, }, { // 0xB5: ANM_PRESENTATIONB - /* mUnderBckIdx */ LKANM_BCK_PRESENTATIONB, - /* mUpperBckIdx */ LKANM_BCK_PRESENTATIONB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_PRESENTATIONB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_PRESENTATIONB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x0081, }, { // 0xB6: ANM_BINDRINKPRE - /* mUnderBckIdx */ LKANM_BCK_BINDRINKPRE, - /* mUpperBckIdx */ LKANM_BCK_BINDRINKPRE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINDRINKPRE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINDRINKPRE_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x0082, }, { // 0xB7: ANM_BINDRINKING - /* mUnderBckIdx */ LKANM_BCK_BINDRINKING, - /* mUpperBckIdx */ LKANM_BCK_BINDRINKING, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINDRINKING_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINDRINKING_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x0083, }, { // 0xB8: ANM_BINDRINKAFTER - /* mUnderBckIdx */ LKANM_BCK_BINDRINKAFTER, - /* mUpperBckIdx */ LKANM_BCK_BINDRINKAFTER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINDRINKAFTER_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINDRINKAFTER_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x0084, }, { // 0xB9: ANM_BINOPENPRE - /* mUnderBckIdx */ LKANM_BCK_BINOPENPRE, - /* mUpperBckIdx */ LKANM_BCK_BINOPENPRE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINOPENPRE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINOPENPRE_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x0088, }, { // 0xBA: ANM_BINOPENA - /* mUnderBckIdx */ LKANM_BCK_BINOPENA, - /* mUpperBckIdx */ LKANM_BCK_BINOPENA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINOPENA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINOPENA_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0089, }, { // 0xBB: ANM_BINOPENB - /* mUnderBckIdx */ LKANM_BCK_BINOPENB, - /* mUpperBckIdx */ LKANM_BCK_BINOPENB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINOPENB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINOPENB_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x008A, }, { // 0xBC: ANM_BINSWINGS - /* mUnderBckIdx */ LKANM_BCK_BINSWINGS, - /* mUpperBckIdx */ LKANM_BCK_BINSWINGS, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINSWINGS_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINSWINGS_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x008B, }, { // 0xBD: ANM_BINSWINGU - /* mUnderBckIdx */ LKANM_BCK_BINSWINGU, - /* mUpperBckIdx */ LKANM_BCK_BINSWINGU, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINSWINGU_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINSWINGU_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x008B, }, { // 0xBE: ANM_BINGET - /* mUnderBckIdx */ LKANM_BCK_BINGET, - /* mUpperBckIdx */ LKANM_BCK_BINGET, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BINGET_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BINGET_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x008C, }, { // 0xBF: ANM_SURPRISEDB - /* mUnderBckIdx */ LKANM_BCK_SURPRISEDB, - /* mUpperBckIdx */ LKANM_BCK_SURPRISEDB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SURPRISEDB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SURPRISEDB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x008E, }, { // 0xC0: ANM_RISE - /* mUnderBckIdx */ LKANM_BCK_RISE, - /* mUpperBckIdx */ LKANM_BCK_RISE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_RISE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_RISE_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0001, }, { // 0xC1: ANM_USETCEIVER - /* mUnderBckIdx */ LKANM_BCK_USETCEIVER, - /* mUpperBckIdx */ LKANM_BCK_USETCEIVER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_USETCEIVER_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_USETCEIVER_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0005, }, { // 0xC2: ANM_YOBU - /* mUnderBckIdx */ LKANM_BCK_YOBU, - /* mUpperBckIdx */ LKANM_BCK_YOBU, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_YOBU_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_YOBU_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0006, }, { // 0xC3: ANM_NENRIKI - /* mUnderBckIdx */ LKANM_BCK_NENRIKI, - /* mUpperBckIdx */ LKANM_BCK_NENRIKI, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_NENRIKI_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_NENRIKI_e, /* mLeftHandIdx */ 0x06, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x0090, }, { // 0xC4: ANM_ESAMAKI - /* mUnderBckIdx */ LKANM_BCK_ESAMAKI, - /* mUpperBckIdx */ LKANM_BCK_ESAMAKI, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_ESAMAKI_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_ESAMAKI_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0004, }, { // 0xC5: ANM_SETHYOINOMI - /* mUnderBckIdx */ LKANM_BCK_SETHYOINOMI, - /* mUpperBckIdx */ LKANM_BCK_SETHYOINOMI, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SETHYOINOMI_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SETHYOINOMI_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0093, }, { // 0xC6: ANM_GETLETTER - /* mUnderBckIdx */ LKANM_BCK_GETLETTER, - /* mUpperBckIdx */ LKANM_BCK_GETLETTER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_GETLETTER_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_GETLETTER_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0005, }, { // 0xC7: ANM_WAITLETTER - /* mUnderBckIdx */ LKANM_BCK_WAITLETTER, - /* mUpperBckIdx */ LKANM_BCK_WAITLETTER, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITLETTER_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITLETTER_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x09, /* mTexAnmIdx */ 0x0005, }, { // 0xC8: ANM_LINK_FREEZ - /* mUnderBckIdx */ LKANM_BCK_LINK_FREEZ, - /* mUpperBckIdx */ LKANM_BCK_LINK_FREEZ, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LINK_FREEZ_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LINK_FREEZ_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0094, }, { // 0xC9: ANM_LINK_MOGAKI - /* mUnderBckIdx */ LKANM_BCK_LINK_MOGAKI, - /* mUpperBckIdx */ LKANM_BCK_LINK_MOGAKI, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_LINK_MOGAKI_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_LINK_MOGAKI_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0095, }, { // 0xCA: ANM_TAKTDGE - /* mUnderBckIdx */ LKANM_BCK_TAKTDGE, - /* mUpperBckIdx */ LKANM_BCK_TAKTDGE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TAKTDGE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TAKTDGE_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x005D, }, { // 0xCB: ANM_DAMBIRI - /* mUnderBckIdx */ LKANM_BCK_DAMBIRI, - /* mUpperBckIdx */ LKANM_BCK_DAMBIRI, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_DAMBIRI_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_DAMBIRI_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0096, }, { // 0xCC: ANM_SALVLR - /* mUnderBckIdx */ LKANM_BCK_SALVLR, - /* mUpperBckIdx */ LKANM_BCK_SALVLR, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SALVLR_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SALVLR_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0097, }, { // 0xCD: ANM_SALVRWAIT - /* mUnderBckIdx */ LKANM_BCK_SALVRWAIT, - /* mUpperBckIdx */ LKANM_BCK_SALVRWAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SALVRWAIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SALVRWAIT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0xCE: ANM_SALVLWAIT - /* mUnderBckIdx */ LKANM_BCK_SALVLWAIT, - /* mUpperBckIdx */ LKANM_BCK_SALVLWAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SALVLWAIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SALVLWAIT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0xCF: ANM_SALVRBAD - /* mUnderBckIdx */ LKANM_BCK_SALVRBAD, - /* mUpperBckIdx */ LKANM_BCK_SALVRBAD, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SALVRBAD_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SALVRBAD_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0099, }, { // 0xD0: ANM_SALVLBAD - /* mUnderBckIdx */ LKANM_BCK_SALVLBAD, - /* mUpperBckIdx */ LKANM_BCK_SALVLBAD, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SALVLBAD_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SALVLBAD_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0099, }, { // 0xD1: ANM_SALVRGOOD - /* mUnderBckIdx */ LKANM_BCK_SALVRGOOD, - /* mUpperBckIdx */ LKANM_BCK_SALVRGOOD, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SALVRGOOD_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SALVRGOOD_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x009A, }, { // 0xD2: ANM_SALVLGOOD - /* mUnderBckIdx */ LKANM_BCK_SALVLGOOD, - /* mUpperBckIdx */ LKANM_BCK_SALVLGOOD, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SALVLGOOD_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SALVLGOOD_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x009A, }, { // 0xD3: ANM_MSTEPOVER_JMPED - /* mUnderBckIdx */ LKANM_BCK_MSTEPOVER, - /* mUpperBckIdx */ LKANM_BCK_JMPED, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_MSTEPOVER_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_JMPED_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0037, }, { // 0xD4: ANM_BOXOPENSLINK - /* mUnderBckIdx */ LKANM_BCK_BOXOPENSLINK, - /* mUpperBckIdx */ LKANM_BCK_BOXOPENSLINK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_BOXOPENSLINK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_BOXOPENSLINK_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0061, }, { // 0xD5: ANM_SEARESET - /* mUnderBckIdx */ LKANM_BCK_SEARESET, - /* mUpperBckIdx */ LKANM_BCK_SEARESET, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SEARESET_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SEARESET_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x009B, }, { // 0xD6: ANM_WARPIN - /* mUnderBckIdx */ LKANM_BCK_WARPIN, - /* mUpperBckIdx */ LKANM_BCK_WARPIN, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WARPIN_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WARPIN_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x009C, }, { // 0xD7: ANM_WARPOUT - /* mUnderBckIdx */ LKANM_BCK_WARPOUT, - /* mUpperBckIdx */ LKANM_BCK_WARPOUT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WARPOUT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WARPOUT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x009D, }, { // 0xD8: ANM_SURPRISEDWAIT - /* mUnderBckIdx */ LKANM_BCK_SURPRISEDWAIT, - /* mUpperBckIdx */ LKANM_BCK_SURPRISEDWAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_SURPRISEDWAIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_SURPRISEDWAIT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0065, }, { // 0xD9: ANM_PRESENTATIONAWAIT - /* mUnderBckIdx */ LKANM_BCK_PRESENTATIONAWAIT, - /* mUpperBckIdx */ LKANM_BCK_PRESENTATIONAWAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_PRESENTATIONAWAIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_PRESENTATIONAWAIT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x07, /* mTexAnmIdx */ 0x0004, }, { // 0xDA: ANM_POWUPWAIT - /* mUnderBckIdx */ LKANM_BCK_POWUPWAIT, - /* mUpperBckIdx */ LKANM_BCK_POWUPWAIT, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_POWUPWAIT_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_POWUPWAIT_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x009E, }, { // 0xDB: ANM_POWUP - /* mUnderBckIdx */ LKANM_BCK_POWUP, - /* mUpperBckIdx */ LKANM_BCK_POWUP, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_POWUP_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_POWUP_e, /* mLeftHandIdx */ 0x02, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x009F, }, { // 0xDC: ANM_KOSHIKAKE - /* mUnderBckIdx */ LKANM_BCK_KOSHIKAKE, - /* mUpperBckIdx */ LKANM_BCK_KOSHIKAKE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_KOSHIKAKE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_KOSHIKAKE_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0002, }, { // 0xDD: ANM_COMBO_LINK - /* mUnderBckIdx */ LKANM_BCK_COMBO_LINK, - /* mUpperBckIdx */ LKANM_BCK_COMBO_LINK, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_COMBO_LINK_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_COMBO_LINK_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x0003, }, { // 0xDE: ANM_CUTKESA - /* mUnderBckIdx */ LKANM_BCK_CUTKESA, - /* mUpperBckIdx */ LKANM_BCK_CUTKESA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_CUTKESA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_CUTKESA_e, /* mLeftHandIdx */ 0x03, /* mRightHandIdx */ 0x08, /* mTexAnmIdx */ 0x00A0, }, { // 0xDF: ANM_WARPOUTFIRST - /* mUnderBckIdx */ LKANM_BCK_WARPOUTFIRST, - /* mUpperBckIdx */ LKANM_BCK_WARPOUTFIRST, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WARPOUTFIRST_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WARPOUTFIRST_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x00A1, }, { // 0xE0: ANM_WAITAUCTION - /* mUnderBckIdx */ LKANM_BCK_WAITAUCTION, - /* mUpperBckIdx */ LKANM_BCK_WAITAUCTION, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_WAITAUCTION_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_WAITAUCTION_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x0000, }, { // 0xE1: ANM_FREEA - /* mUnderBckIdx */ LKANM_BCK_FREEA, - /* mUpperBckIdx */ LKANM_BCK_FREEA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_FREEA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_FREEA_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x00A4, }, { // 0xE2: ANM_FREEB - /* mUnderBckIdx */ LKANM_BCK_FREEB, - /* mUpperBckIdx */ LKANM_BCK_FREEB, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_FREEB_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_FREEB_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x00A5, }, { // 0xE3: ANM_FREED - /* mUnderBckIdx */ LKANM_BCK_FREED, - /* mUpperBckIdx */ LKANM_BCK_FREED, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_FREED_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_FREED_e, /* mLeftHandIdx */ 0x00, /* mRightHandIdx */ 0x00, /* mTexAnmIdx */ 0x00A6, }, { // 0xE4: ANM_TAKTKAZE - /* mUnderBckIdx */ LKANM_BCK_TAKTKAZE, - /* mUpperBckIdx */ LKANM_BCK_TAKTKAZE, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TAKTKAZE_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TAKTKAZE_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x0A, /* mTexAnmIdx */ 0x00A7, }, { // 0xE5: ANM_TAKTSIPPU - /* mUnderBckIdx */ LKANM_BCK_TAKTSIPPU, - /* mUpperBckIdx */ LKANM_BCK_TAKTSIPPU, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TAKTSIPPU_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TAKTSIPPU_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x0A, /* mTexAnmIdx */ 0x00A8, }, { // 0xE6: ANM_TAKTCHUYA - /* mUnderBckIdx */ LKANM_BCK_TAKTCHUYA, - /* mUpperBckIdx */ LKANM_BCK_TAKTCHUYA, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TAKTCHUYA_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TAKTCHUYA_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x0A, /* mTexAnmIdx */ 0x00A9, }, { // 0xE7: ANM_TAKTFUJIN - /* mUnderBckIdx */ LKANM_BCK_TAKTFUJIN, - /* mUpperBckIdx */ LKANM_BCK_TAKTFUJIN, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TAKTFUJIN_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TAKTFUJIN_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x0A, /* mTexAnmIdx */ 0x00AA, }, { // 0xE8: ANM_TAKTAYATSURI - /* mUnderBckIdx */ LKANM_BCK_TAKTAYATSURI, - /* mUpperBckIdx */ LKANM_BCK_TAKTAYATSURI, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TAKTAYATSURI_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TAKTAYATSURI_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x0A, /* mTexAnmIdx */ 0x00AB, }, { // 0xE9: ANM_TAKTCHISIN - /* mUnderBckIdx */ LKANM_BCK_TAKTCHISIN, - /* mUpperBckIdx */ LKANM_BCK_TAKTCHISIN, + /* mUnderBckIdx */ dRes_INDEX_LKANM_BCK_TAKTCHISIN_e, + /* mUpperBckIdx */ dRes_INDEX_LKANM_BCK_TAKTCHISIN_e, /* mLeftHandIdx */ 0x05, /* mRightHandIdx */ 0x0A, /* mTexAnmIdx */ 0x00AC, diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index b32380b21..63c3db23d 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -515,15 +515,15 @@ void daPy_lk_c::setAuraEffect() { } } - pYaura00Brk = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BRK_YAURA00_R)); - pYmgcs00Brk = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BRK_YMGCS00_MS)); + pYaura00Brk = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BRK_YAURA00_R_e)); + pYmgcs00Brk = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BRK_YMGCS00_MS_e)); } else { if (!dComIfGp_event_runCheck()) { mTinkleShieldTimer -= 1; } - pYaura00Brk = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BRK_YAURA00_G)); - pYmgcs00Brk = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BRK_YMGCS00_TS)); + pYaura00Brk = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BRK_YAURA00_G_e)); + pYmgcs00Brk = static_cast(dComIfG_getObjectRes(l_arcName, dRes_INDEX_LINK_BRK_YMGCS00_TS_e)); } if (pYaura00Brk != curYaura00Brk) { diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc index a8e6bbb27..e1f0acf63 100644 --- a/src/d/actor/d_a_player_rope.inc +++ b/src/d/actor/d_a_player_rope.inc @@ -20,7 +20,7 @@ /* 80142D08-80142D68 .text checkRopeAnime__9daPy_lk_cCFv */ BOOL daPy_lk_c::checkRopeAnime() const { - return (checkRopeReadyAnime()) || (checkUpperAnime(LKANM_BCK_ROPETHROW)); + return (checkRopeReadyAnime()) || (checkUpperAnime(dRes_INDEX_LKANM_BCK_ROPETHROW_e)); } /* 80142D68-80142E0C .text freeRopeItem__9daPy_lk_cFv */ @@ -271,7 +271,7 @@ void daPy_lk_c::setBlendRopeMoveAnime(int param_0) { int daPy_lk_c::throwRope() { himo2_class* rope = (himo2_class*)mActorKeepEquip.getActor(); setActAnimeUpper( - LKANM_BCK_ROPETHROW, + dRes_INDEX_LKANM_BCK_ROPETHROW_e, UPPER_MOVE2_e, m_HIO->mItem.mRope.m.field_0x44, m_HIO->mItem.mRope.m.field_0x48, @@ -324,7 +324,7 @@ BOOL daPy_lk_c::checkNextActionRopeReady() { return procRopeReady_init(); } if (uVar2 == 0) { - if (checkUpperAnime(LKANM_BCK_ROPETHROW)) { + if (checkUpperAnime(dRes_INDEX_LKANM_BCK_ROPETHROW_e)) { if (mFrameCtrlUpper[UPPER_MOVE2_e].getRate() < 0.01f) { return procRopeThrowCatch_init(); } else { @@ -398,7 +398,7 @@ BOOL daPy_lk_c::procRopeSubject_init() { mNormalSpeed = 0.0f; if (fopAcM_GetParam(mActorKeepEquip.getActor()) == 0) { - setActAnimeUpper(LKANM_BCK_ROPETHROWWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_ROPETHROWWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, m_HIO->mItem.mRope.m.field_0x54); } @@ -1174,7 +1174,7 @@ BOOL daPy_lk_c::procRopeMove_init() { current.angle.y = shape_angle.y + -0x4000; } if (fopAcM_GetParam(mActorKeepEquip.getActor()) == 0) { - setActAnimeUpper(LKANM_BCK_ROPETHROWWAIT, UPPER_MOVE2_e, m_HIO->mItem.mRope.m.field_0x50, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_ROPETHROWWAIT_e, UPPER_MOVE2_e, m_HIO->mItem.mRope.m.field_0x50, 0.0f, -1, -1.0f); setBlendAtnMoveAnime(m_HIO->mItem.mRope.m.field_0x54); } dComIfGp_setPlayerStatus0(0, daPyStts0_ROPE_AIM_e); diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc index ef1851f0b..ae4dc27a1 100644 --- a/src/d/actor/d_a_player_ship.inc +++ b/src/d/actor/d_a_player_ship.inc @@ -52,9 +52,9 @@ BOOL daPy_lk_c::checkJumpRideShip() { /* 8013F984-8013F9B0 .text checkShipNotNormalMode__9daPy_lk_cFv */ BOOL daPy_lk_c::checkShipNotNormalMode() { - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_SHIP_JUMP2 && - m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_VOYAGE1 && - m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_SHIP_JUMP1) + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != dRes_INDEX_LKANM_BCK_SHIP_JUMP2_e && + m_anm_heap_under[UNDER_MOVE0_e].mIdx != dRes_INDEX_LKANM_BCK_VOYAGE1_e && + m_anm_heap_under[UNDER_MOVE0_e].mIdx != dRes_INDEX_LKANM_BCK_SHIP_JUMP1_e) { return true; } @@ -216,7 +216,7 @@ void daPy_lk_c::setShipRidePos(int param_0) { if (ship->getLandFlg()) { setSingleMoveAnime(ANM_SHIP_JUMP2, 1.0f, 3.0f, -1, 3.0f); } - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_SHIP_JUMP2) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_SHIP_JUMP2_e) { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { if (ship->getFlyFlg()) { setSingleMoveAnime(ANM_SHIP_JUMP1, 1.0f, 0.0f, -1, 20.0f); @@ -228,7 +228,7 @@ void daPy_lk_c::setShipRidePos(int param_0) { } } s16 sVar4; - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_VOYAGE1) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_VOYAGE1_e) { sVar4 = -m_HIO->mShip.m.field_0x4 * ship->getTillerAngleRate(); } else { sVar4 = 0; @@ -315,9 +315,9 @@ BOOL daPy_lk_c::changeShipEndProc() { } if (dComIfGp_getMiniGameType() != 1 && ship->speedF < 3.0f) { if (ship->getBeltSpeed() < 3.0f) { - if (((!checkShipNotNormalMode() || m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREEA) || - m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREEB) || - m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREED) + if (((!checkShipNotNormalMode() || m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_FREEA_e) || + m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_FREEB_e) || + m_anm_heap_under[UNDER_MOVE0_e].mIdx == dRes_INDEX_LKANM_BCK_FREED_e) { if ((!dComIfGp_checkPlayerStatus0(0, daPyStts0_SUBJECT_e) && !spActionButton()) && (dComIfGp_getDoStatus() == dActStts_BLANK_e && mCurProc == daPyProc_SHIP_PADDLE_e)) @@ -445,10 +445,10 @@ BOOL daPy_lk_c::changeShipEndProc() { /* 80140C88-80140D04 .text initShipBaseAnime__9daPy_lk_cFv */ void daPy_lk_c::initShipBaseAnime() { - if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_SHIP_JUMP2) { + if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != dRes_INDEX_LKANM_BCK_SHIP_JUMP2_e) { setSingleMoveAnime(ANM_VOYAGE1, 1.0f, 0.0f, -1, 5.0f); } - setActAnimeUpper(LKANM_BCK_FN_HAIR1, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_FN_HAIR1_e, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f); } @@ -755,7 +755,7 @@ BOOL daPy_lk_c::procShipBoomerang_init() { ship->setPaddleMove(); mEquipItem = dItemNo_BOOMERANG_e; setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, 5.0f); - setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_BOOMWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); setTextureAnime(0, 0); makeItemType(); dComIfGp_setPlayerStatus0(0, daPyStts0_SHIP_RIDE_e | daPyStts0_BOOMERANG_AIM_e); @@ -773,7 +773,7 @@ BOOL daPy_lk_c::procShipBoomerang() { } setShipRidePos(0); if (mActorKeepThrow.getActor() == NULL) { - if (!checkUpperAnime(LKANM_BCK_BOOMCATCH)) { + if (!checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMCATCH_e)) { dComIfGp_setDoStatus(dActStts_RETURN_e); if (doTrigger()) { procShipPaddle_init(); @@ -784,9 +784,9 @@ BOOL daPy_lk_c::procShipBoomerang() { } mSightPacket.offDrawFlg(); daShip_c* ship = (daShip_c*)dComIfGp_getShipActor(); - if (!checkUpperAnime(LKANM_BCK_BOOMCATCH)) { + if (!checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMCATCH_e)) { if (mEquipItem == dItemNo_BOOMERANG_e) { - if (checkUpperAnime(LKANM_BCK_BOOMWAIT)) { + if (checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMWAIT_e)) { setShipAttentionAnmSpeed(m_HIO->mItem.mBoom.m.field_0x18); checkNextActionBoomerangReady(); if (checkAttentionLock()) { @@ -833,7 +833,7 @@ BOOL daPy_lk_c::procShipHookshot_init() { mEquipItem = dItemNo_HOOKSHOT_e; m355C = 10; setSingleMoveAnime(ANM_ATNLS, 0.0f, 0.0f, -1, 5.0f); - setActAnimeUpper(LKANM_BCK_HOOKSHOTWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_HOOKSHOTWAIT_e, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); setTextureAnime(0, 0); makeItemType(); dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e | daPyStts0_SHIP_RIDE_e); diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index c68310cad..a29a01d23 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -35,29 +35,29 @@ void daPy_lk_c::setSwordModel(BOOL r28) }; static const sword_model_tbl_s sword_model_tbl[] = { { - LINK_BDL_SWA, - LINK_BDL_YHSLS00, - LKANM_BTK_YHSLS00, - LKANM_BRK_YHSLS00, - LINK_BDL_CUTFH, - LKANM_BPK_CUTFH, - LKANM_BTK_CUTFH, - LKANM_BRK_CUTFH, + dRes_INDEX_LINK_BDL_SWA_e, + dRes_INDEX_LINK_BDL_YHSLS00_e, + dRes_INDEX_LKANM_BTK_YHSLS00_e, + dRes_INDEX_LKANM_BRK_YHSLS00_e, + dRes_INDEX_LINK_BDL_CUTFH_e, + dRes_INDEX_LKANM_BPK_CUTFH_e, + dRes_INDEX_LKANM_BTK_CUTFH_e, + dRes_INDEX_LKANM_BRK_CUTFH_e, }, { - LINK_BDL_SWMS, - LINK_BDL_YMSLI00, - LKANM_BTK_YMSLI00, - LKANM_BRK_YMSLI00, - LINK_BDL_CUTFM, - LKANM_BPK_CUTFM, - LKANM_BTK_CUTFM, - LKANM_BRK_CUTFM, + dRes_INDEX_LINK_BDL_SWMS_e, + dRes_INDEX_LINK_BDL_YMSLI00_e, + dRes_INDEX_LKANM_BTK_YMSLI00_e, + dRes_INDEX_LKANM_BRK_YMSLI00_e, + dRes_INDEX_LINK_BDL_CUTFM_e, + dRes_INDEX_LKANM_BPK_CUTFM_e, + dRes_INDEX_LKANM_BTK_CUTFM_e, + dRes_INDEX_LKANM_BRK_CUTFM_e, }, }; J3DModelData* modelData; - J3DAnmTransform* bck = checkNormalSwordEquip() ? getItemAnimeResource(LKANM_BCK_CUTAA) : getItemAnimeResource(LKANM_BCK_CUTAMS); + J3DAnmTransform* bck = checkNormalSwordEquip() ? getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTAA_e) : getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTAMS_e); mEquipItem = daPyItem_SWORD_e; JKRHeap* oldHeap = setItemHeap(); @@ -72,7 +72,7 @@ void daPy_lk_c::setSwordModel(BOOL r28) u8* buffer; if (!checkNormalSwordEquip()) { buffer = new (0x20) u8[0x400]; - JKRReadIdxResource(buffer, 0x400, LKANM_BTK_TSWMS, dComIfGp_getAnmArchive()); + JKRReadIdxResource(buffer, 0x400, dRes_INDEX_LKANM_BTK_TSWMS_e, dComIfGp_getAnmArchive()); mpEquipItemBtk = static_cast(J3DAnmLoaderDataBase::load(buffer)); mpEquipItemBtk->setFrame(0.0f); mpEquipItemBtk->searchUpdateMaterialID(modelData); @@ -566,9 +566,9 @@ BOOL daPy_lk_c::procCutA_init(s16 param_0) { m_HIO->mCut.mCutA.m.field_0x24 ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTAA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTAA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTAMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTAMS_e)); } m35EC = m_HIO->mCut.mCutA.m.field_0x8; current.angle.y = shape_angle.y; @@ -580,7 +580,7 @@ BOOL daPy_lk_c::procCutA_init(s16 param_0) { m3522 = m_HIO->mCut.mCutA.m.field_0x0; m351E = m34DC; onNoResetFlg0(daPyFlg0_UNK4); - setBlurPosResource(LKANM__CUTA_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTA_POS_e); setNormalCutAtParam(CUT_TYPE_CUT_A); return true; } @@ -668,9 +668,9 @@ BOOL daPy_lk_c::procCutF_init(s16 param_0) { m_HIO->mCut.mCutF.m.field_0x24 ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTFA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTFA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTFMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTFMS_e)); } m35EC = m_HIO->mCut.mCutF.m.field_0x8; mpCutfBpk->setFrame(m_HIO->mCut.mCutF.m.field_0x8); @@ -770,9 +770,9 @@ BOOL daPy_lk_c::procCutR_init(s16 param_0) { m_HIO->mCut.mCutR.m.field_0x24 ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTRA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTRA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTRMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTRMS_e)); } m35EC = m_HIO->mCut.mCutR.m.field_0x8; m3700 = cXyz::Zero; @@ -782,7 +782,7 @@ BOOL daPy_lk_c::procCutR_init(s16 param_0) { m351E = m34DC; m3522 = m_HIO->mCut.mCutR.m.field_0x0; onNoResetFlg0(daPyFlg0_UNK4); - setBlurPosResource(LKANM__CUTR_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTR_POS_e); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); setNormalCutAtParam(CUT_TYPE_CUT_R); return true; @@ -871,9 +871,9 @@ BOOL daPy_lk_c::procCutL_init(s16 param_0) { m_HIO->mCut.mCutL.m.field_0x24 ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTLA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTLA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTLMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTLMS_e)); } m35EC = m_HIO->mCut.mCutL.m.field_0x8; m3700 = cXyz::Zero; @@ -884,7 +884,7 @@ BOOL daPy_lk_c::procCutL_init(s16 param_0) { m3522 = m_HIO->mCut.mCutL.m.field_0x0; onNoResetFlg0(daPyFlg0_UNK4); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); - setBlurPosResource(LKANM__CUTL_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTL_POS_e); setNormalCutAtParam(CUT_TYPE_CUT_L); return true; } @@ -970,9 +970,9 @@ BOOL daPy_lk_c::procCutEA_init() { m_HIO->mCut.mCutEA.m.field_0x20 ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTEAA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTEAA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTEAMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTEAMS_e)); } m35EC = m_HIO->mCut.mCutEA.m.field_0x8; m3700 = cXyz::Zero; @@ -981,7 +981,7 @@ BOOL daPy_lk_c::procCutEA_init() { onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); - setBlurPosResource(LKANM__CUTEA_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTEA_POS_e); setFinishCutAtParam(CUT_TYPE_CUT_EA); m34C4 = 0; m3522 = 0; @@ -1054,9 +1054,9 @@ BOOL daPy_lk_c::procCutEB_init() { m_HIO->mCut.mCutEB.m.field_0x20 ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTEBA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTEBA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTEBMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTEBMS_e)); } m35EC = m_HIO->mCut.mCutEB.m.field_0x8; m3700 = cXyz::Zero; @@ -1065,7 +1065,7 @@ BOOL daPy_lk_c::procCutEB_init() { onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); - setBlurPosResource(LKANM__CUTEB_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTEB_POS_e); setFinishCutAtParam(CUT_TYPE_CUT_EB); m34C4 = 0; m3522 = 0; @@ -1135,9 +1135,9 @@ BOOL daPy_lk_c::procCutExA_init() { m_HIO->mCut.mCutExA.m.field_0x10 ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCA1A)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_EXCA1A_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCA1MS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_EXCA1MS_e)); } m35EC = m_HIO->mCut.mCutExA.m.field_0xC; m3700 = cXyz::Zero; @@ -1146,7 +1146,7 @@ BOOL daPy_lk_c::procCutExA_init() { onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); - setBlurPosResource(LKANM__CUTEXA_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTEXA_POS_e); setExtraCutAtParam(CUT_TYPE_CUT_EXA); m3522 = m_HIO->mCut.mCutExA.m.field_0x4; return true; @@ -1228,9 +1228,9 @@ BOOL daPy_lk_c::procCutExB_init() { m_HIO->mCut.mCutExB.m.field_0xC ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCB1A)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_EXCB1A_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCB1MS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_EXCB1MS_e)); } m35EC = m_HIO->mCut.mCutExB.m.field_0x8; m3700 = cXyz::Zero; @@ -1239,7 +1239,7 @@ BOOL daPy_lk_c::procCutExB_init() { onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); - setBlurPosResource(LKANM__CUTEXB_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTEXB_POS_e); setExtraFinishCutAtParam(CUT_TYPE_CUT_EXB); m34C4 = 0; m3522 = 0; @@ -1335,9 +1335,9 @@ BOOL daPy_lk_c::procCutTurn_init(BOOL param_0) { } if (mEquipItem == daPyItem_SWORD_e) { if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTTURNA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTTURNA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTTURNMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_CUTTURNMS_e)); } if (checkNormalSwordEquip()) { m35A4 = m_HIO->mCut.mCutTurn.m.field_0x40; @@ -1362,7 +1362,7 @@ BOOL daPy_lk_c::procCutTurn_init(BOOL param_0) { } #endif } - setBlurPosResource(LKANM__CUTTURN_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTTURN_POS_e); } else { daBoko_c* boko = (daBoko_c*)mActorKeepEquip.getActor(); u32 boko_type; @@ -1390,7 +1390,7 @@ BOOL daPy_lk_c::procCutTurn_init(BOOL param_0) { } else { m35A4 = m_HIO->mCut.mCutTurn.m.field_0x74; } - setBlurPosResource(LKANM__WEAPONTURN_POS); + setBlurPosResource(dRes_INDEX_LKANM__WEAPONTURN_POS_e); } mAtCyl.SetR(m35A4 * 0.5f); m35EC = fVar1; @@ -1904,9 +1904,9 @@ BOOL daPy_lk_c::procJumpCut_init(int param_0) { voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); if (mEquipItem == daPyItem_BOKO_e) { - setBlurPosResource(LKANM__WEAPONJUMP_POS); + setBlurPosResource(dRes_INDEX_LKANM__WEAPONJUMP_POS_e); } else { - setBlurPosResource(LKANM__CUTJUMP_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTJUMP_POS_e); } setJumpCutAtParam(); return true; @@ -2038,12 +2038,12 @@ BOOL daPy_lk_c::procCutExMJ_init(int param_0) { if (param_0 != 0) { dVar3 = ANM_MROLLRC; mProcVar3.m34D6 = 0x71; - setBlurPosResource(LKANM__BTROTATECUTR_POS); + setBlurPosResource(dRes_INDEX_LKANM__BTROTATECUTR_POS_e); m35A0 = m_HIO->mCut.mCutExMJ.m.field_0x20; } else { dVar3 = ANM_MROLLLC; mProcVar3.m34D6 = 0x70; - setBlurPosResource(LKANM__BTROTATECUTL_POS); + setBlurPosResource(dRes_INDEX_LKANM__BTROTATECUTL_POS_e); m35A0 = m_HIO->mCut.mCutExMJ.m.field_0x24; } setSingleMoveAnime( @@ -2054,9 +2054,9 @@ BOOL daPy_lk_c::procCutExMJ_init(int param_0) { m_HIO->mCut.mCutExMJ.m.field_0xC ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MROLLCA)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_MROLLCA_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MROLLCMS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_MROLLCMS_e)); } m35EC = m_HIO->mCut.mCutExMJ.m.field_0x8; onNoResetFlg0(daPyFlg0_UNK4); @@ -2155,9 +2155,9 @@ BOOL daPy_lk_c::procCutKesa_init() { m_HIO->mCut.mCutKesa.m.field_0xC ); if (checkNormalSwordEquip()) { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCA1A)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_EXCA1A_e)); } else { - mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCA1MS)); + mSwordAnim.changeBckOnly(getItemAnimeResource(dRes_INDEX_LKANM_BCK_EXCA1MS_e)); } m35EC = m_HIO->mCut.mCutKesa.m.field_0x8; m3700 = cXyz::Zero; @@ -2165,7 +2165,7 @@ BOOL daPy_lk_c::procCutKesa_init() { onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); - setBlurPosResource(LKANM__CUTKESA_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTKESA_POS_e); setExtraCutAtParam(CUT_TYPE_CUT_KESA); m3522 = m_HIO->mCut.mCutKesa.m.field_0x2; return true; diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index 3997943e2..dc3b8a5c9 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -39,9 +39,9 @@ void daPy_lk_c::setTactModel() { mEquipItem = dItemNo_WIND_WAKER_e; JKRHeap* oldHeap = setItemHeap(); - J3DModelData* modelData = initModel(&mpEquipItemModel, LINK_BDL_TAKT, 0x37221222); + J3DModelData* modelData = initModel(&mpEquipItemModel, dRes_INDEX_LINK_BDL_TAKT_e, 0x37221222); u8* buffer = new (0x20) u8[0x400]; - dComIfGp_getAnmArchive()->readIdxResource(buffer, 0x400, LKANM_BRK_TTAKT); + dComIfGp_getAnmArchive()->readIdxResource(buffer, 0x400, dRes_INDEX_LKANM_BRK_TTAKT_e); mpEquipItemBrk = (J3DAnmTevRegKey*)J3DAnmLoaderDataBase::load(buffer); mpEquipItemBrk->setFrame(0.0f); mpEquipItemBrk->searchUpdateMaterialID(modelData); @@ -63,29 +63,29 @@ BOOL daPy_lk_c::checkNpcStatus() { /* 8014D8F4-8014D938 .text getTactPlayRightArmAnm__9daPy_lk_cFl */ u16 daPy_lk_c::getTactPlayRightArmAnm(s32 r4) { if (r4 == 1) - return LKANM_BCK_ACTIONTAKTRUP; + return dRes_INDEX_LKANM_BCK_ACTIONTAKTRUP_e; else if (r4 == 3) - return LKANM_BCK_ACTIONTAKTRDW; + return dRes_INDEX_LKANM_BCK_ACTIONTAKTRDW_e; else if (r4 == 2) - return LKANM_BCK_WAITTAKTRHANDL; + return dRes_INDEX_LKANM_BCK_WAITTAKTRHANDL_e; else if (r4 == 4) - return LKANM_BCK_WAITTAKTRHANDR; + return dRes_INDEX_LKANM_BCK_WAITTAKTRHANDR_e; else - return LKANM_BCK_WAITTAKT; + return dRes_INDEX_LKANM_BCK_WAITTAKT_e; } /* 8014D938-8014D97C .text getTactPlayLeftArmAnm__9daPy_lk_cFl */ u16 daPy_lk_c::getTactPlayLeftArmAnm(s32 r4) { if (r4 == 1) - return LKANM_BCK_WAITTAKTLHANDU; + return dRes_INDEX_LKANM_BCK_WAITTAKTLHANDU_e; else if (r4 == 3) - return LKANM_BCK_WAITTAKTLHANDD; + return dRes_INDEX_LKANM_BCK_WAITTAKTLHANDD_e; else if (r4 == 2) - return LKANM_BCK_WAITTAKTLHANDL; + return dRes_INDEX_LKANM_BCK_WAITTAKTLHANDL_e; else if (r4 == 4) - return LKANM_BCK_WAITTAKTLHANDR; + return dRes_INDEX_LKANM_BCK_WAITTAKTLHANDR_e; else - return LKANM_BCK_WAITTAKT; + return dRes_INDEX_LKANM_BCK_WAITTAKT_e; } /* 8014D97C-8014D9A4 .text checkEndTactMusic__9daPy_lk_cCFv */ @@ -249,9 +249,9 @@ BOOL daPy_lk_c::procTactWait_init(int r30) { commonProcInit(daPyProc_TACT_WAIT_e); daPy_matAnm_c::offMabaFlg(); setSingleMoveAnime(ANM_WAITTAKT, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, m_HIO->mItem.mTact.m.field_0x4); - setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE1_e, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_WAITTAKT_e, UPPER_MOVE1_e, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, -1.0f); mAnmRatioUpper[UPPER_MOVE1_e].setRatio(0.0f); - setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE2_e, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, -1.0f); + setActAnimeUpper(dRes_INDEX_LKANM_BCK_WAITTAKT_e, UPPER_MOVE2_e, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, -1.0f); mAnmRatioUpper[UPPER_MOVE2_e].setRatio(0.0f); mNormalSpeed = 0.0f; mProcVar2.m34D4 = 0; diff --git a/src/d/actor/d_a_player_weapon.inc b/src/d/actor/d_a_player_weapon.inc index ba9e338fc..659984ca5 100644 --- a/src/d/actor/d_a_player_weapon.inc +++ b/src/d/actor/d_a_player_weapon.inc @@ -65,7 +65,7 @@ BOOL daPy_lk_c::procWeaponNormalSwing_init() { } dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); m351E = m34DC; - setBlurPosResource(LKANM__CUTBOKO_POS); + setBlurPosResource(dRes_INDEX_LKANM__CUTBOKO_POS_e); setEnemyWeaponAtParam(FALSE); mProcVar0.m34D0 = m_HIO->mCut.mCutBoko.m.field_0x4; @@ -165,7 +165,7 @@ BOOL daPy_lk_c::procWeaponSideSwing_init() { mNormalSpeed = 0.0f; voiceStart(1); mProcVar2.m34D4 = shape_angle.y; - setBlurPosResource(LKANM__HAMMERSIDE_POS); + setBlurPosResource(dRes_INDEX_LKANM__HAMMERSIDE_POS_e); setEnemyWeaponAtParam(FALSE); return true; } @@ -300,7 +300,7 @@ BOOL daPy_lk_c::procWeaponFrontSwing_init() { mProcVar2.m34D4 = m34E8; } mProcVar2.m34D4 = shape_angle.y; - setBlurPosResource(LKANM__HAMMERFRONT_POS); + setBlurPosResource(dRes_INDEX_LKANM__HAMMERFRONT_POS_e); setEnemyWeaponAtParam(FALSE); onResetFlg0(daPy_RFLG0(daPyRFlg0_UNK1 | daPyRFlg0_UNK2)); mProcVar0.m34D0 = 0; diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc index 4e97831ba..c93645341 100644 --- a/src/d/actor/d_a_player_whide.inc +++ b/src/d/actor/d_a_player_whide.inc @@ -245,7 +245,7 @@ int daPy_lk_c::changeWHideEndProc(cXyz* param_0) { dComIfGp_setRStatus(dActStts_CROUCH_e); if ((!doButton() && (!checkNoResetFlg0(daPyFlg0_UNK10000) || !mAcch.ChkRoofHit())) || - (!checkUpperAnime(LKANM_BCK_REST) && swordTrigger()) || + (!checkUpperAnime(dRes_INDEX_LKANM_BCK_REST_e) && swordTrigger()) || !checkWHideBackWall(param_0)) { mNormalSpeed = 0.7f * mMaxNormalSpeed; diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 4df106e36..5bdceb1d5 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_player.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_com_inf_game.h" -#include "d/res/res_pw.h" +#include "res/Object/Pw.h" #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera.h" #include "f_pc/f_pc_manager.h" @@ -177,13 +177,13 @@ void action_dousa(pw_class* i_this) { cXyz camfwd; switch (i_this->mMode) { case 0: - anm_init(i_this, PW_BCK_WAIT1, 7.0, J3DFrameCtrl::EMode_LOOP, 1.0, -1); + anm_init(i_this, dRes_INDEX_PW_BCK_WAIT1_e, 7.0, J3DFrameCtrl::EMode_LOOP, 1.0, -1); i_this->m346 = 0; i_this->mMode += 1; break; case 1: if (fopAcM_searchPlayerDistance(i_this) < 500.0f) { - anm_init(i_this, PW_BCK_DERUA1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_PW_BCK_DERUA1_e, 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; @@ -278,7 +278,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_PW_BCK_DERUB2_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode = 6; } break; @@ -286,7 +286,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::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_PW_BCK_DERUB1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mMode = 7; } break; @@ -297,10 +297,10 @@ void action_dousa(pw_class* i_this) { i_this->m340 = 0; 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::EMode_LOOP, 1.0f, -1); - } else if (i_this->mBckIdx != PW_BCK_WAIT2) { - anm_init(i_this, PW_BCK_WAIT2, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + if (i_this->m346 && i_this->mBckIdx != dRes_INDEX_PW_BCK_WAIT1_e) { + anm_init(i_this, dRes_INDEX_PW_BCK_WAIT1_e, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + } else if (i_this->mBckIdx != dRes_INDEX_PW_BCK_WAIT2_e) { + anm_init(i_this, dRes_INDEX_PW_BCK_WAIT2_e, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mMode += 1; // Fall-through @@ -314,12 +314,12 @@ void action_dousa(pw_class* i_this) { case 15: 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::EMode_LOOP, 1.0f, -1); + if (i_this->mBckIdx != dRes_INDEX_PW_BCK_IDOU1_e) { + anm_init(i_this, dRes_INDEX_PW_BCK_IDOU1_e, 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::EMode_LOOP, 1.0f, -1); + if (i_this->mBckIdx != dRes_INDEX_PW_BCK_IDOU2_e) { + anm_init(i_this, dRes_INDEX_PW_BCK_IDOU2_e, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } i_this->m38C += (s16)cM_rndFX(16384.0f); @@ -360,7 +360,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_PW_BCK_DAMAGE_K1_e, 9.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->speedF = -2.0f; i_this->mMode += 1; break; @@ -385,11 +385,11 @@ void action_dousa(pw_class* i_this) { case 92: break; case 100: - anm_init(i_this, PW_BCK_JITTAIKA1, 6.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_PW_BCK_JITTAIKA1_e, 6.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode += 1; break; case 110: - anm_init(i_this, PW_BCK_ATTACK1, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_PW_BCK_ATTACK1_e, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); // TODO i_this->mMode += 1; break; @@ -404,7 +404,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::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_PW_BCK_SIRIMOTI1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mMode += 1; case 112: // Fall-through diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index a5dfa4e2f..51a50573d 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_rd.h" -#include "d/res/res_rd.h" +#include "res/Object/Rd.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -234,13 +234,13 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { /* 000006C0-0000096C .text _createHeap__6daRd_cFv */ BOOL daRd_c::_createHeap() { - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, RD_BDL_RD)); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_RD_BDL_RD_e)); JUT_ASSERT(DEMO_SELECT(502, 504), modelData != NULL); mpMorf = new mDoExt_McaMorf( modelData, NULL, NULL, - static_cast(dComIfG_getObjectRes(m_arc_name, RD_BCK_SUWARIP)), + static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_RD_BCK_SUWARIP_e)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, @@ -255,7 +255,7 @@ BOOL daRd_c::_createHeap() { return FALSE; } - J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, RD_BTK_RD_CLOSE)); + J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_RD_BTK_RD_CLOSE_e)); JUT_ASSERT(DEMO_SELECT(528, 525), btk != NULL); if (!mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; @@ -263,7 +263,7 @@ BOOL daRd_c::_createHeap() { modelData->getJointNodePointer(0x0C)->setCallBack(nodeHeadControl_CB); // ree_atama_1 - J3DAnmTevRegKey* brk = static_cast(dComIfG_getObjectRes(m_arc_name, RD_BRK_NML)); + J3DAnmTevRegKey* brk = static_cast(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_RD_BRK_NML_e)); JUT_ASSERT(DEMO_SELECT(553, 550), brk != NULL); if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; @@ -1378,10 +1378,10 @@ void daRd_c::modeProc(daRd_c::Proc_e proc, int newMode) { /* 000038D4-000039AC .text setBrkAnm__6daRd_cFSc */ void daRd_c::setBrkAnm(s8 idx) { static const int a_anm_idx_tbl[] = { - RD_BRK_NML, - RD_BRK_BEAM_HIT, - RD_BRK_BEAM, - RD_BRK_BEAM_END, + dRes_INDEX_RD_BRK_NML_e, + dRes_INDEX_RD_BRK_BEAM_HIT_e, + dRes_INDEX_RD_BRK_BEAM_e, + dRes_INDEX_RD_BRK_BEAM_END_e, }; static const int a_play_mod_tbl[] = { J3DFrameCtrl::EMode_NONE, @@ -1399,10 +1399,10 @@ void daRd_c::setBrkAnm(s8 idx) { /* 000039AC-00003B3C .text setBtkAnm__6daRd_cFSc */ void daRd_c::setBtkAnm(s8 idx) { static const int a_anm_idx_tbl[] = { - RD_BTK_RD_IKARI, - RD_BTK_RD_NML, - RD_BTK_RD_OPEN, - RD_BTK_RD_CLOSE, + dRes_INDEX_RD_BTK_RD_IKARI_e, + dRes_INDEX_RD_BTK_RD_NML_e, + dRes_INDEX_RD_BTK_RD_OPEN_e, + dRes_INDEX_RD_BTK_RD_CLOSE_e, }; struct anm_prm_struct { s8 m00; @@ -1441,20 +1441,20 @@ void daRd_c::setBtkAnm(s8 idx) { /* 00003B3C-00003C48 .text setAnm__6daRd_cFScb */ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { static const int a_anm_bcks_tbl[] = { - RD_BCK_TACHIP, - RD_BCK_SUWARIP, - RD_BCK_WALK2ATACK, - RD_BCK_ATACK, - RD_BCK_ATACK2WALK, - RD_BCK_WALK, - RD_BCK_DAMAGE, - RD_BCK_DEAD, - RD_BCK_TATSU, - RD_BCK_SUWARU, - RD_BCK_KANOKEP, - RD_BCK_BEAM_HIT, - RD_BCK_BEAM, - RD_BCK_BEAM_END, + dRes_INDEX_RD_BCK_TACHIP_e, + dRes_INDEX_RD_BCK_SUWARIP_e, + dRes_INDEX_RD_BCK_WALK2ATACK_e, + dRes_INDEX_RD_BCK_ATACK_e, + dRes_INDEX_RD_BCK_ATACK2WALK_e, + dRes_INDEX_RD_BCK_WALK_e, + dRes_INDEX_RD_BCK_DAMAGE_e, + dRes_INDEX_RD_BCK_DEAD_e, + dRes_INDEX_RD_BCK_TATSU_e, + dRes_INDEX_RD_BCK_SUWARU_e, + dRes_INDEX_RD_BCK_KANOKEP_e, + dRes_INDEX_RD_BCK_BEAM_HIT_e, + dRes_INDEX_RD_BCK_BEAM_e, + dRes_INDEX_RD_BCK_BEAM_END_e, }; static const dLib_anm_prm_c a_anm_prm_tbl[] = { { diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index 52e83bfd4..f33e32688 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -8,8 +8,8 @@ #if VERSION == VERSION_DEMO #include "d/d_s_play.h" #endif -#include "d/res/res_kaizokusen.h" -#include "d/res/res_cloth.h" +#include "res/Object/Kaizokusen.h" +#include "res/Object/Cloth.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "d/actor/d_a_obj_pirateship.h" @@ -397,7 +397,7 @@ void daSail_packet_c::draw() { GXTexObj texObj; - ResTIMG* kaizokusen = (ResTIMG*)dComIfG_getObjectRes("Kaizokusen", KAIZOKUSEN_INDEX_BTI_TXA_KAIZOKU_HO); + ResTIMG* kaizokusen = (ResTIMG*)dComIfG_getObjectRes("Kaizokusen", dRes_INDEX_KAIZOKUSEN_BTI_TXA_KAIZOKU_HO_e); GXInitTexObj(&texObj, (u8*)kaizokusen + kaizokusen->imageOffset, kaizokusen->width, kaizokusen->height, (GXTexFmt)kaizokusen->format, (GXTexWrapMode)kaizokusen->wrapS, (GXTexWrapMode)kaizokusen->wrapT, kaizokusen->mipmapCount > 1); @@ -406,7 +406,7 @@ void daSail_packet_c::draw() { kaizokusen->biasClamp, kaizokusen->doEdgeLOD, (GXAnisotropy)kaizokusen->maxAnisotropy); GXLoadTexObj(&texObj, GX_TEXMAP0); - ResTIMG* cloth = (ResTIMG*)dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON); + ResTIMG* cloth = (ResTIMG*)dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e); GXInitTexObj(&texObj, (u8*)cloth + cloth->imageOffset, cloth->width, cloth->height, (GXTexFmt)cloth->format, (GXTexWrapMode)cloth->wrapS, (GXTexWrapMode)cloth->wrapT, cloth->mipmapCount > 1); @@ -791,7 +791,7 @@ static BOOL daSail_Delete(sail_class* i_this) { /* 000021D8-00002254 .text daSail_checkCreateHeap__FP10fopAc_ac_c */ static BOOL daSail_checkCreateHeap(fopAc_ac_c* i_actor) { sail_class* i_this = (sail_class*)i_actor; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kaizokusen", KAIZOKUSEN_INDEX_BDL_AMAST); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kaizokusen", dRes_INDEX_KAIZOKUSEN_BDL_AMAST_e); if (modelData == NULL) { return FALSE; } diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index 37d67e2c5..db8f51470 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_sea.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_daiocta.h" -#include "d/res/res_yslvg00.h" +#include "res/Object/Yslvg00.h" #include "d/d_bg_s_func.h" #include "d/d_map.h" #include "d/d_kankyo.h" @@ -38,7 +38,7 @@ BOOL daSalvage_c::CreateHeap() { } mTagData_p->init(); - mModelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, YSLVG00_BDL_YSLVG00); + mModelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_YSLVG00_BDL_YSLVG00_e); JUT_ASSERT(326, mModelData != NULL); for (s32 i = 0; i < 16; i++) { @@ -48,7 +48,7 @@ BOOL daSalvage_c::CreateHeap() { } } - J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, YSLVG00_BRK_YSLVG00); + J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_YSLVG00_BRK_YSLVG00_e); JUT_ASSERT(347, pbrk != NULL); mpBrk = new mDoExt_brkAnm(); @@ -56,7 +56,7 @@ BOOL daSalvage_c::CreateHeap() { return false; } - J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, YSLVG00_BTK_YSLVG00); + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_YSLVG00_BTK_YSLVG00_e); JUT_ASSERT(361, pbtk != NULL); mpBtk = new mDoExt_btkAnm(); diff --git a/src/d/actor/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp index 0dcf34dfd..6de221537 100644 --- a/src/d/actor/d_a_sbox.cpp +++ b/src/d/actor/d_a_sbox.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_sbox.h" #include "d/actor/d_a_ship.h" -#include "d/res/res_dalways.h" +#include "res/Object/Dalways.h" #include "d/d_kankyo.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -20,10 +20,10 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) { /* 00000098-0000034C .text CreateHeap__8daSbox_cFv */ BOOL daSbox_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", DALWAYS_BDL_BOXSEA)); + J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BDL_BOXSEA_e)); JUT_ASSERT(113, modelData != NULL); - if (!mBck1.init(modelData, (J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", DALWAYS_BCK_BOXOPENBOX)), true, J3DFrameCtrl::EMode_NONE)) + if (!mBck1.init(modelData, (J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BCK_BOXOPENBOX_e)), true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -33,7 +33,7 @@ BOOL daSbox_c::CreateHeap() { return FALSE; } - J3DModelData* flashModelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", DALWAYS_BDL_IT_TAKARA_FLASH)); + J3DModelData* flashModelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BDL_IT_TAKARA_FLASH_e)); JUT_ASSERT(140, flashModelData != NULL); mpModel2 = mDoExt_J3DModel__create(flashModelData, 0x80000, 0x1000200); @@ -43,7 +43,7 @@ BOOL daSbox_c::CreateHeap() { if (!mBck2.init( flashModelData, - (J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", DALWAYS_BCK_IT_TAKARA_FLASH2)), + (J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BCK_IT_TAKARA_FLASH2_e)), true, J3DFrameCtrl::EMode_NONE, 1.0f, @@ -57,7 +57,7 @@ BOOL daSbox_c::CreateHeap() { if (!mBtk.init( flashModelData, - (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes("Dalways", DALWAYS_BTK_IT_TAKARA_FLASH)), + (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BTK_IT_TAKARA_FLASH_e)), true, J3DFrameCtrl::EMode_NONE, 1.0f, @@ -72,7 +72,7 @@ BOOL daSbox_c::CreateHeap() { if (!mBrk.init( flashModelData, - (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dalways", DALWAYS_BRK_IT_TAKARA_FLASH)), + (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BRK_IT_TAKARA_FLASH_e)), true, J3DFrameCtrl::EMode_NONE, 1.0f, diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 45966463a..787b0ea76 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -192,7 +192,7 @@ bool daSea_packet_c::create(cXyz& pos) { mFlags = 0; mAnimCounter = 0; - ResTIMG* timg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_B_SEA_TEX0AND2); + ResTIMG* timg = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_B_SEA_TEX0AND2_e); GXBool mipmap = timg->mipmapCount > 1; GXInitTexObj(&mTexSea0, (char*)timg + timg->imageOffset, timg->width, timg->height, @@ -212,7 +212,7 @@ bool daSea_packet_c::create(cXyz& pos) { (GXBool)timg->biasClamp, (GXBool)timg->doEdgeLOD, (GXAnisotropy)timg->maxAnisotropy); - timg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_B_WYURAYURA_TEX1); + timg = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_B_WYURAYURA_TEX1_e); mDoLib_setResTimgObj(timg, &mTexYura, 0, NULL); return true; @@ -684,7 +684,7 @@ void daSea_packet_c::draw() { DCStoreRange(m_draw_vtx, sizeof(cXyz) * GRID_CELLS * GRID_CELLS); #endif - ResTIMG* pResTIMG = static_cast(dComIfG_getObjectRes("Always", ALWAYS_BTI_B_SEA_TEX0AND2)); + ResTIMG* pResTIMG = static_cast(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_B_SEA_TEX0AND2_e)); GXBool mipmap = pResTIMG->mipmapCount > 1; GXInitTexObj(&mTexSea0, (&pResTIMG->format + pResTIMG->imageOffset), pResTIMG->width, pResTIMG->height, @@ -706,7 +706,7 @@ void daSea_packet_c::draw() { (GXBool)pResTIMG->biasClamp, (GXBool)pResTIMG->doEdgeLOD, (GXAnisotropy)pResTIMG->maxAnisotropy); - pResTIMG = static_cast(dComIfG_getObjectRes("Always", ALWAYS_BTI_B_WYURAYURA_TEX1)); + pResTIMG = static_cast(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_B_WYURAYURA_TEX1_e)); mDoLib_setResTimgObj(pResTIMG, &mTexYura, 0, NULL); mDoMtx_stack_c::scaleS(1.5f, 1.5f, 1.0f); GXLoadTexMtxImm(mDoMtx_stack_c::get(), GX_TEXMTX0, GX_MTX2x4); diff --git a/src/d/actor/d_a_shand.cpp b/src/d/actor/d_a_shand.cpp index a3eed252d..bed411f12 100644 --- a/src/d/actor/d_a_shand.cpp +++ b/src/d/actor/d_a_shand.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_shand.h" -#include "d/res/res_shand.h" +#include "res/Object/Shand.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_cc_uty.h" @@ -393,9 +393,9 @@ static BOOL daShand_Delete(shand_class* i_this) { static BOOL useHeapInit(shand_class* i_this) { int bti_idx; if ((fopAcM_GetParam(i_this) & 0xff) == 53) { - bti_idx = SHAND_BTI_VHLIF_VINE; + bti_idx = dRes_INDEX_SHAND_BTI_VHLIF_VINE_e; } else { - bti_idx = SHAND_BTI_SHAND; + bti_idx = dRes_INDEX_SHAND_BTI_SHAND_e; } ResTIMG* img = static_cast(dComIfG_getObjectRes("Shand", bti_idx)); diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index f10a91041..b5c9b7fb6 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -21,7 +21,7 @@ #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_grid.h" -#include "d/res/res_ship.h" +#include "res/Object/Ship.h" static char l_arcName[] = "Ship"; static Vec l_cannon_top = {85.0f, 0.0f, 10.0f}; @@ -1326,9 +1326,9 @@ BOOL daShip_c::checkNextMode(int i_curMode) { /* 00003490-0000358C .text setPartOnAnime__8daShip_cFUc */ void daShip_c::setPartOnAnime(u8 i_part) { - J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, SHIP_BCK_FN_MAST_ON2); + J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e); mpBodyAnm->setAnm(pAnimRes, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f, 0.0f, -1.0f, NULL); - m0392 = SHIP_BCK_FN_MAST_ON2; + m0392 = dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e; mPart = i_part; if (mPart == PART_STEER_e) { seStart(JA_SE_SHIP_SAIL_OUT, &m0444); @@ -1346,7 +1346,7 @@ void daShip_c::setPartOnAnime(u8 i_part) { /* 0000358C-0000366C .text setPartOffAnime__8daShip_cFv */ void daShip_c::setPartOffAnime() { - J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, SHIP_BCK_FN_MAST_OFF2); + J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e); mpBodyAnm->setAnm(pAnimRes, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f, 0.0f, -1.0f, NULL); if (mPart == PART_CRANE_e) { seStart(JA_SE_LK_SHIP_CRANE_IN, &m0444); @@ -1357,7 +1357,7 @@ void daShip_c::setPartOffAnime() { else { seStart(JA_SE_SHIP_SAIL_IN, &m0444); } - m0392 = SHIP_BCK_FN_MAST_OFF2; + m0392 = dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e; offStateFlg(daSFLG_SAIL_ON_e); } @@ -1365,13 +1365,13 @@ void daShip_c::setPartOffAnime() { void daShip_c::setPartAnimeInit(u8 i_part) { float fVar1 = 1.0f - mpBodyAnm->getFrame() / mpBodyAnm->getEndFrame(); if (i_part == 0) { - if (m0392 == SHIP_BCK_FN_MAST_ON2) { + if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e) { setPartOffAnime(); mpBodyAnm->setFrame(fVar1 * mpBodyAnm->getEndFrame()); } } else if (mPart != i_part) { - if (m0392 == SHIP_BCK_FN_MAST_ON2) { + if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e) { setPartOffAnime(); mpBodyAnm->setFrame(fVar1 * mpBodyAnm->getEndFrame()); } @@ -1379,7 +1379,7 @@ void daShip_c::setPartAnimeInit(u8 i_part) { setPartOnAnime(i_part); } } - else if (m0392 == SHIP_BCK_FN_MAST_OFF2) { + else if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { setPartOnAnime(i_part); mpBodyAnm->setFrame(fVar1 * mpBodyAnm->getEndFrame()); } @@ -1438,7 +1438,7 @@ BOOL daShip_c::procWait_init() { mCurMode = MODE_WAIT_e; mProc = &daShip_c::procWait; m037A = 0; - if (m0392 != SHIP_BCK_FN_MAST_OFF2) { + if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { setPartOffAnime(); } return TRUE; @@ -1515,7 +1515,7 @@ BOOL daShip_c::procReady() { BOOL daShip_c::procGetOff_init() { mCurMode = MODE_GET_OFF_FIRST_e; mProc = &daShip_c::procGetOff; - if (m0392 != SHIP_BCK_FN_MAST_OFF2) { + if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { setPartOffAnime(); } speedF = 0.0f; @@ -1559,7 +1559,7 @@ BOOL daShip_c::procPaddleMove_init() { mProc = &daShip_c::procPaddleMove; - if (m0392 != SHIP_BCK_FN_MAST_OFF2) { + if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { setPartOffAnime(); } @@ -1628,7 +1628,7 @@ BOOL daShip_c::procSteerMove() { setMoveAngle(m0366); } setSailAngle(); - if (m0392 == SHIP_BCK_FN_MAST_ON2 && mpBodyAnm->getFrame() >= 7.0f && mPart == PART_STEER_e) { + if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e && mpBodyAnm->getFrame() >= 7.0f && mPart == PART_STEER_e) { onStateFlg(daSFLG_SAIL_ON_e); } if (!checkStateFlg(daSFLG_FLY_e)) { @@ -1681,7 +1681,7 @@ BOOL daShip_c::procSteerMove() { } if (!dComIfGp_event_runCheck() && !daPy_getPlayerLinkActorClass()->checkNoControll() && - m0392 == SHIP_BCK_FN_MAST_ON2 && + m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e && mpBodyAnm->getFrame() >= 7.0f && !checkStateFlg(daSFLG_FLY_e) && mFwdVel > 16.5f) { @@ -2117,7 +2117,7 @@ BOOL daShip_c::procZevDemo() { cXyz local_70; cXyz local_64; - if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && m0392 != SHIP_BCK_FN_MAST_OFF2) { + if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { setPartOffAnime(); } if (mEvtStaffId != -1) { @@ -2142,7 +2142,7 @@ BOOL daShip_c::procZevDemo() { if (talkP && *talkP == 1) { if (!checkStateFlg(daSFLG_UNK8000_e)) { - m038A = SHIP_BCK_FN_TALK_A; + m038A = dRes_INDEX_SHIP_BCK_FN_TALK_A_e; mAnmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, m038A); mFrameCtrl.init(mAnmTransform->getFrameMax()); onStateFlg(daSFLG_UNK8000_e); @@ -2192,10 +2192,10 @@ BOOL daShip_c::procZevDemo() { u16 fileIndex; if (mPart != PART_WAIT_e) { - fileIndex = SHIP_BCK_FN_MAST_ON2; + fileIndex = dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e; } else { - fileIndex = SHIP_BCK_FN_MAST_OFF2; + fileIndex = dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e; m03E8 = 0.001f; } if (m0392 != fileIndex) { @@ -2302,9 +2302,9 @@ BOOL daShip_c::procZevDemo() { } else if (m0351 == DEMO_RACE_FAIL_e) { if (!checkStateFlg(daSFLG_UNK10000_e)) { - mpHeadAnm->setAnm((J3DAnmTransform *)dComIfG_getObjectRes(l_arcName, SHIP_BCK_FN_LOSE1), J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL); + mpHeadAnm->setAnm((J3DAnmTransform *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BCK_FN_LOSE1_e), J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL); onStateFlg(daSFLG_UNK10000_e); - m03B4 = SHIP_BCK_FN_LOSE1; + m03B4 = dRes_INDEX_SHIP_BCK_FN_LOSE1_e; } speedF = 0.0f; @@ -2326,10 +2326,10 @@ BOOL daShip_c::procZevDemo() { u16 fileIndex; if (partP == NULL || !(*partP & 1)) { - fileIndex = SHIP_BCK_FN_LOOK_R; + fileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_R_e; } else { - fileIndex = SHIP_BCK_FN_LOOK_L; + fileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; } f32 fVar17; @@ -2449,17 +2449,17 @@ BOOL daShip_c::procTalkReady_init() { mAnmTransform = NULL; if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { if ((s16)(shape_angle.y - m038C) > 0) { - m03B4 = SHIP_BCK_FN_LOOK_R; + m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_R_e; } else { - m03B4 = SHIP_BCK_FN_LOOK_L; + m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; } } else if ((s16)(fopAcM_searchPlayerAngleY(this) - shape_angle.y) > 0) { - m03B4 = SHIP_BCK_FN_LOOK_L; + m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; } else { - m03B4 = SHIP_BCK_FN_LOOK_R; + m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_R_e; } pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, m03B4); mpHeadAnm->setAnm(pAnimRes, 0, 5.0f, 1.0f, 0.0f, -1.0f, NULL); @@ -2483,7 +2483,7 @@ BOOL daShip_c::procTalk_init() { mProc = &daShip_c::procTalk; mCurMode = MODE_TALK_e; m0430 = fpcM_ERROR_PROCESS_ID_e; - m038A = SHIP_BCK_FN_TALK_A; + m038A = dRes_INDEX_SHIP_BCK_FN_TALK_A_e; mAnmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, m038A); mFrameCtrl.init(mAnmTransform->getFrameMax()); setInitMessage(); @@ -2528,10 +2528,10 @@ BOOL daShip_c::procTalk() { } if (mFrameCtrl.checkState(2)) { if (cM_rndF(2.0f) < 1.0f) { - fileIndex = SHIP_BCK_FN_TALK_A; + fileIndex = dRes_INDEX_SHIP_BCK_FN_TALK_A_e; } else { - fileIndex = SHIP_BCK_FN_TALK_B; + fileIndex = dRes_INDEX_SHIP_BCK_FN_TALK_B_e; } if (fileIndex != m038A) { m038A = fileIndex; @@ -2681,7 +2681,7 @@ BOOL daShip_c::procStartModeWarp_init() { onStateFlg(daSFLG_FLY_e); mProc = &daShip_c::procStartModeWarp; mCurMode = MODE_START_MODE_WARP_e; - if (m0392 != SHIP_BCK_FN_MAST_OFF2) { + if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { setPartOffAnime(); } m03A6 = 0x1C25; @@ -2780,7 +2780,7 @@ BOOL daShip_c::procTactWarp_init() { mCurMode = MODE_TACT_WARP_e; mProc = &daShip_c::procTactWarp; - if (m0392 != SHIP_BCK_FN_MAST_OFF2) { + if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { setPartOffAnime(); } m03A6 = 0; @@ -2906,7 +2906,7 @@ BOOL daShip_c::procStartModeThrow_init() { onStateFlg(daSFLG_FLY_e); mProc = &daShip_c::procStartModeThrow; mCurMode = MODE_START_MODE_THROW_e; - if (m0392 != SHIP_BCK_FN_MAST_OFF2) { + if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { setPartOffAnime(); } m03A6 = l_HIO.throw_return_angle_speed; @@ -3292,7 +3292,7 @@ void daShip_c::setRopePos() { ); mDoMtx_stack_c::XrotM(-0x4000); - if (m0392 == SHIP_BCK_FN_MAST_ON2) { + if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e) { J3DTransformInfo sp104; mpBodyAnm->getAnm()->getTransform(6, &sp104); mDoMtx_stack_c::scaleM(sp104.mScale.x, sp104.mScale.y, sp104.mScale.z); @@ -3390,7 +3390,7 @@ void daShip_c::setRopePos() { /* 00009314-00009384 .text getAnglePartRate__8daShip_cFv */ f32 daShip_c::getAnglePartRate() { float fVar1; - if (m0392 == SHIP_BCK_FN_MAST_OFF2) { + if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { fVar1 = 0.33333334f * (3.0f - mpBodyAnm->getFrame()); } else { @@ -3472,16 +3472,16 @@ void daShip_c::setHeadAnm() { (dComIfGp_evmng_startCheck("SV_TALK_P1_1ST") || dComIfGp_evmng_startCheck("SV_TALK_P1_2ND") || dComIfGp_evmng_startCheck("SV_TALK_P4_1ST"))) { - newFileIndex = SHIP_BCK_KYAKKAN1; - } else if (m03B4 == SHIP_BCK_KYAKKAN1 || m03B4 == SHIP_BCK_DAMAGE1) { - newFileIndex = SHIP_BCK_FN_LOOK_L; + newFileIndex = dRes_INDEX_SHIP_BCK_KYAKKAN1_e; + } else if (m03B4 == dRes_INDEX_SHIP_BCK_KYAKKAN1_e || m03B4 == dRes_INDEX_SHIP_BCK_DAMAGE1_e) { + newFileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; } } else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { if (dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e | daPyStts0_SUBJECT_e | daPyStts0_HOOKSHOT_AIM_e | daPyStts0_BOOMERANG_AIM_e | daPyStts0_TELESCOPE_LOOK_e) || dComIfGp_checkPlayerStatus1(0, daPyStts1_PICTO_BOX_AIM_e) || mCurMode == 9) { - newFileIndex = SHIP_BCK_KYAKKAN1; + newFileIndex = dRes_INDEX_SHIP_BCK_KYAKKAN1_e; } else if ( #if VERSION > VERSION_DEMO @@ -3489,11 +3489,11 @@ void daShip_c::setHeadAnm() { #endif (mSph.ChkTgHit() || mCyl[0].ChkTgHit() || mCyl[1].ChkTgHit() || mCyl[2].ChkTgHit())) { - m03B4 = SHIP_BCK_FN_LOOK_L; - newFileIndex = SHIP_BCK_DAMAGE1; + m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; + newFileIndex = dRes_INDEX_SHIP_BCK_DAMAGE1_e; } - else if (m03B4 != SHIP_BCK_DAMAGE1 || std::fabsf(mpHeadAnm->getPlaySpeed()) < 0.01f) { - newFileIndex = SHIP_BCK_FN_LOOK_L; + else if (m03B4 != dRes_INDEX_SHIP_BCK_DAMAGE1_e || std::fabsf(mpHeadAnm->getPlaySpeed()) < 0.01f) { + newFileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; } } else { @@ -3503,34 +3503,34 @@ void daShip_c::setHeadAnm() { #endif (mSph.ChkTgHit() || mCyl[0].ChkTgHit() || mCyl[1].ChkTgHit() || mCyl[2].ChkTgHit())) { - m03B4 = SHIP_BCK_FN_LOOK_L; - newFileIndex = SHIP_BCK_DAMAGE1; + m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; + newFileIndex = dRes_INDEX_SHIP_BCK_DAMAGE1_e; } - else if (m03B4 == SHIP_BCK_DAMAGE1 || m03B4 == SHIP_BCK_AKIBI1) { + else if (m03B4 == dRes_INDEX_SHIP_BCK_DAMAGE1_e || m03B4 == dRes_INDEX_SHIP_BCK_AKIBI1_e) { if (mpHeadAnm->getPlaySpeed() < 0.01f) { - newFileIndex = SHIP_BCK_FN_LOOK_L; + newFileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; } } - else if ((m03B4 == SHIP_BCK_FN_LOOK_L || m03B4 == SHIP_BCK_FN_LOOK_R) && + else if ((m03B4 == dRes_INDEX_SHIP_BCK_FN_LOOK_L_e || m03B4 == dRes_INDEX_SHIP_BCK_FN_LOOK_R_e) && std::fabsf(mpHeadAnm->getPlaySpeed()) < 0.01f && cM_rnd() < 0.4f && (g_Counter.mTimer & 0x1FF) == 0x1FF && #if VERSION > VERSION_DEMO (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3910) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02)) && #endif !checkStateFlg(daSFLG_UNK40000000_e)) { - newFileIndex = SHIP_BCK_AKIBI1; + newFileIndex = dRes_INDEX_SHIP_BCK_AKIBI1_e; } - else if (m03B4 != SHIP_BCK_FN_LOOK_R) { - newFileIndex = SHIP_BCK_FN_LOOK_L; + else if (m03B4 != dRes_INDEX_SHIP_BCK_FN_LOOK_R_e) { + newFileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; } } if (m03B4 != newFileIndex && newFileIndex != -1) { - if (newFileIndex == SHIP_BCK_AKIBI1) { + if (newFileIndex == dRes_INDEX_SHIP_BCK_AKIBI1_e) { speed = 1.0f; morph = 5.0f; } - else if (newFileIndex == SHIP_BCK_DAMAGE1) { + else if (newFileIndex == dRes_INDEX_SHIP_BCK_DAMAGE1_e) { speed = 1.0f; morph = 0.0f; } @@ -3983,7 +3983,7 @@ BOOL daShip_c::execute() { mpHeadAnm->calc(); if (mPart == PART_CRANE_e) { - if (m0392 == SHIP_BCK_FN_MAST_OFF2) { + if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) { f32 rate = getAnglePartRate(); m0398 = rate * mCraneBaseAngle; m039C *= getAnglePartRate(); @@ -4404,12 +4404,12 @@ BOOL daShip_c::createHeap() { J3DModelData* modelData; if (checkStateFlg(daSFLG_SAIL_ON_e)) { - m0392 = SHIP_BCK_FN_MAST_ON2; + m0392 = dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e; } else { - m0392 = SHIP_BCK_FN_MAST_OFF2; + m0392 = dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e; } - modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_BODY); + modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BDL_FN_BODY_e); JUT_ASSERT(DEMO_SELECT(6969, 7004), modelData != NULL); mpBodyAnm = new mDoExt_McaMorf( @@ -4434,7 +4434,7 @@ BOOL daShip_c::createHeap() { return FALSE; } - modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCN); + modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BDL_VFNCN_e); JUT_ASSERT(DEMO_SELECT(7006, 7041), modelData != NULL); mpCannonModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); @@ -4442,7 +4442,7 @@ BOOL daShip_c::createHeap() { return FALSE; } - modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCR); + modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BDL_VFNCR_e); JUT_ASSERT(DEMO_SELECT(7019, 7054), modelData != NULL); mpSalvageArmModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); @@ -4450,7 +4450,7 @@ BOOL daShip_c::createHeap() { return FALSE; } - modelData = (J3DModelData *)dComIfG_getObjectRes("Link", LINK_BDL_ROPEEND); + modelData = (J3DModelData *)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_ROPEEND_e); JUT_ASSERT(DEMO_SELECT(7032, 7067), modelData != NULL); mpLinkModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); @@ -4458,14 +4458,14 @@ BOOL daShip_c::createHeap() { return FALSE; } - modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_HEAD_H); + modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BDL_FN_HEAD_H_e); JUT_ASSERT(DEMO_SELECT(7045, 7080), modelData != NULL); - m03B4 = SHIP_BCK_FN_LOOK_L; + m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e; mpHeadAnm = new mDoExt_McaMorf( modelData, NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes(l_arcName, SHIP_BCK_FN_LOOK_L), + (J3DAnmTransformKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BCK_FN_LOOK_L_e), J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 0, NULL, 0x80000, 0x11000002 ); @@ -4474,7 +4474,7 @@ BOOL daShip_c::createHeap() { return FALSE; } mpHeadAnm->setMorf(3.0f); - if (mRopeLine.init(1, 0xFA, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 0)) { + if (mRopeLine.init(1, 0xFA, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 0)) { return TRUE; } else { return FALSE; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 00b1fc5ac..98b8f18a9 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -11,8 +11,8 @@ #include "d/d_item.h" #include "d/d_item_data.h" #include "d/d_cloth_packet.h" -#include "d/res/res_fdai.h" -#include "d/res/res_cloth.h" +#include "res/Object/Fdai.h" +#include "res/Object/Cloth.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" @@ -74,10 +74,10 @@ BOOL daShopItem_c::clothCreate() { (dCloth_packet_c::CreateFunc)dClothVobj07_0_create }; u32 clothRes[4] = { - FDAI_BTI_FTEX03, - FDAI_BTI_FTEX04, - FDAI_BTI_FTEX05, - FDAI_BTI_FTEX07 + dRes_INDEX_FDAI_BTI_FTEX03_e, + dRes_INDEX_FDAI_BTI_FTEX04_e, + dRes_INDEX_FDAI_BTI_FTEX05_e, + dRes_INDEX_FDAI_BTI_FTEX07_e }; switch(m_itemNo) { @@ -96,7 +96,7 @@ BOOL daShopItem_c::clothCreate() { } ResTIMG* shopArc = (ResTIMG*)dComIfG_getObjectRes(getShopArcname(), clothRes[field_0x648]); - ResTIMG* clothArc = (ResTIMG*)dComIfG_getObjectRes(m_cloth_arcname, CLOTH_BTI_CLOTHTOON); + ResTIMG* clothArc = (ResTIMG*)dComIfG_getObjectRes(m_cloth_arcname, dRes_INDEX_CLOTH_BTI_CLOTHTOON_e); field_0x644 = (*clothFunc[field_0x648])(shopArc, clothArc, &tevStr, 0); if (field_0x644 == 0) { diff --git a/src/d/actor/d_a_shutter.cpp b/src/d/actor/d_a_shutter.cpp index e7373b17f..49c1a95ab 100644 --- a/src/d/actor/d_a_shutter.cpp +++ b/src/d/actor/d_a_shutter.cpp @@ -6,16 +6,16 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_shutter.h" #include "d/d_com_inf_game.h" -#include "d/res/res_htobi1.h" -#include "d/res/res_htobi2.h" +#include "res/Object/Htobi1.h" +#include "res/Object/Htobi2.h" const float daShutter_c::m_max_speed[2] = {3.0f, 3.0f}; const float daShutter_c::m_min_speed[2] = {1.0f, 1.0f}; const float daShutter_c::m_move_len[2] = {200.0f, 84.0f}; const float daShutter_c::m_width[2] = {220.0f, 82.0f}; const float daShutter_c::m_height[2] = {200.0f, 100.0f}; -const s16 daShutter_c::m_bdlidx[2] = {HTOBI1_BDL_HTOBI1, HTOBI2_BDL_HTOBI2}; -const s16 daShutter_c::m_dzbidx[2] = {HTOBI1_DZB_HTOBI1, HTOBI2_DZB_HTOBI2}; +const s16 daShutter_c::m_bdlidx[2] = {dRes_INDEX_HTOBI1_BDL_HTOBI1_e, dRes_INDEX_HTOBI2_BDL_HTOBI2_e}; +const s16 daShutter_c::m_dzbidx[2] = {dRes_INDEX_HTOBI1_DZB_HTOBI1_e, dRes_INDEX_HTOBI2_DZB_HTOBI2_e}; const s32 daShutter_c::m_heapsize[2] = {0x1140, 0x3000}; const Vec daShutter_c::m_cull_min[2] = {{-500.0f, -100.0f, -50.0f}, {-150.0f, -100.0f, -50.0f}}; const Vec daShutter_c::m_cull_max[2] = {{500.0f, 250.0f, 50.0f}, {150.0f, 250.0f, 50.0f}}; diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp index 6184a6010..b778beeb9 100644 --- a/src/d/actor/d_a_shutter2.cpp +++ b/src/d/actor/d_a_shutter2.cpp @@ -6,15 +6,15 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_shutter2.h" #include "d/d_com_inf_game.h" -#include "d/res/res_htobi3.h" +#include "res/Object/Htobi3.h" const float daShutter2_c::m_max_speed[1] = {3.0f}; const float daShutter2_c::m_min_speed[1] = {1.0f}; const float daShutter2_c::m_move_len[1] = {350.0f}; const float daShutter2_c::m_width[1] = {500.0f}; const float daShutter2_c::m_height[1] = {400.0f}; -const s16 daShutter2_c::m_bdlidx[1] = {HTOBI3_BDL_HTOBI3}; -const s16 daShutter2_c::m_dzbidx[1] = {HTOBI3_DZB_HTOBI3}; +const s16 daShutter2_c::m_bdlidx[1] = {dRes_INDEX_HTOBI3_BDL_HTOBI3_e}; +const s16 daShutter2_c::m_dzbidx[1] = {dRes_INDEX_HTOBI3_DZB_HTOBI3_e}; const s32 daShutter2_c::m_heapsize[1] = {0x0C00}; const Vec daShutter2_c::m_cull_min[1] = {{-300.0f, -10.0f, -40.0f}}; const Vec daShutter2_c::m_cull_max[1] = {{300.0f, 400.0f, 40.0f}}; diff --git a/src/d/actor/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp index 49a44598e..d2e1d5b0b 100644 --- a/src/d/actor/d_a_sie_flag.cpp +++ b/src/d/actor/d_a_sie_flag.cpp @@ -11,8 +11,8 @@ #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" #include "d/d_s_play.h" -#include "d/res/res_cloth.h" -#include "d/res/res_eshata.h" +#include "res/Object/Cloth.h" +#include "res/Object/Eshata.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" @@ -79,15 +79,15 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_actor) { /* 000001E4-0000030C .text CreateHeap__12daSie_Flag_cFv */ BOOL daSie_Flag_c::CreateHeap() { - J3DModelData *modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, ESHATA_BDL_ESHATA); + J3DModelData *modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_ESHATA_BDL_ESHATA_e); JUT_ASSERT(0x109, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpModel == NULL) { return FALSE; } else { - ResTIMG* eshata_timg = (ResTIMG*)dComIfG_getObjectRes(M_arcname, ESHATA_BTI_ESHATA); - ResTIMG* cloth_timg = (ResTIMG*)dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON); + ResTIMG* eshata_timg = (ResTIMG*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_ESHATA_BTI_ESHATA_e); + ResTIMG* cloth_timg = (ResTIMG*)dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e); mpClothPacket = dCloth_packet_create( eshata_timg, cloth_timg, #if VERSION == VERSION_DEMO diff --git a/src/d/actor/d_a_sk.cpp b/src/d/actor/d_a_sk.cpp index 6b7fa6b8f..f9bdf1cb5 100644 --- a/src/d/actor/d_a_sk.cpp +++ b/src/d/actor/d_a_sk.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_sk.h" -#include "d/res/res_sk.h" +#include "res/Object/Sk.h" #include "m_Do/m_Do_ext.h" #include "d/d_jnt_hit.h" #include "d/d_cc_d.h" @@ -205,7 +205,7 @@ static BOOL daSk_Delete(sk_class* i_this) { /* 0000090C-00000A6C .text useHeapInit__FP10fopAc_ac_c */ static BOOL useHeapInit(fopAc_ac_c* a_this) { sk_class* i_this = (sk_class*)a_this; - J3DModelData* pModelData = (J3DModelData*)dComIfG_getObjectRes("Sk", SK_BDL_TURU_00); + J3DModelData* pModelData = (J3DModelData*)dComIfG_getObjectRes("Sk", dRes_INDEX_SK_BDL_TURU_00_e); i_this->mpMorf = new mDoExt_McaMorf(pModelData, NULL, NULL, NULL, J3DFrameCtrl::EMode_NULL, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000022); if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp index 915752404..a3835a499 100644 --- a/src/d/actor/d_a_sk2.cpp +++ b/src/d/actor/d_a_sk2.cpp @@ -5,15 +5,15 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_sk2.h" -#include "d/res/res_sk2.h" +#include "res/Object/Sk2.h" #include "m_Do/m_Do_ext.h" #include "d/d_bg_w_deform.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "f_op/f_op_actor_mng.h" -static s32 sk2_dzb[] = {SK2_DZB_KSYLF_00, SK2_DZB_KSYLF_01}; -static s32 sk2_bck[] = {SK2_BCK_KSYLF_00, SK2_BCK_KSYLF_01}; +static s32 sk2_dzb[] = {dRes_INDEX_SK2_DZB_KSYLF_00_e, dRes_INDEX_SK2_DZB_KSYLF_01_e}; +static s32 sk2_bck[] = {dRes_INDEX_SK2_BCK_KSYLF_00_e, dRes_INDEX_SK2_BCK_KSYLF_01_e}; /* 00000078-00000194 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode* node, int calcTiming) { @@ -141,9 +141,9 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { J3DModelData* pModelData; if (i_this->m2B4 == 0) { - pModelData = (J3DModelData*)dComIfG_getObjectRes("Sk2", SK2_BDL_KSYLF_00); + pModelData = (J3DModelData*)dComIfG_getObjectRes("Sk2", dRes_INDEX_SK2_BDL_KSYLF_00_e); } else { - pModelData = (J3DModelData*)dComIfG_getObjectRes("Sk2", SK2_BDL_KSYLF_01); + pModelData = (J3DModelData*)dComIfG_getObjectRes("Sk2", dRes_INDEX_SK2_BDL_KSYLF_01_e); } i_this->mpMorf = new mDoExt_McaMorf( diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp index 1862fa60c..2757e1b66 100644 --- a/src/d/actor/d_a_ssk.cpp +++ b/src/d/actor/d_a_ssk.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ssk.h" -#include "d/res/res_ssk.h" +#include "res/Object/Ssk.h" #include "d/d_com_inf_game.h" #include "d/d_jnt_hit.h" #include "f_op/f_op_actor_mng.h" @@ -271,7 +271,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { ssk_class* i_this = (ssk_class*)a_this; i_this->mpMorf1 = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Ssk", SSK_BDL_TURU_02), NULL, NULL, NULL, ~J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000022 + (J3DModelData*)dComIfG_getObjectRes("Ssk", dRes_INDEX_SSK_BDL_TURU_02_e), NULL, NULL, NULL, ~J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000022 ); if (i_this->mpMorf1 == NULL || i_this->mpMorf1->getModel() == NULL) { @@ -279,7 +279,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } i_this->mpMorf2 = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Ssk", SSK_BDL_KTANA_00), + (J3DModelData*)dComIfG_getObjectRes("Ssk", dRes_INDEX_SSK_BDL_KTANA_00_e), NULL, NULL, NULL, DEMO_SELECT(J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_NULL), 1.0f, 0, -1, diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp index c0500d4a6..4ac09bf24 100644 --- a/src/d/actor/d_a_st.cpp +++ b/src/d/actor/d_a_st.cpp @@ -10,7 +10,7 @@ #include "d/d_s_play.h" #include "d/d_cc_d.h" #include "d/d_snap.h" -#include "d/res/res_st.h" +#include "res/Object/St.h" enum BehaviorType { BEHAVIOR_NORMAL = 0, @@ -445,13 +445,13 @@ static BOOL daSt_Draw(st_class* i_this) { static void wait_set(st_class* i_this) { fopAc_ac_c* actor = &i_this->actor; if (i_this->m1DC8 != 0) { - anm_init(i_this, ST_BCK_HYUNHYUN, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_HYUNHYUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m1DC8 = 2; fopAcM_monsSeStart(actor, JA_SE_CV_ST_NUNCHAKU_S, 0); } else if (i_this->m02CC == 0) { - anm_init(i_this, ST_BCK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } else { - anm_init(i_this, ST_BCK_LWAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_LWAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } @@ -459,13 +459,13 @@ static void wait_set(st_class* i_this) { static void walk_set(st_class* i_this, f32 param_2) { fopAc_ac_c* actor = &i_this->actor; if (i_this->m1DC8 != 0) { - anm_init(i_this, ST_BCK_HYUNHYUN, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_HYUNHYUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m1DC8 = 2; fopAcM_monsSeStart(actor, JA_SE_CV_ST_NUNCHAKU_S, 0); } else if (i_this->m02CC == 0) { - anm_init(i_this, ST_BCK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, param_2, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, param_2, -1); } else { - anm_init(i_this, ST_BCK_LWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, param_2, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_LWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, param_2, -1); } } @@ -637,7 +637,7 @@ static void fight(st_class* i_this) { i_this->m0ED1 = 0; switch (i_this->mFightBehavior) { case 0: - attack_set(i_this, ST_BCK_ATTACKR1, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKR1_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; break; case 1: @@ -646,7 +646,7 @@ static void fight(st_class* i_this) { fopAcM_monsSeStart(actor, JA_SE_CV_ST_ATTACK_S, 0); } if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_ATTACKR1_END, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKR1_END_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; } break; @@ -659,7 +659,7 @@ static void fight(st_class* i_this) { } i_this->m0ED1 = 1; if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_OTOTOR, 1.0f, J3DFrameCtrl::EMode_LOOP); + attack_set(i_this, dRes_INDEX_ST_BCK_OTOTOR_e, 1.0f, J3DFrameCtrl::EMode_LOOP); i_this->mFightBehavior++; i_this->mTimers[0] = cM_rndF(50.0f) + 30.0f; } @@ -670,11 +670,11 @@ static void fight(st_class* i_this) { if (i_this->mTimers[0] == 0) { if ((cM_rndF(1.0f) < 0.5f) || (dVar8 < 300.0f)) { if (cM_rndF(1.0f) < 0.5f) { - attack_set(i_this, ST_BCK_ATTACKREND, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKREND_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->m02CC = 1; i_this->mFightBehavior = 0x65; } else { - attack_set(i_this, ST_BCK_ATTACKR2, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKR2_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->m02CC = 0; i_this->mFightBehavior = 100; } @@ -684,7 +684,7 @@ static void fight(st_class* i_this) { } break; case 5: - attack_set(i_this, ST_BCK_ATTACKL1, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKL1_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; break; case 6: @@ -693,7 +693,7 @@ static void fight(st_class* i_this) { fopAcM_monsSeStart(actor, JA_SE_CV_ST_ATTACK_S, 0); } if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_ATTACKL1_END, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKL1_END_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; } break; @@ -706,7 +706,7 @@ static void fight(st_class* i_this) { } i_this->m0ED1 = 1; if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_OTOTOL, 1.0f, J3DFrameCtrl::EMode_LOOP); + attack_set(i_this, dRes_INDEX_ST_BCK_OTOTOL_e, 1.0f, J3DFrameCtrl::EMode_LOOP); i_this->mFightBehavior++; i_this->mTimers[0] = cM_rndF(50.0f) + 30.0f; } @@ -717,11 +717,11 @@ static void fight(st_class* i_this) { if (i_this->mTimers[0] == 0) { if ((cM_rndF(1.0f) < 0.5f) || (dVar8 < 300.0f)) { if (cM_rndF(1.0f) < 0.5f) { - attack_set(i_this, ST_BCK_ATTACKLEND, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKLEND_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->m02CC = 0; i_this->mFightBehavior = 0x65; } else { - attack_set(i_this, ST_BCK_ATTACKL2, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKL2_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->m02CC = 1; i_this->mFightBehavior = 100; } @@ -731,13 +731,13 @@ static void fight(st_class* i_this) { } break; case 10: - attack_set(i_this, ST_BCK_ATTACKR1, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKR1_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; fopAcM_monsSeStart(actor, JA_SE_CV_ST_ATTACK_L, 0); break; case 0xb: if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_KAITENR1, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KAITENR1_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; } break; @@ -759,25 +759,25 @@ static void fight(st_class* i_this) { dVar9 = 0.1f; i_this->m0302 = (s16)(int)((REG0_F(13) + 10000.0f) * cM_ssin(i_this->m02E8 * (REG0_S(8) + 500))); if (((i_this->mTimers[0] == 0) && (-0x400 < i_this->m0304)) && (i_this->m0304 < 0x400)) { - attack_set(i_this, ST_BCK_KAITENR1_END, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KAITENR1_END_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; } break; case 0xe: if ((i_this->mpMorf->isStop()) && (std::fabsf(i_this->m0308) < 0.01f)) { - attack_set(i_this, ST_BCK_OTOTOR, 5.0f, J3DFrameCtrl::EMode_LOOP); + attack_set(i_this, dRes_INDEX_ST_BCK_OTOTOR_e, 5.0f, J3DFrameCtrl::EMode_LOOP); i_this->mTimers[0] = cM_rndF(50.0f) + 30.0f; i_this->mFightBehavior = 3; } break; case 0xf: - attack_set(i_this, ST_BCK_ATTACKL1, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_ATTACKL1_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; fopAcM_monsSeStart(actor, JA_SE_CV_ST_ATTACK_L, 0); break; case 0x10: if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_KAITENL1, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KAITENL1_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; } break; @@ -799,19 +799,19 @@ static void fight(st_class* i_this) { dVar9 = 0.1f; i_this->m0302 = (s16)(int)((REG0_F(13) + 10000.0f) * cM_ssin(i_this->m02E8 * (REG0_S(8) + 500))); if (((i_this->mTimers[0] == 0) && (-0x400 < i_this->m0304)) && (i_this->m0304 < 0x400)) { - attack_set(i_this, ST_BCK_KAITENL1_END, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KAITENL1_END_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; } break; case 0x13: if ((i_this->mpMorf->isStop()) && (std::fabsf(i_this->m0308) < 0.01f)) { - attack_set(i_this, ST_BCK_OTOTOL, 5.0f, J3DFrameCtrl::EMode_LOOP); + attack_set(i_this, dRes_INDEX_ST_BCK_OTOTOL_e, 5.0f, J3DFrameCtrl::EMode_LOOP); i_this->mTimers[0] = cM_rndF(50.0f) + 30.0f; i_this->mFightBehavior = 8; } break; case 0x14: - attack_set(i_this, ST_BCK_KAITENR2, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KAITENR2_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; break; case 0x15: @@ -832,19 +832,19 @@ static void fight(st_class* i_this) { dVar9 = 0.1f; i_this->m0302 = (s16)(int)((REG0_F(13) + 10000.0f) * cM_ssin(i_this->m02E8 * (REG0_S(8) + 500))); if (((i_this->mTimers[0] == 0) && (-0x400 < i_this->m0304)) && (i_this->m0304 < 0x400)) { - attack_set(i_this, ST_BCK_KAITENR2_END, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KAITENR2_END_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; } break; case 0x17: if ((i_this->mpMorf->isStop()) && (std::fabsf(i_this->m0308) < 0.01f)) { - attack_set(i_this, ST_BCK_OTOTOR, 5.0f, J3DFrameCtrl::EMode_LOOP); + attack_set(i_this, dRes_INDEX_ST_BCK_OTOTOR_e, 5.0f, J3DFrameCtrl::EMode_LOOP); i_this->mTimers[0] = cM_rndF(50.0f) + 30.0f; i_this->mFightBehavior = 3; } break; case 0x19: - attack_set(i_this, ST_BCK_KAITENL2, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KAITENL2_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; break; case 0x1a: @@ -866,13 +866,13 @@ static void fight(st_class* i_this) { dVar9 = 0.1f; i_this->m0302 = (s16)(int)((REG0_F(13) + 10000.0f) * cM_ssin(i_this->m02E8 * (REG0_S(8) + 500))); if (((i_this->mTimers[0] == 0) && (-0x400 < i_this->m0304)) && (i_this->m0304 < 0x400)) { - attack_set(i_this, ST_BCK_KAITENL2_END, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KAITENL2_END_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->mFightBehavior++; } break; case 0x1c: if ((i_this->mpMorf->isStop()) && (std::fabsf(i_this->m0308) < 0.01f)) { - attack_set(i_this, ST_BCK_OTOTOL, 5.0f, J3DFrameCtrl::EMode_LOOP); + attack_set(i_this, dRes_INDEX_ST_BCK_OTOTOL_e, 5.0f, J3DFrameCtrl::EMode_LOOP); i_this->mFightBehavior = 8; i_this->mTimers[0] = cM_rndF(50.0f) + 30.0f; } @@ -948,7 +948,7 @@ static void fight2(st_class* i_this) { case 0: i_this->m02F6 = 10; i_this->m0ED0 = 1; - attack_set(i_this, ST_BCK_KYORO, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_KYORO_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->m02C4++; fopAcM_monsSeStart(actor, JA_SE_CV_ST_NO_CLUB, 0); break; @@ -956,7 +956,7 @@ static void fight2(st_class* i_this) { i_this->m02F6 = 10; i_this->m0ED0 = 1; if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_NUKU1, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_NUKU1_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->m02C4++; } break; @@ -964,7 +964,7 @@ static void fight2(st_class* i_this) { i_this->m02F6 = 10; i_this->m0ED0 = 1; if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_NUKU2, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_NUKU2_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->m02C4 = 0x65; i_this->m1DC8 = 1; MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(0x03), *calc_mtx); @@ -975,7 +975,7 @@ static void fight2(st_class* i_this) { break; case 3: i_this->m1DC8 = 3; - attack_set(i_this, ST_BCK_HONE_ATTACK, 3.0f, J3DFrameCtrl::EMode_LOOP); + attack_set(i_this, dRes_INDEX_ST_BCK_HONE_ATTACK_e, 3.0f, J3DFrameCtrl::EMode_LOOP); i_this->m02C4++; i_this->mTimers[0] = (int)cM_rndF(3.0f) * 0x28; fopAcM_monsSeStart(actor, JA_SE_CV_ST_NUNCHAKU_L, 0); @@ -992,7 +992,7 @@ static void fight2(st_class* i_this) { } break; case 0x32: - anm_init(i_this, ST_BCK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m1DC8 = 1; i_this->m02C4++; i_this->mTimers[0] = 0x14; @@ -1000,7 +1000,7 @@ static void fight2(st_class* i_this) { i_this->m02F6 = 10; i_this->m0ED0 = 1; if (i_this->mTimers[0] == 0) { - attack_set(i_this, ST_BCK_TUKERU1, 5.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_TUKERU1_e, 5.0f, J3DFrameCtrl::EMode_NONE); i_this->m02C4++; } break; @@ -1008,7 +1008,7 @@ static void fight2(st_class* i_this) { i_this->m02F6 = 10; i_this->m0ED0 = 1; if (i_this->mpMorf->isStop()) { - attack_set(i_this, ST_BCK_TUKERU2, 1.0f, J3DFrameCtrl::EMode_NONE); + attack_set(i_this, dRes_INDEX_ST_BCK_TUKERU2_e, 1.0f, J3DFrameCtrl::EMode_NONE); i_this->m02C4++; i_this->m1DC8 = 0; } @@ -1018,7 +1018,7 @@ static void fight2(st_class* i_this) { i_this->m0ED0 = 1; if (i_this->mpMorf->isStop()) { i_this->m02C4 = 100; - anm_init(i_this, ST_BCK_FUKKI_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_FUKKI_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } break; case 0x64: @@ -1069,7 +1069,7 @@ static void ground_wait(st_class* i_this) { case 1: i_this->m02B9 = 0; fopAcM_seStart(actor, JA_SE_CM_ST_OUT_OF_GROUND, 0); - anm_init(i_this, ST_BCK_START, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_START_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C4 = 2; actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; fopAcM_OnStatus(actor, fopAcStts_SHOWMAP_e); @@ -1122,9 +1122,9 @@ static void kan_wait(st_class* i_this) { break; case 1: if (i_this->mBehaviorType == BEHAVIOR_IN_HORIZONTAL_COFFIN) { - anm_init(i_this, ST_BCK_YOKO_START, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_YOKO_START_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); } else { - anm_init(i_this, ST_BCK_TATE_START, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_TATE_START_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); } i_this->m02C4 = 2; i_this->m02B9 = 0; @@ -1161,7 +1161,7 @@ static void st_break_wait(st_class* i_this) { i_this->m0ED0 = 1; switch (i_this->m02C4) { case 0: - anm_init(i_this, ST_BCK_FUKKI_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_FUKKI_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02C4 = 1; i_this->mTimers[0] = l_HIO.m1A; i_this->m1DDC = l_HIO.m1A; @@ -1196,7 +1196,7 @@ static void st_break_wait(st_class* i_this) { } break; case 0xA: - anm_init(i_this, ST_BCK_FUKKI_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_FUKKI_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02C4 = 0xb; case 0xB: #if VERSION > VERSION_DEMO @@ -1264,7 +1264,7 @@ static void head_damage(st_class* i_this) { i_this->m0ED0 = 1; switch (i_this->m02C4) { case 0: - anm_init(i_this, ST_BCK_MAHIR, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_MAHIR_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C4 = 1; fopAcM_seStart(actor, JA_SE_CM_ST_TURN_HEAD, 0); break; @@ -1284,7 +1284,7 @@ static void head_damage(st_class* i_this) { } break; case 10: - anm_init(i_this, ST_BCK_MAHI2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_MAHI2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C4 = 11; fopAcM_seStart(actor, JA_SE_CM_ST_TURN_HEAD, 0); break; @@ -1320,12 +1320,12 @@ static void ue_move(st_class* i_this) { #endif switch (i_this->m02C4) { case -1: - anm_init(i_this, ST_BCK_UE_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_UE_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C4 = 1; actor->speed.y = 30.0f; break; case 0: - anm_init(i_this, ST_BCK_UE_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_UE_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C4 = 1; actor->current.angle.y = fopAcM_searchPlayerAngleY(actor) + 0x8000; actor->speed.y = DEMO_SELECT(50.0f, 40.0f); @@ -1334,13 +1334,13 @@ static void ue_move(st_class* i_this) { break; case 1: if (i_this->mAcch.ChkGroundHit()) { - anm_init(i_this, ST_BCK_UE_JUMP2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_UE_JUMP2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C4 = 2; } break; case 2: if (i_this->mpMorf->isStop()) { - anm_init(i_this, ST_BCK_UE_WALK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.2f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_UE_WALK_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.2f, -1); i_this->m02C4 = 3; } break; @@ -1367,7 +1367,7 @@ static void ue_move(st_class* i_this) { i_this->m02C4 = 3; } if (fopAcM_searchPlayerDistance(actor) > 530.0f) { - anm_init(i_this, ST_BCK_UE_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_UE_WAIT_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m02C4 = 5; i_this->mTimers[0] = 10; } @@ -1415,7 +1415,7 @@ static void sita_move(st_class* i_this) { i_this->mTimers[0] = 60; i_this->mTimers[1] = cM_rndF(200.0f) + 350.0f; case 1: - anm_init(i_this, ST_BCK_SITA_WALK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.2f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_SITA_WALK_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.2f, -1); i_this->m02C4 = 2; case 2: i_this->m02C4 = 3; @@ -1430,13 +1430,13 @@ static void sita_move(st_class* i_this) { case 5: i_this->mPlayerPos = player->current.pos; i_this->m02E4 = 0x2000; - anm_init(i_this, ST_BCK_KICK1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_KICK1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C4 = 6; break; case 6: i_this->m02DC = REG8_F(1) + 5.0f; if (i_this->mpMorf->isStop()) { - anm_init(i_this, ST_BCK_KICK2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_KICK2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m02C4 = 7; } break; @@ -1591,7 +1591,7 @@ static void damage_check(st_class* i_this) { || (atInfo.mResultingAttackType == 9 || (atInfo.mResultingAttackType == 2)) #endif ) { - head_anm_init(i_this, ST_BCK_HEADB_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + head_anm_init(i_this, dRes_INDEX_ST_BCK_HEADB_DEAD_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mParts[15].mPartState = 8; #if VERSION > VERSION_DEMO if ((atInfo.mResultingAttackType == 9) && (player->getCutType() != daPy_py_c::CUT_TYPE_HAMMER_SIDESWING)) { @@ -1627,7 +1627,7 @@ static void damage_check(st_class* i_this) { i_this->mParts[15].mWaitTimer = 30; fopAcM_monsSeStart(actor, JA_SE_CV_ST_DIE, 0); } else { - head_anm_init(i_this, ST_BCK_HEADB_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + head_anm_init(i_this, dRes_INDEX_ST_BCK_HEADB_DAMAGE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mParts[15].mPartState = 7; i_this->mParts[15].mWaitTimer = 0x7f; #if VERSION > VERSION_DEMO @@ -1912,7 +1912,7 @@ static void part_move(st_class* i_this, int jointIndex) { this_part->mPartState = 6; this_part->mPartRotAdd.setall(0); i_this->m1DDA = this_part->mPartRot.y; - head_anm_init(i_this, ST_BCK_HEADB_JUMP1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + head_anm_init(i_this, dRes_INDEX_ST_BCK_HEADB_JUMP1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } else { this_part->mPartState = 5; this_part->mPartRotAdd.x = cM_rndFX(6000.0f); @@ -2069,7 +2069,7 @@ static void part_move(st_class* i_this, int jointIndex) { #if VERSION > VERSION_DEMO i_this->m02F8 = 500; #endif - anm_init(i_this, ST_BCK_FUKKI_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_ST_BCK_FUKKI_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } } else { @@ -2102,7 +2102,7 @@ static void part_move(st_class* i_this, int jointIndex) { this_part->mPartPos.y = dVar11; if (this_part->mPartVelocity.y < -10.0f) { this_part->mWaitTimer = cM_rndF(10.0f) + 2.0f; - head_anm_init(i_this, ST_BCK_HEADB_JUMP2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + head_anm_init(i_this, dRes_INDEX_ST_BCK_HEADB_JUMP2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(actor, JA_SE_CM_ST_JUMP_HEAD, 0); } if (this_part->mWaitTimer != 0) { @@ -2115,7 +2115,7 @@ static void part_move(st_class* i_this, int jointIndex) { local_50.y = REG13_F(0) + (cM_rndF(35.0f) + 20.0f); local_50.z = REG13_F(1) + 20.0f; MtxPosition(&local_50, &this_part->mPartVelocity); - head_anm_init(i_this, ST_BCK_HEADB_JUMP1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + head_anm_init(i_this, dRes_INDEX_ST_BCK_HEADB_JUMP1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_monsSeStart(actor, JA_SE_CV_ST_JUMP_HEAD, 0); } } @@ -2147,7 +2147,7 @@ static void part_move(st_class* i_this, int jointIndex) { } this_part->mPartPos.y = dVar11; if ((i_this->mpMorf->isStop()) || (this_part->mPartVelocity.y < -20.0f)) { - head_anm_init(i_this, ST_BCK_HEADB_WAIT, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + head_anm_init(i_this, dRes_INDEX_ST_BCK_HEADB_WAIT_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } this_part->mPartVelocity.setall(0.0f); if (i_this->m1DDC == 0) { @@ -2176,7 +2176,7 @@ static void part_move(st_class* i_this, int jointIndex) { if (this_part->mPartPos.y <= dVar11) { this_part->mPartPos.y = dVar11; if ((i_this->mpMorf->isStop()) || (this_part->mPartVelocity.y < -20.0f)) { - head_anm_init(i_this, ST_BCK_HEADB_WAIT, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + head_anm_init(i_this, dRes_INDEX_ST_BCK_HEADB_WAIT_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } this_part->mPartVelocity.setall(0.0f); } @@ -2653,39 +2653,39 @@ static BOOL daSt_Delete(st_class* i_this) { static BOOL createHeap(fopAc_ac_c* a_this) { static u16 st_part_bdl[] = { 0, - ST_BDL_ST_HARA, - ST_BDL_ST_MUNE, - ST_BDL_ST_KATAL, - ST_BDL_ST_UDEL, - ST_BDL_ST_HANDL, - ST_BDL_ST_YUBI1L, - ST_BDL_ST_YUBI2L, - ST_BDL_ST_KATAR, - ST_BDL_ST_UDER, - ST_BDL_ST_HANDR, - ST_BDL_ST_BUKI, - ST_BDL_ST_YUBI1R, - ST_BDL_ST_YUBI2R, - ST_BDL_ST_KUBI, - ST_BDL_ST_HEAD, - ST_BDL_ST_AGO, - ST_BDL_ST_HAT, + dRes_INDEX_ST_BDL_ST_HARA_e, + dRes_INDEX_ST_BDL_ST_MUNE_e, + dRes_INDEX_ST_BDL_ST_KATAL_e, + dRes_INDEX_ST_BDL_ST_UDEL_e, + dRes_INDEX_ST_BDL_ST_HANDL_e, + dRes_INDEX_ST_BDL_ST_YUBI1L_e, + dRes_INDEX_ST_BDL_ST_YUBI2L_e, + dRes_INDEX_ST_BDL_ST_KATAR_e, + dRes_INDEX_ST_BDL_ST_UDER_e, + dRes_INDEX_ST_BDL_ST_HANDR_e, + dRes_INDEX_ST_BDL_ST_BUKI_e, + dRes_INDEX_ST_BDL_ST_YUBI1R_e, + dRes_INDEX_ST_BDL_ST_YUBI2R_e, + dRes_INDEX_ST_BDL_ST_KUBI_e, + dRes_INDEX_ST_BDL_ST_HEAD_e, + dRes_INDEX_ST_BDL_ST_AGO_e, + dRes_INDEX_ST_BDL_ST_HAT_e, 0, - ST_BDL_ST_KOTUBAN, - ST_BDL_ST_MOMOL, - ST_BDL_ST_SUNEL, - ST_BDL_ST_ASIL, - ST_BDL_ST_MOMOR, - ST_BDL_ST_SUNER, - ST_BDL_ST_ASIR + dRes_INDEX_ST_BDL_ST_KOTUBAN_e, + dRes_INDEX_ST_BDL_ST_MOMOL_e, + dRes_INDEX_ST_BDL_ST_SUNEL_e, + dRes_INDEX_ST_BDL_ST_ASIL_e, + dRes_INDEX_ST_BDL_ST_MOMOR_e, + dRes_INDEX_ST_BDL_ST_SUNER_e, + dRes_INDEX_ST_BDL_ST_ASIR_e }; st_class* i_this = (st_class*)a_this; i_this->mpMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("St", ST_BDL_ST), + (J3DModelData*)dComIfG_getObjectRes("St", dRes_INDEX_ST_BDL_ST_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("St", ST_BCK_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("St", dRes_INDEX_ST_BCK_WAIT_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -2708,10 +2708,10 @@ static BOOL createHeap(fopAc_ac_c* a_this) { } #endif i_this->mpMorf2 = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("St", ST_BDL_HEADB), + (J3DModelData*)dComIfG_getObjectRes("St", dRes_INDEX_ST_BDL_HEADB_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("St", ST_BCK_HEADB_WAIT), + (J3DAnmTransformKey*)dComIfG_getObjectRes("St", dRes_INDEX_ST_BCK_HEADB_WAIT_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index 117713564..5125d9bba 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_stone.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_player.h" -#include "d/res/res_always.h" +#include "res/Object/Always.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -723,8 +723,8 @@ void Act_c::eff_break() { dComIfGp_particle_set(dPa_name::ID_IT_JN_STS_HAHEN, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); - J3DModelData* pJVar1 = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI); - J3DAnmTexPattern* pJVar2 = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI); + J3DModelData* pJVar1 = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPI_KOISHI_e); + J3DAnmTexPattern* pJVar2 = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTP_MPI_KOISHI_e); JPABaseEmitter* pJVar3 = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_IT_JN_M_STS_HAHEN, &sp18); if (pJVar3 != NULL) { diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index 2875986df..5dc641adc 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_stone2.h" #include "d/actor/d_a_player.h" -#include "d/res/res_always.h" +#include "res/Object/Always.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -328,8 +328,8 @@ bool Act_c::damage_bg_proc_directly() { /* 00001214-00001368 .text eff_m_break__Q28daStone25Act_cFUsUs */ void Act_c::eff_m_break(u16 particleID, u16 texAnmFrame) { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI); - J3DAnmTexPattern* texAnm = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPI_KOISHI_e); + J3DAnmTexPattern* texAnm = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTP_MPI_KOISHI_e); cXyz sp18; sp18.setall(attr().m54); diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index c4a8a0fa4..c8026e971 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -102,7 +102,7 @@ s32 daSwhit0_c::getSwNo2() { /* 000000C4-00000230 .text CreateHeap__10daSwhit0_cFv */ BOOL daSwhit0_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_OBM_SYOUGEKISW); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_OBM_SYOUGEKISW_e); JUT_ASSERT(0xD5, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202); @@ -110,12 +110,12 @@ BOOL daSwhit0_c::CreateHeap() { return FALSE; } - J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", ALWAYS_BCK_OBM_SYOUGEKISW); + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BCK_OBM_SYOUGEKISW_e); if (mAnm.init(modelData, anm, true, J3DFrameCtrl::EMode_LOOP) == 0) { return FALSE; } - J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_OBM_SYOUGEKISW); + J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTK_OBM_SYOUGEKISW_e); if (mTexAnm.init(modelData, texAnm, true, J3DFrameCtrl::EMode_LOOP) == 0) { return FALSE; } diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index 108e6b421..e38fcc2fb 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/src/d/actor/d_a_swtact.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swtact.h" -#include "d/res/res_itact.h" +#include "res/Object/Itact.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -31,7 +31,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_ac) { /* 000000CC-00000194 .text CreateHeap__10daSwTact_cFv */ BOOL daSwTact_c::CreateHeap() { - J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, ITACT_BDL_ITACT); + J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_ITACT_BDL_ITACT_e); JUT_ASSERT(0xe1, modelData != NULL); model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); if (model == NULL) diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index 6a965f76d..80d49efd6 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/src/d/actor/d_a_swtdoor.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swtdoor.h" -#include "d/res/res_swtdoor.h" +#include "res/Object/Swtdoor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" @@ -49,7 +49,7 @@ static BOOL daSwtdoor_Delete(swtdoor_class* i_this) { /* 000001F4-00000260 .text useHeapInit__FP10fopAc_ac_c */ static BOOL useHeapInit(fopAc_ac_c* i_ac) { swtdoor_class * i_this = (swtdoor_class *)i_ac; - J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Swtdoor", SWTDOOR_BMD_SWTDOOR); + J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Swtdoor", dRes_INDEX_SWTDOOR_BMD_SWTDOOR_e); i_this->model = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (i_this->model == NULL) return FALSE; diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index 71145224a..33c62260f 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -8,7 +8,7 @@ #include "m_Do/m_Do_ext.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include "d/res/res_syan.h" +#include "res/Object/Syan.h" static f32 b_pos_x[6] = { 870.0f, 420.0f, -420.0f, -880.0f, -400.0f, 440.0f }; static f32 b_pos_y[6] = { -560.0f, -760.0f, -630.0f, -710.0f, -670.0f, -690.0f }; @@ -193,9 +193,9 @@ static BOOL daSyan_Delete(syan_class* i_this) { static BOOL daSyan_solidHeapCB(fopAc_ac_c* i_ac) { syan_class* i_this = (syan_class*)i_ac; i_this->morf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Syan", SYAN_BDL_SYAN), + (J3DModelData*)dComIfG_getObjectRes("Syan", dRes_INDEX_SYAN_BDL_SYAN_e), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes("Syan", SYAN_BCK_SYAN), + (J3DAnmTransform*)dComIfG_getObjectRes("Syan", dRes_INDEX_SYAN_BCK_SYAN_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000002 ); return i_this->morf != NULL; diff --git a/src/d/actor/d_a_tag_light.cpp b/src/d/actor/d_a_tag_light.cpp index a1ed1a4c4..4e5682f4d 100644 --- a/src/d/actor/d_a_tag_light.cpp +++ b/src/d/actor/d_a_tag_light.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_light.h" -#include "d/res/res_mspot.h" +#include "res/Object/Mspot.h" #include "d/d_s_play.h" #include "d/d_kankyo.h" #include "d/d_bg_s_lin_chk.h" @@ -94,11 +94,11 @@ bool Act_c::create_heap() { s16 sVar8; if (ratio < tmp) { - sVar2 = MSPOT_BDL_MSPOCN; - sVar8 = MSPOT_BTK_MSPOCN; + sVar2 = dRes_INDEX_MSPOT_BDL_MSPOCN_e; + sVar8 = dRes_INDEX_MSPOT_BTK_MSPOCN_e; } else { - sVar2 = MSPOT_BDL_MSPOT; - sVar8 = MSPOT_BTK_MSPOT; + sVar2 = dRes_INDEX_MSPOT_BDL_MSPOT_e; + sVar8 = dRes_INDEX_MSPOT_BTK_MSPOT_e; } J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, sVar2)); diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 153f8c0df..8e6396468 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tbox.h" #include "d/d_npc.h" -#include "d/res/res_dalways.h" +#include "res/Object/Dalways.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_s_acch.h" #include "d/d_bg_w.h" @@ -34,36 +34,36 @@ static daTbox_HIO_c l_HIO; static daTbox_c::modelInfo l_modelInfo[] = { { - DALWAYS_BDL_BOXA, - DALWAYS_BCK_BOXOPENSHORTBOX, - DALWAYS_BTK_BOXA, - DALWAYS_BRK_BOXA, - DALWAYS_DZB_BOXB_00, - DALWAYS_DZB_BOXB_01, + dRes_INDEX_DALWAYS_BDL_BOXA_e, + dRes_INDEX_DALWAYS_BCK_BOXOPENSHORTBOX_e, + dRes_INDEX_DALWAYS_BTK_BOXA_e, + dRes_INDEX_DALWAYS_BRK_BOXA_e, + dRes_INDEX_DALWAYS_DZB_BOXB_00_e, + dRes_INDEX_DALWAYS_DZB_BOXB_01_e, }, { - DALWAYS_BDL_BOXB, - DALWAYS_BCK_BOXOPENBOX, - DALWAYS_BTK_BOXB, - DALWAYS_BRK_BOXB, - DALWAYS_DZB_BOXB_00, - DALWAYS_DZB_BOXB_01, + dRes_INDEX_DALWAYS_BDL_BOXB_e, + dRes_INDEX_DALWAYS_BCK_BOXOPENBOX_e, + dRes_INDEX_DALWAYS_BTK_BOXB_e, + dRes_INDEX_DALWAYS_BRK_BOXB_e, + dRes_INDEX_DALWAYS_DZB_BOXB_00_e, + dRes_INDEX_DALWAYS_DZB_BOXB_01_e, }, { - DALWAYS_BDL_BOXC, - DALWAYS_BCK_BOXOPENBOX, - DALWAYS_BTK_BOXC, - DALWAYS_BRK_BOXC, - DALWAYS_DZB_BOXB_00, - DALWAYS_DZB_BOXB_01, + dRes_INDEX_DALWAYS_BDL_BOXC_e, + dRes_INDEX_DALWAYS_BCK_BOXOPENBOX_e, + dRes_INDEX_DALWAYS_BTK_BOXC_e, + dRes_INDEX_DALWAYS_BRK_BOXC_e, + dRes_INDEX_DALWAYS_DZB_BOXB_00_e, + dRes_INDEX_DALWAYS_DZB_BOXB_01_e, }, { - DALWAYS_BDL_BOXD, - DALWAYS_BCK_BOXOPENBOX, + dRes_INDEX_DALWAYS_BDL_BOXD_e, + dRes_INDEX_DALWAYS_BCK_BOXOPENBOX_e, -1, -1, - DALWAYS_DZB_BOXD_00, - DALWAYS_DZB_BOXD_01, + dRes_INDEX_DALWAYS_DZB_BOXD_00_e, + dRes_INDEX_DALWAYS_DZB_BOXD_01_e, } }; @@ -130,7 +130,7 @@ cPhs_State daTbox_c::commonShapeSet() { // Set up Triforce platform for the type that spawns via Wind Waker song if (getFuncType() == FUNC_TYPE_TACT) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", DALWAYS_BDL_YTRIF00); + modelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BDL_YTRIF00_e); JUT_ASSERT(0xE2, modelData); mpTactPlatformMdl = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000000); @@ -138,7 +138,7 @@ cPhs_State daTbox_c::commonShapeSet() { return cPhs_ERROR_e; } - J3DAnmTevRegKey* tactPlatformBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BRK_YTRIF00); + J3DAnmTevRegKey* tactPlatformBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BRK_YTRIF00_e); if (mTactPlatformBrk.init(modelData, tactPlatformBrk, true, J3DFrameCtrl::EMode_NONE) == 0) { return cPhs_ERROR_e; } @@ -162,7 +162,7 @@ cPhs_State daTbox_c::commonShapeSet() { /* 00000598-00000764 .text effectShapeSet__8daTbox_cFv */ cPhs_State daTbox_c::effectShapeSet() { - J3DModelData* flashModelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", DALWAYS_BDL_IT_TAKARA_FLASH); + J3DModelData* flashModelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BDL_IT_TAKARA_FLASH_e); JUT_ASSERT(0x117, flashModelData != NULL); mpFlashMdl = mDoExt_J3DModel__create(flashModelData, 0x80000, 0x1000200); @@ -170,17 +170,17 @@ cPhs_State daTbox_c::effectShapeSet() { return cPhs_ERROR_e; } - J3DAnmTransform* flashAnm = (J3DAnmTransform*)dComIfG_getObjectRes("Dalways", DALWAYS_BCK_IT_TAKARA_FLASH2); + J3DAnmTransform* flashAnm = (J3DAnmTransform*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BCK_IT_TAKARA_FLASH2_e); if (mFlashAnm.init(flashModelData, flashAnm, true, J3DFrameCtrl::EMode_NONE) == 0) { return cPhs_ERROR_e; } - J3DAnmTextureSRTKey* flashTexAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BTK_IT_TAKARA_FLASH); + J3DAnmTextureSRTKey* flashTexAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BTK_IT_TAKARA_FLASH_e); if (mFlashTexAnm.init(flashModelData, flashTexAnm, true, J3DFrameCtrl::EMode_NONE) == 0) { return cPhs_ERROR_e; } - J3DAnmTevRegKey* flashRegAnm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BRK_IT_TAKARA_FLASH); + J3DAnmTevRegKey* flashRegAnm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BRK_IT_TAKARA_FLASH_e); int regInit = mFlashRegAnm.init(flashModelData, flashRegAnm, true, J3DFrameCtrl::EMode_NONE); if (regInit) { @@ -250,7 +250,7 @@ cPhs_State daTbox_c::bgCheckSet() { } if (getFuncType() == FUNC_TYPE_SWITCH_VISIBLE) { - bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", DALWAYS_DZB_KINB_00); + bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_DZB_KINB_00_e); JUT_ASSERT(0x1B9, bgd != NULL); mpBgWVines = new dBgW(); diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 10d7ae131..1a938e4c3 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -16,13 +16,13 @@ #include "stdio.h" #if VERSION <= VERSION_JPN -#include "d/res/res_tlogo.h" +#include "res/Object/Tlogo.h" #endif #if VERSION == VERSION_USA -#include "d/res/res_tlogoe.h" +#include "res/Object/TlogoE.h" #endif #if VERSION == VERSION_PAL -#include "d/res/res_tlogoe0.h" +#include "res/Object/TlogoE0.h" #endif // Note: For VERSION_PAL the "TlogoE0" string literal is modified at runtime. @@ -80,31 +80,31 @@ namespace { void daTitle_proc_c::proc_init3D() { m_solid_heap = mDoExt_createSolidHeapFromGameToCurrent(0x40000U, 0x20); - J3DModelData* modelData_ship = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_TITLE_SHIP, TLOGO_BDL_TITLE_SHIP, TLOGOE_BDL_TITLE_SHIP, TLOGOE0_BDL_TITLE_SHIP)); + J3DModelData* modelData_ship = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BDL_TITLE_SHIP_e, dRes_INDEX_TLOGO_BDL_TITLE_SHIP_e, dRes_INDEX_TLOGOE_BDL_TITLE_SHIP_e, dRes_INDEX_TLOGOE0_BDL_TITLE_SHIP_e)); JUT_ASSERT(VERSION_SELECT(0xD1, 0xD1, 0xFC, 0xFC), modelData_ship != NULL); mModel_ship = mDoExt_J3DModel__create(modelData_ship, 0x80000U, 0x37441423U); JUT_ASSERT(VERSION_SELECT(0xD6, 0xD6, 0x101, 0x101), mModel_ship != NULL); - J3DModelData* modelData_sub = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_SUBTITLE_START_ANIM, TLOGO_BDL_SUBTITLE_START_ANIM, TLOGOE_BDL_SUBTITLE_START_ANIM_E, TLOGOE0_BDL_SUBTITLE_START_ANIM_E)); + J3DModelData* modelData_sub = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BDL_SUBTITLE_START_ANIM_e, dRes_INDEX_TLOGO_BDL_SUBTITLE_START_ANIM_e, dRes_INDEX_TLOGOE_BDL_SUBTITLE_START_ANIM_E_e, dRes_INDEX_TLOGOE0_BDL_SUBTITLE_START_ANIM_E_e)); JUT_ASSERT(VERSION_SELECT(0xDA, 0xDA, 0x105, 0x105), modelData_sub != NULL); mModel_subtitle = mDoExt_J3DModel__create(modelData_sub, 0x80000U, 0x37441422U); JUT_ASSERT(VERSION_SELECT(0xDF, 0xDF, 0x10A, 0x10A), mModel_subtitle != NULL); - J3DModelData* modelData_kirari = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_SUBTITLE_KIRARI, TLOGO_BDL_SUBTITLE_KIRARI, TLOGOE_BDL_SUBTITLE_KIRARI_E, TLOGOE0_BDL_SUBTITLE_KIRARI_E)); + J3DModelData* modelData_kirari = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BDL_SUBTITLE_KIRARI_e, dRes_INDEX_TLOGO_BDL_SUBTITLE_KIRARI_e, dRes_INDEX_TLOGOE_BDL_SUBTITLE_KIRARI_E_e, dRes_INDEX_TLOGOE0_BDL_SUBTITLE_KIRARI_E_e)); JUT_ASSERT(VERSION_SELECT(0xE3, 0xE3, 0x10E, 0x10E), modelData_kirari != NULL); mModel_kirari = mDoExt_J3DModel__create(modelData_kirari, 0x80000U, 0x37441422U); JUT_ASSERT(VERSION_SELECT(0xE8, 0xE8, 0x113, 0x113), mModel_kirari != NULL); - J3DAnmTransform* bck_ship = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BCK_TITLE_SHIP, TLOGO_BCK_TITLE_SHIP, TLOGOE_BCK_TITLE_SHIP, TLOGOE0_BCK_TITLE_SHIP))); + J3DAnmTransform* bck_ship = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BCK_TITLE_SHIP_e, dRes_INDEX_TLOGO_BCK_TITLE_SHIP_e, dRes_INDEX_TLOGOE_BCK_TITLE_SHIP_e, dRes_INDEX_TLOGOE0_BCK_TITLE_SHIP_e))); JUT_ASSERT(VERSION_SELECT(0xED, 0xED, 0x118, 0x118), bck_ship != NULL); BOOL ok_bck = mBckShip.init(modelData_ship, bck_ship, TRUE, J3DFrameCtrl::EMode_LOOP); JUT_ASSERT(VERSION_SELECT(0xF4, 0xF4, 0x11F, 0x11F), ok_bck != FALSE); - J3DAnmColor* bpk_ship = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BPK_TITLE_SHIP, TLOGO_BPK_TITLE_SHIP, TLOGOE_BPK_TITLE_SHIP, TLOGOE0_BPK_TITLE_SHIP))); + J3DAnmColor* bpk_ship = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BPK_TITLE_SHIP_e, dRes_INDEX_TLOGO_BPK_TITLE_SHIP_e, dRes_INDEX_TLOGOE_BPK_TITLE_SHIP_e, dRes_INDEX_TLOGOE0_BPK_TITLE_SHIP_e))); JUT_ASSERT(VERSION_SELECT(0xF9, 0xF9, 0x124, 0x124), bpk_ship != NULL); BOOL ok_bpk = mBpkShip.init(modelData_ship, bpk_ship, TRUE, J3DFrameCtrl::EMode_LOOP); @@ -113,13 +113,13 @@ void daTitle_proc_c::proc_init3D() { mBpkShip.setFrame(0.0f); mBpkShip.setPlaySpeed(1.0f); - J3DAnmTextureSRTKey* btk_sub = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_START_ANIM, TLOGO_BTK_SUBTITLE_START_ANIM, TLOGOE_BTK_SUBTITLE_START_ANIM_E, TLOGOE0_BTK_SUBTITLE_START_ANIM_E))); + J3DAnmTextureSRTKey* btk_sub = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BTK_SUBTITLE_START_ANIM_e, dRes_INDEX_TLOGO_BTK_SUBTITLE_START_ANIM_e, dRes_INDEX_TLOGOE_BTK_SUBTITLE_START_ANIM_E_e, dRes_INDEX_TLOGOE0_BTK_SUBTITLE_START_ANIM_E_e))); JUT_ASSERT(VERSION_SELECT(0x106, 0x106, 0x131, 0x131), btk_sub != NULL); BOOL ok_btk_subtitle = mBtkSub.init(modelData_sub, btk_sub, TRUE, J3DFrameCtrl::EMode_NONE); JUT_ASSERT(VERSION_SELECT(0x10D, 0x10D, 0x138, 0x138), ok_btk_subtitle != FALSE); - J3DAnmTextureSRTKey* btk_kirari = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_KIRARI, TLOGO_BTK_SUBTITLE_KIRARI, TLOGOE_BTK_SUBTITLE_KIRARI_E, TLOGOE0_BTK_SUBTITLE_KIRARI_E))); + J3DAnmTextureSRTKey* btk_kirari = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BTK_SUBTITLE_KIRARI_e, dRes_INDEX_TLOGO_BTK_SUBTITLE_KIRARI_e, dRes_INDEX_TLOGOE_BTK_SUBTITLE_KIRARI_E_e, dRes_INDEX_TLOGOE0_BTK_SUBTITLE_KIRARI_E_e))); JUT_ASSERT(VERSION_SELECT(0x112, 0x112, 0x13D, 0x13D), btk_kirari != NULL); BOOL ok_btk_kirari = mBtkKirari.init(modelData_kirari, btk_kirari, TRUE, J3DFrameCtrl::EMode_LOOP); diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index 69dbc0ee5..4641bff1f 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -19,7 +19,7 @@ #include "m_Do/m_Do_ext.h" #include "d/d_cc_d.h" #include "d/d_material.h" -#include "d/res/res_tn.h" +#include "res/Object/Tn.h" #include "JSystem/JUtility/JUTReport.h" enum Action { @@ -850,29 +850,29 @@ static BOOL daTn_player_way_check(tn_class* i_this) { /* 000035DC-00003664 .text wait_set__FP8tn_class */ static void wait_set(tn_class* i_this) { - anm_init(i_this, TN_BCK_AKYORO1, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); - yoroi_anm_init(i_this, TN_BCK_YKYORO1, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AKYORO1_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKYORO1_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); i_this->mCountDownTimers[1] = cM_rndF(30.0f) + 50.0f; } /* 00003664-000036CC .text walk_set__FP8tn_class */ static void walk_set(tn_class* i_this) { - anm_init(i_this, TN_BCK_AWALK1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_AWALK1); - yoroi_anm_init(i_this, TN_BCK_YWALK1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AWALK1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_AWALK1_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YWALK1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); } /* 000036CC-0000379C .text fight_run_set__FP8tn_class */ static void fight_run_set(tn_class* i_this) { if (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR) { - anm_init(i_this, TN_BCK_AWALK1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.5f, TN_BAS_AWALK1); - yoroi_anm_init(i_this, TN_BCK_YWALK1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.5f); + anm_init(i_this, dRes_INDEX_TN_BCK_AWALK1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.5f, dRes_INDEX_TN_BAS_AWALK1_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YWALK1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.5f); } else { if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_BRUN1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_BRUN1); + anm_init(i_this, dRes_INDEX_TN_BCK_BRUN1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_BRUN1_e); } else { - anm_init(i_this, TN_BCK_BRUN2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_BRUN2); + anm_init(i_this, dRes_INDEX_TN_BCK_BRUN2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_BRUN2_e); } - yoroi_anm_init(i_this, TN_BCK_YKIHON1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIHON1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); } } @@ -1127,8 +1127,8 @@ static void fight_run(tn_class* i_this) { switch (i_this->mDamageReaction.mMode) { case -10: if (i_this->mCountDownTimers[4] == 0) { - anm_init(i_this, TN_BCK_AKIDUKU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); - yoroi_anm_init(i_this, TN_BCK_YKIDUKU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AKIDUKU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIDUKU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->mDamageReaction.mMode = -9; } else { i_this->mDamageReaction.mMode = 0; @@ -1173,9 +1173,9 @@ static void fight_run(tn_class* i_this) { case 2: if (std::fabsf(stickPosX) > 0.1f) { if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_ASURI_LR1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_ASURI_LR1); + anm_init(i_this, dRes_INDEX_TN_BCK_ASURI_LR1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_ASURI_LR1_e); } else { - anm_init(i_this, TN_BCK_BSURI_SLR1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_BSURI_SLR1); + anm_init(i_this, dRes_INDEX_TN_BCK_BSURI_SLR1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_BSURI_SLR1_e); } if (stickPosX > 0.0f) { i_this->mDamageReaction.mMode = 5; @@ -1184,9 +1184,9 @@ static void fight_run(tn_class* i_this) { } } else { if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_ASURI_FB1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_ASURI_FB1); + anm_init(i_this, dRes_INDEX_TN_BCK_ASURI_FB1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_ASURI_FB1_e); } else { - anm_init(i_this, TN_BCK_BSURI_SFB1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_BSURI_SFB1); + anm_init(i_this, dRes_INDEX_TN_BCK_BSURI_SFB1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_BSURI_SFB1_e); } if (i_this->mPlayerDistance < l_tnHIO.m030) { i_this->mDamageReaction.mMode = 4; @@ -1210,7 +1210,7 @@ static void fight_run(tn_class* i_this) { } } else { i_this->mDamageReaction.mMode = 3; - anm_init(i_this, TN_BCK_AWALK1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_AWALK1); + anm_init(i_this, dRes_INDEX_TN_BCK_AWALK1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_AWALK1_e); } break; case 5: @@ -1291,9 +1291,9 @@ static void fight_run(tn_class* i_this) { i_this->mDamageReaction.mMode = -0x14; i_this->m03F0 = 10; if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_BBACK1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BBACK1); + anm_init(i_this, dRes_INDEX_TN_BCK_BBACK1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BBACK1_e); } else { - anm_init(i_this, TN_BCK_BBACK_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BBACK_S1); + anm_init(i_this, dRes_INDEX_TN_BCK_BBACK_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BBACK_S1_e); } actor->speedF = REG0_F(3) + -60.0f; actor->speed.y = REG0_F(4) + 80.0f; @@ -1447,11 +1447,11 @@ static void fight(tn_class* i_this) { if (i_this->mpBodyMorf->isStop()) { if (cM_rndF(1.0f) < 0.5f) { if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_BAT_JUMP1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BAT_JUMP1); + anm_init(i_this, dRes_INDEX_TN_BCK_BAT_JUMP1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BAT_JUMP1_e); i_this->m0C48 = 4; fopAcM_monsSeStart(actor, JA_SE_CV_TN_JUMP, 0); } else { - anm_init(i_this, TN_BCK_BAT_KERI1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BAT_KERI1); + anm_init(i_this, dRes_INDEX_TN_BCK_BAT_KERI1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BAT_KERI1_e); i_this->m0C48 = 3; i_this->m0C67 = 1; } @@ -1471,29 +1471,29 @@ static void fight(tn_class* i_this) { if (i_this->m0C34 != 0) { if (cM_rndF(100.0f) < l_tnHIO.m078) { if (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR) { - anm_init(i_this, TN_BCK_AAT_TATE1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_AAT_TATE1); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_TATE1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_AAT_TATE1_e); } else { - anm_init(i_this, TN_BCK_BAT_TATE1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BAT_TATE1); + anm_init(i_this, dRes_INDEX_TN_BCK_BAT_TATE1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BAT_TATE1_e); } - yoroi_anm_init(i_this, TN_BCK_YAT_TATE1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YAT_TATE1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->m0C48 = 0; } else { if (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR) { - anm_init(i_this, TN_BCK_AAT_YOKO1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_AAT_YOKO1); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_YOKO1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_AAT_YOKO1_e); } else { - anm_init(i_this, TN_BCK_BAT_YOKO1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BAT_YOKO1); + anm_init(i_this, dRes_INDEX_TN_BCK_BAT_YOKO1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BAT_YOKO1_e); } - yoroi_anm_init(i_this, TN_BCK_YAT_YOKO1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YAT_YOKO1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->m0C48 = 1; fopAcM_monsSeStart(actor, JA_SE_CV_TN_KAMAE_S, 0); } } else { if (cM_rndF(100.0f) < l_tnHIO.m07C || (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR)) { - anm_init(i_this, TN_BCK_BAT_SYOUTEI_S1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BAT_SYOUTEI_S1); + anm_init(i_this, dRes_INDEX_TN_BCK_BAT_SYOUTEI_S1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BAT_SYOUTEI_S1_e); i_this->m0C48 = 2; fopAcM_monsSeStart(actor, JA_SE_CV_TN_PUNCH_S, 0); } else { - anm_init(i_this, TN_BCK_BAT_KERI1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BAT_KERI1); + anm_init(i_this, dRes_INDEX_TN_BCK_BAT_KERI1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BAT_KERI1_e); i_this->m0C48 = 3; fopAcM_monsSeStart(actor, JA_SE_CV_TN_KICK, 0); } @@ -1579,8 +1579,8 @@ static void fight(tn_class* i_this) { i_this->mpBodyMorf->setPlaySpeed(-1.0f); i_this->m0C66 = -1; i_this->mpBodyMorf->play(&actor->eyePos, 0, 0); - anm_init(i_this, TN_BCK_AHAJIKI1, REG0_F(4) + 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_AHAJIKI1); - yoroi_anm_init(i_this, TN_BCK_YHAJIKI1, REG0_F(4) + 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AHAJIKI1_e, REG0_F(4) + 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_AHAJIKI1_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YHAJIKI1_e, REG0_F(4) + 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); } if (i_this->mpBodyMorf->getFrame() < 10.0f) { i_this->mDamageReaction.m4D0 = i_this->mTargetAngle; @@ -1597,7 +1597,7 @@ static void fight(tn_class* i_this) { fopAcM_monsSeStart(actor, JA_SE_CV_TN_KAMAE_L, 0); case 12: if (std::fabsf(f31) > 0.1f) { - anm_init(i_this, TN_BCK_AAT_KAITEN_LR1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_AAT_KAITEN_LR1); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_KAITEN_LR1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_AAT_KAITEN_LR1_e); if (f31 > 0.0f) { i_this->mDamageReaction.mMode = 0xf; } else { @@ -1605,7 +1605,7 @@ static void fight(tn_class* i_this) { } } else { if ((i_this->mPlayerDistance < l_tnHIO.m030 + 25.0f) && (i_this->mPlayerDistance > l_tnHIO.m030 - 25.0f)) { - anm_init(i_this, TN_BCK_AAT_KAITEN1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_KAITEN1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mDamageReaction.mMode = 0x12; } else { if (i_this->mPlayerDistance < l_tnHIO.m030) { @@ -1613,10 +1613,10 @@ static void fight(tn_class* i_this) { } else { i_this->mDamageReaction.mMode = 0xd; } - anm_init(i_this, TN_BCK_AAT_KAITEN_FB1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_AAT_KAITEN_FB1); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_KAITEN_FB1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_AAT_KAITEN_FB1_e); } } - yoroi_anm_init(i_this, TN_BCK_YAT_KAITEN1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YAT_KAITEN1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); i_this->mCountDownTimers[1] = cM_rndF(20.0f) + 20.0f; case 13: cLib_addCalc2(&actor->speedF, l_tnHIO.m05C, 1.0f, 20.0f); @@ -1644,8 +1644,8 @@ static void fight(tn_class* i_this) { if (r27) { r29 = false; i_this->mDamageReaction.mMode = 0x14; - anm_init(i_this, TN_BCK_AAT_KAITEN2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_AAT_KAITEN2); - yoroi_anm_init(i_this, TN_BCK_YAT_KAITEN2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_KAITEN2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_AAT_KAITEN2_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YAT_KAITEN2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); fopAcM_monsSeStart(actor, JA_SE_CV_TN_ATTACK_L, 0); } break; @@ -1654,8 +1654,8 @@ static void fight(tn_class* i_this) { break; } i_this->mDamageReaction.mMode = 0x15; - anm_init(i_this, TN_BCK_AAT_KAITEN3, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, TN_BAS_AAT_KAITEN3); - yoroi_anm_init(i_this, TN_BCK_YAT_KAITEN3, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_KAITEN3_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_TN_BAS_AAT_KAITEN3_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YAT_KAITEN3_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); i_this->m14F4 = 1; case 21: actor->speedF = 0.0f; @@ -1667,8 +1667,8 @@ static void fight(tn_class* i_this) { wepon_hit_check(i_this); if (!r27) { i_this->mDamageReaction.mMode = 0x16; - anm_init(i_this, TN_BCK_AAT_KAITEN4, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_AAT_KAITEN4); - yoroi_anm_init(i_this, TN_BCK_YAT_KAITEN4, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_KAITEN4_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_AAT_KAITEN4_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YAT_KAITEN4_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); fopAcM_monsSeStart(actor, JA_SE_CV_TN_ATTACK_L, 0); } if (i_this->mMantPcId != 0xFFFF) { @@ -1717,8 +1717,8 @@ static void p_lost(tn_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, TN_BCK_AKYORO1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); - yoroi_anm_init(i_this, TN_BCK_YKYORO1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AKYORO1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKYORO1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); actor->speedF = 0.0f; break; case 1: @@ -1764,8 +1764,8 @@ static void wepon_search(tn_class* i_this) { case -1: i_this->mDamageReaction.mMode = 0; i_this->m13FF = 0; - anm_init(i_this, TN_BCK_AKIDUKU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); - yoroi_anm_init(i_this, TN_BCK_YKIDUKU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AKIDUKU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIDUKU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); if (f31 < 900.0f) { i_this->mCountDownTimers[1] = 20; } else { @@ -1789,7 +1789,7 @@ static void wepon_search(tn_class* i_this) { cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 4, 0x1000); if (f31 < REG8_F(2) + 150.0f) { i_this->mDamageReaction.mMode = 2; - anm_init(i_this, TN_BCK_BHIROU_K1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BHIROU_K1); + anm_init(i_this, dRes_INDEX_TN_BCK_BHIROU_K1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BHIROU_K1_e); i_this->mCountDownTimers[1] = 29; } else if (i_this->m03EA == 0) { i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN; @@ -1849,7 +1849,7 @@ static void b_nige(tn_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, TN_BCK_AKIDUKU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKIDUKU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_monsSeStart(actor, JA_SE_CV_TN_FOUND, 0); i_this->mCountDownTimers[1] = 10; case 1: @@ -1858,9 +1858,9 @@ static void b_nige(tn_class* i_this) { if (i_this->mCountDownTimers[1] == 0) { i_this->mDamageReaction.mMode = 2; if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_BBACK1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BBACK1); + anm_init(i_this, dRes_INDEX_TN_BCK_BBACK1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BBACK1_e); } else { - anm_init(i_this, TN_BCK_BBACK_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BBACK_S1); + anm_init(i_this, dRes_INDEX_TN_BCK_BBACK_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BBACK_S1_e); } actor->speedF = REG0_F(3) + -60.0f; actor->speed.y = REG0_F(4) + 80.0f; @@ -1874,9 +1874,9 @@ static void b_nige(tn_class* i_this) { if (std::sqrtf(SQUARE(local_14.x) + SQUARE(local_14.z)) > 800.0f) { i_this->mDamageReaction.mMode = 4; if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_AKAMAE1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKAMAE1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } else { - anm_init(i_this, TN_BCK_BKAMAE_S1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_BKAMAE_S1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } else { i_this->mDamageReaction.mMode = 3; @@ -1891,9 +1891,9 @@ static void b_nige(tn_class* i_this) { if (std::sqrtf(SQUARE(local_14.x) + SQUARE(local_14.z)) > 800.0f) { i_this->mDamageReaction.mMode = 4; if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_AKAMAE1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKAMAE1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } else { - anm_init(i_this, TN_BCK_BKAMAE_S1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_BKAMAE_S1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } break; @@ -1921,13 +1921,13 @@ static void defence(tn_class* i_this) { case 0: i_this->mDamageReaction.mMode = 1; if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_AGUARD1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); - tate_anm_init(i_this, TN_BCK_AGUARD1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AGUARD1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + tate_anm_init(i_this, dRes_INDEX_TN_BCK_AGUARD1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); } else { - anm_init(i_this, TN_BCK_AGUARD2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); - tate_anm_init(i_this, TN_BCK_AGUARD2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AGUARD2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + tate_anm_init(i_this, dRes_INDEX_TN_BCK_AGUARD2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); } - yoroi_anm_init(i_this, TN_BCK_YGUARD1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YGUARD1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); // Fall-through case 1: actor->speedF = 0.0f; @@ -1936,7 +1936,7 @@ static void defence(tn_class* i_this) { i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN; i_this->mCountDownTimers[1] = 0; i_this->mDamageReaction.mMode = 0; - tate_anm_init(i_this, TN_BCK_ATATE_ON1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + tate_anm_init(i_this, dRes_INDEX_TN_BCK_ATATE_ON1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); } break; } @@ -1957,13 +1957,13 @@ static void hukki(tn_class* i_this) { i_this->m03F0 = 2; switch (i_this->mDamageReaction.mMode) { case 10: - anm_init(i_this, TN_BCK_BOKIRU_A1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BOKIRU_A1); - yoroi_anm_init(i_this, TN_BCK_YKIHON1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_BOKIRU_A1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BOKIRU_A1_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIHON1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->mCountDownTimers[2] = 15; goto temp_124; case 12: - anm_init(i_this, TN_BCK_BOKIRU_U1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BOKIRU_U1); - yoroi_anm_init(i_this, TN_BCK_YKIHON1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_BOKIRU_U1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_BOKIRU_U1_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIHON1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->mCountDownTimers[2] = REG0_S(5) + 15; temp_124: actor->speedF = 0.0f; @@ -2122,8 +2122,8 @@ static void d_mahi(tn_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, TN_BCK_AMAHI1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); - yoroi_anm_init(i_this, TN_BCK_YMAHI1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AMAHI1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YMAHI1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->mCountDownTimers[0] = 60; // Fall-through case 1: @@ -2152,8 +2152,8 @@ static void d_sit(tn_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, TN_BCK_AHAZURE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_AHAZURE1); - yoroi_anm_init(i_this, TN_BCK_YHAZURE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AHAZURE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_AHAZURE1_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YHAZURE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); // Fall-through case 1: actor->speedF = 0.0f; @@ -2167,8 +2167,8 @@ static void d_sit(tn_class* i_this) { break; case 10: i_this->mDamageReaction.mMode = 0xb; - anm_init(i_this, TN_BCK_AKYORO1, 5.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, -1); - yoroi_anm_init(i_this, TN_BCK_YKYORO1, 5.0f, J3DFrameCtrl::EMode_LOOP, 2.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AKYORO1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, -1); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKYORO1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 2.0f); i_this->mCountDownTimers[0] = 55; // Fall-through case 11: @@ -2200,11 +2200,11 @@ static void stand(tn_class* i_this) { case 0: i_this->mDamageReaction.mMode = 1; if (i_this->m0C34 != 0) { - anm_init(i_this, TN_BCK_ANIOU1, i_this->m151C, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_ANIOU1_e, i_this->m151C, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } else { - anm_init(i_this, TN_BCK_AWAIT1, i_this->m151C, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AWAIT1_e, i_this->m151C, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } - yoroi_anm_init(i_this, TN_BCK_YKIHON1, i_this->m151C, J3DFrameCtrl::EMode_NONE, 1.0f); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIHON1_e, i_this->m151C, J3DFrameCtrl::EMode_NONE, 1.0f); // Fall-through case 1: cLib_addCalc2(&actor->current.pos.x, actor->home.pos.x, 0.5f, actor->speed.x * 0.25f); @@ -2214,10 +2214,10 @@ static void stand(tn_class* i_this) { break; case 10: if (i_this->mCountDownTimers[1] == 30) { - anm_init(i_this, TN_BCK_AKIDUKU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKIDUKU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } if (i_this->mCountDownTimers[1] == 0) { - anm_init(i_this, TN_BCK_AKYORO1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKYORO1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamageReaction.mMode = 0xb; i_this->mCountDownTimers[3] = cM_rndF(30.0f) + 30.0f; } @@ -2239,7 +2239,7 @@ static void stand(tn_class* i_this) { i_this->mDamageReaction.mMode = 0; return; case 50: - anm_init(i_this, TN_BCK_AKYORO1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKYORO1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamageReaction.mMode++; i_this->mCountDownTimers[1] = 50; // Fall-through @@ -2280,7 +2280,7 @@ static void stand(tn_class* i_this) { i_this->mDamageReaction.mMode = 0; } else { i_this->mDamageReaction.mMode = 0x14; - anm_init(i_this, TN_BCK_AKIDUKU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKIDUKU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mCountDownTimers[1] = 30; fopAcM_monsSeStart(actor, JA_SE_CV_TN_FOUND, 0); } @@ -2309,13 +2309,13 @@ static void d_dozou(tn_class* i_this) { i_this->mDamageReaction.mMode = 1; i_this->mDamageReaction.mStts.Init(0xFF, 0xFF, actor); if (i_this->mRangeOrFrozenAnim == 0) { - anm_init(i_this, TN_BCK_AKYORO1, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKYORO1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); i_this->mpBodyMorf->setFrame(41.0f); } else { - anm_init(i_this, TN_BCK_AAT_YOKO1, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, TN_BAS_AAT_YOKO1); + anm_init(i_this, dRes_INDEX_TN_BCK_AAT_YOKO1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, dRes_INDEX_TN_BAS_AAT_YOKO1_e); i_this->mpBodyMorf->setFrame(27.0f); } - yoroi_anm_init(i_this, TN_BCK_YKIHON1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIHON1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f); // Fall-through case 1: if ((i_this->mEnableSpawnSwitch != 0xFF && dComIfGs_isSwitch(i_this->mEnableSpawnSwitch, fopAcM_GetRoomNo(actor))) || @@ -2348,13 +2348,13 @@ static void s_demo(tn_class* i_this) { switch (i_this->mDamageReaction.mMode) { case 0: i_this->mDamageReaction.mMode = 1; - anm_init(i_this, TN_BCK_ANIOU1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); - yoroi_anm_init(i_this, TN_BCK_YKIHON1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_ANIOU1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIHON1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f); case 1: if ((DEMO_SELECT(REG17_S(0), REG0_S(0)) != 0) || (dComIfGs_isSwitch(i_this->mEnableSpawnSwitch, fopAcM_GetRoomNo(actor)))) { mDoAud_bgmAllMute(30); - anm_init(i_this, TN_BCK_S_DEMO_M1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_S_DEMO_M1); - yoroi_anm_init(i_this, TN_BCK_S_DEMO_Y1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_S_DEMO_M1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_TN_BAS_S_DEMO_M1_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_S_DEMO_Y1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->mDamageReaction.mMode = 2; } break; @@ -2431,9 +2431,9 @@ static void s_demo(tn_class* i_this) { #else s_check++; #endif - anm_init(i_this, TN_BCK_S_DEMO_M2, 3.0f, J3DFrameCtrl::EMode_NONE, 0.0f, TN_BAS_S_DEMO_M2); - yoroi_anm_init(i_this, TN_BCK_S_DEMO_Y2, 3.0f, J3DFrameCtrl::EMode_NONE, 0.0f); - tate_anm_init(i_this, DEMO_SELECT(TN_BCK_ATATE_ON1, TN_BCK_S_DEMO_M2), 3.0f, J3DFrameCtrl::EMode_LOOP, 0.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_S_DEMO_M2_e, 3.0f, J3DFrameCtrl::EMode_NONE, 0.0f, dRes_INDEX_TN_BAS_S_DEMO_M2_e); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_S_DEMO_Y2_e, 3.0f, J3DFrameCtrl::EMode_NONE, 0.0f); + tate_anm_init(i_this, DEMO_SELECT(dRes_INDEX_TN_BCK_ATATE_ON1_e, dRes_INDEX_TN_BCK_S_DEMO_M2_e), 3.0f, J3DFrameCtrl::EMode_LOOP, 0.0f); i_this->mDamageReaction.mMode = 0xb; } break; @@ -2508,7 +2508,7 @@ static void s_demo(tn_class* i_this) { #if VERSION == VERSION_DEMO i_this->m0414_demo = 0; #else - tate_anm_init(i_this, TN_BCK_ATATE_ON1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + tate_anm_init(i_this, dRes_INDEX_TN_BCK_ATATE_ON1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); #endif } if (i_this->mpBodyMorf->isStop()) { @@ -2520,12 +2520,12 @@ static void s_demo(tn_class* i_this) { break; case 0x14: i_this->mDamageReaction.mMode = 0x15; - anm_init(i_this, TN_BCK_ANIOU1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); - yoroi_anm_init(i_this, TN_BCK_YKIHON1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_ANIOU1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YKIHON1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->mCountDownTimers[0] = 30; case 0x15: if (i_this->mCountDownTimers[0] == 0) { - anm_init(i_this, TN_BCK_AKAMAE1, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_AKAMAE1_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mCountDownTimers[0] = 30; i_this->mDamageReaction.mMode = 0x16; fopAcM_monsSeStart(actor, JA_SE_CV_TN_KAMAE_L, 0); @@ -2867,9 +2867,9 @@ static u8 damage_check(tn_class* i_this) { i_this->mDamageReaction.mAction = ACTION_JYUNKAI; i_this->mDamageReaction.mMode = -10; r25 = 1; - anm_init(i_this, TN_BCK_AHAKAI1, 5.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); - tate_anm_init(i_this, TN_BCK_AHAKAI1, 5.0f, J3DFrameCtrl::EMode_NONE, 0.0f); - yoroi_anm_init(i_this, TN_BCK_YHAKAI1, 5.0f, J3DFrameCtrl::EMode_NONE, 0.0f); + anm_init(i_this, dRes_INDEX_TN_BCK_AHAKAI1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1); + tate_anm_init(i_this, dRes_INDEX_TN_BCK_AHAKAI1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 0.0f); + yoroi_anm_init(i_this, dRes_INDEX_TN_BCK_YHAKAI1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 0.0f); } } else { i_this->mEnemyIce.mLightShrinkTimer = 1; @@ -3095,7 +3095,7 @@ static u8 damage_check(tn_class* i_this) { i_this->mDamageReaction.m424 |= 0x20; i_this->mDamageReaction.m428 = 23.0f; cMtx_YrotS(*calc_mtx, i_this->mTargetAngle); - anm_init(i_this, TN_BCK_BDOWN_A1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_BDOWN_A1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mDamageReaction.m48A = 10; i_this->mDamageReaction.m474 = 5000.0f; i_this->mDamageReaction.m70E = 7; @@ -3453,7 +3453,7 @@ static BOOL daTn_Execute(tn_class* i_this) { if (i_this->mEnemyIce.mFreezeTimer == 1) { path_check(i_this); wait_set(i_this); - tate_anm_init(i_this, TN_BCK_ATATE_ON1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + tate_anm_init(i_this, dRes_INDEX_TN_BCK_ATATE_ON1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); } return TRUE; } @@ -3553,14 +3553,14 @@ static BOOL daTn_Execute(tn_class* i_this) { i_this->m1408 = fpcM_ERROR_PROCESS_ID_e; switch (r3) { case 1: - anm_init(i_this, TN_BCK_BDOWN_A1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_BDOWN_A1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); if (i_this->m0C34 != 0 && (actor->health <= 0 || r25 >= 4 || cM_rndF(1.0f) < 0.5f)) { i_this->m0C38 = 1; } i_this->mDamageReaction.mAction = ACTION_JYUNKAI; break; case 2: - anm_init(i_this, TN_BCK_BDOWN_U1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_BDOWN_U1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; case 5: if (i_this->mDamageReaction.mAction != ACTION_FIGHT_RUN && i_this->mDamageReaction.mAction != ACTION_HUKKI) { @@ -3591,7 +3591,7 @@ static BOOL daTn_Execute(tn_class* i_this) { i_this->mDamageReaction.m4C8[2] = l_tnHIO.m080; break; case 0x1e: - anm_init(i_this, TN_BCK_BDOWN_U1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); + anm_init(i_this, dRes_INDEX_TN_BCK_BDOWN_U1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); if (i_this->m0C34 != 0) { i_this->m0C38 = 1; } @@ -3870,20 +3870,20 @@ static BOOL useArrowHeapInit(fopAc_ac_c* a_this) { static BOOL useHeapInit(fopAc_ac_c* a_this) { static u16 part_bmd[] = { 0, - TN_BMD_TN_KABUTO1, // Regular Darknut helmet - TN_BMD_TN_TATE1 // Shield + dRes_INDEX_TN_BMD_TN_KABUTO1_e, // Regular Darknut helmet + dRes_INDEX_TN_BMD_TN_TATE1_e // Shield }; - static u16 part_brk[] = {TN_BRK_TN_YOROI1, TN_BRK_TN_KABUTO1, TN_BRK_TN_TATE1}; + static u16 part_brk[] = {dRes_INDEX_TN_BRK_TN_YOROI1_e, dRes_INDEX_TN_BRK_TN_KABUTO1_e, dRes_INDEX_TN_BRK_TN_TATE1_e}; tn_class* i_this = (tn_class*)a_this; J3DModelData* modelData; J3DModel* model; i_this->mpBodyMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Tn", TN_BMD_TN_MAIN), + (J3DModelData*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BMD_TN_MAIN_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Tn", TN_BCK_ANIOU1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BCK_ANIOU1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -3909,10 +3909,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } } i_this->mpShieldMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Tn", TN_BMD_TN_MAIN), + (J3DModelData*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BMD_TN_MAIN_e), NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Tn", TN_BCK_ATATE_ON1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BCK_ATATE_ON1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -3931,7 +3931,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->mpBrkAnm->init( i_this->mpBodyMorf->getModel()->getModelData(), - (J3DAnmTevRegKey*)dComIfG_getObjectRes("Tn", TN_BRK_TN_MAIN), + (J3DAnmTevRegKey*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BRK_TN_MAIN_e), true, J3DFrameCtrl::EMode_LOOP )) @@ -3941,10 +3941,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { for (s32 i = 0; i < ARRAY_SSIZE(i_this->mParts); i++) { if (i == 0) { i_this->mpArmorMorf = new mDoExt_McaMorf( - (J3DModelData*)dComIfG_getObjectRes("Tn", TN_BMD_TN_YOROI1), // Body armor + (J3DModelData*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BMD_TN_YOROI1_e), // Body armor NULL, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Tn", TN_BCK_YKIHON1), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BCK_YKIHON1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -3957,7 +3957,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { i_this->mParts[i].mpPartModel = i_this->mpArmorMorf->getModel(); } else { if (i == 1 && (i_this->mEquipmentType & EQUIPMENT_HELMET)) { - modelData = (J3DModelData*)dComIfG_getObjectRes("Tn", TN_BMD_TN_KABUTO2); // Mighty Darknut helmet + modelData = (J3DModelData*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BMD_TN_KABUTO2_e); // Mighty Darknut helmet } else { modelData = (J3DModelData*)dComIfG_getObjectRes("Tn", part_bmd[i]); } @@ -3974,7 +3974,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if (i == 1 && (i_this->mEquipmentType & EQUIPMENT_HELMET)) { if (!i_this->mParts[i].mpPartBrkAnm->init( i_this->mParts[i].mpPartModel->getModelData(), - (J3DAnmTevRegKey*)dComIfG_getObjectRes("Tn", TN_BRK_TN_KABUTO2), + (J3DAnmTevRegKey*)dComIfG_getObjectRes("Tn", dRes_INDEX_TN_BRK_TN_KABUTO2_e), true, J3DFrameCtrl::EMode_NONE )) diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index e966b4bec..42741fe14 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -5,14 +5,14 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_toge.h" -#include "d/res/res_htoge1.h" +#include "res/Object/Htoge1.h" #include "d/actor/d_a_wind_tag.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" const char daToge_c::m_arcname[] = "Htoge1"; -const s16 daToge_c::m_dzbidx = HTOGE1_DZB_HTOGE1A; -const s16 daToge_c::m_bdlidx = HTOGE1_BDL_HTOGE1; +const s16 daToge_c::m_dzbidx = dRes_INDEX_HTOGE1_DZB_HTOGE1A_e; +const s16 daToge_c::m_bdlidx = dRes_INDEX_HTOGE1_BDL_HTOGE1_e; const u32 daToge_c::m_heapsize = 0x5000; const f32 daToge_c::m_y_min = -150.0f; @@ -68,7 +68,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 0000015C-00000290 .text CreateHeap__8daToge_cFv */ BOOL daToge_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HTOGE1_BDL_HTOGE1); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HTOGE1_BDL_HTOGE1_e); JUT_ASSERT(0x11A, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000U, 0x11000002U); @@ -79,8 +79,8 @@ BOOL daToge_c::CreateHeap() { mpModel->setUserArea((u32)this); - mpBgW1 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(m_arcname, HTOGE1_DZB_HTOGE1A), cBgW::MOVE_BG_e, &mtx1); - mpBgW2 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(m_arcname, HTOGE1_DZB_HTOGE1B), cBgW::MOVE_BG_e, &mtx2); + mpBgW1 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HTOGE1_DZB_HTOGE1A_e), cBgW::MOVE_BG_e, &mtx1); + mpBgW2 = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HTOGE1_DZB_HTOGE1B_e), cBgW::MOVE_BG_e, &mtx2); if (mpBgW1 == NULL || mpBgW2 == NULL) { return FALSE; diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index 51ca304c0..bb85b33cd 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -9,8 +9,8 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" -#include "d/res/res_trflag.h" -#include "d/res/res_cloth.h" +#include "res/Object/Trflag.h" +#include "res/Object/Cloth.h" #include "f_op/f_op_actor_mng.h" #include "d/d_a_obj.h" @@ -75,15 +75,15 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000001E4-0000030C .text CreateHeap__13daTori_Flag_cFv */ BOOL daTori_Flag_c::CreateHeap() { BOOL ret; - J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(M_arcname, TRFLAG_BDL_ETHATA); + J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(M_arcname, dRes_INDEX_TRFLAG_BDL_ETHATA_e); JUT_ASSERT(0x120, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpModel == NULL) { ret = FALSE; } else { - ResTIMG* flagTimg = (ResTIMG *)dComIfG_getObjectRes(M_arcname, TRFLAG_BTI_ETHATA); - ResTIMG* clothTimg = (ResTIMG *)dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON); + ResTIMG* flagTimg = (ResTIMG *)dComIfG_getObjectRes(M_arcname, dRes_INDEX_TRFLAG_BTI_ETHATA_e); + ResTIMG* clothTimg = (ResTIMG *)dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e); mpCloth = dCloth_packet_create(flagTimg, clothTimg, 5, 5, 210.0f, 105.0f, &mClothTevStr, NULL); ret = (mpCloth != NULL) ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index 84710b8b9..05bf6ab65 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tornado.h" -#include "d/res/res_trnd.h" +#include "res/Object/Trnd.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "d/d_com_inf_game.h" @@ -252,28 +252,28 @@ static BOOL daTornado_Delete(daTornado_c* i_this) { /* 00000D54-0000109C .text createHeap__11daTornado_cFv */ BOOL daTornado_c::createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, TRND_BDL_YTRND00); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_TRND_BDL_YTRND00_e); JUT_ASSERT(0x1fe, modelData != NULL); 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::EMode_LOOP)) + if (!mBck.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_TRND_BCK_YTRND00_e), true, J3DFrameCtrl::EMode_LOOP)) return FALSE; - if (!mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YTRND00), false, J3DFrameCtrl::EMode_LOOP)) + if (!mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_TRND_BTK_YTRND00_e), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; - if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YTRND00), false, J3DFrameCtrl::EMode_LOOP)) + if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_TRND_BRK_YTRND00_e), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; - modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, TRND_BDL_YWUWT00); + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_TRND_BDL_YWUWT00_e); JUT_ASSERT(0x226, modelData != NULL); 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::EMode_LOOP)) + if (!mBckUnder.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_TRND_BCK_YWUWT00_e), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; - if (!mBtkUnder.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP)) + if (!mBtkUnder.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_TRND_BTK_YWUWT00_e), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; - if (!mBrkUnder.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP)) + if (!mBrkUnder.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_TRND_BRK_YWUWT00_e), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index 7f2642204..fa3f94fa1 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -9,18 +9,20 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_obj_eff.h" -#include "d/res/res_always.h" -#include "d/res/res_kmtub_00.h" -#include "d/res/res_ktaru_01.h" -#include "d/res/res_okmono.h" -#include "d/res/res_odokuro.h" -#include "d/res/res_okioke.h" -#include "d/res/res_sitem.h" -#include "d/res/res_kmi00x.h" -#include "d/res/res_hbox2.h" -#include "d/res/res_hseki.h" -#include "d/res/res_ptubo.h" -#include "d/res/res_kkiba_00.h" +#include "res/Object/Always.h" +#include "res/Object/Kmtub_00.h" +#include "res/Object/Ktaru_01.h" +#include "res/Object/Okmono.h" +#include "res/Object/Odokuro.h" +#include "res/Object/Okioke.h" +#include "res/Object/Sitem.h" +#if VERSION > VERSION_DEMO +#include "res/Object/Kmi00x.h" +#endif +#include "res/Object/Hbox2.h" +#include "res/Object/Hseki.h" +#include "res/Object/Ptubo.h" +#include "res/Object/Kkiba_00.h" #include "d/d_camera.h" #include "d/d_lib.h" #include "d/d_com_inf_game.h" @@ -122,7 +124,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_1_e | DATA_FLAG_2_e), - ALWAYS_BDL_OBM_KOTUBO1, + dRes_INDEX_ALWAYS_BDL_OBM_KOTUBO1_e, 0x28, 0x1E, 0x3C, @@ -187,7 +189,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_1_e | DATA_FLAG_2_e | DATA_FLAG_20_e), - ALWAYS_BDL_OBM_OOTUBO1, + dRes_INDEX_ALWAYS_BDL_OBM_OOTUBO1_e, 0x32, 0x32, 0x64, @@ -254,7 +256,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_20_e), - KMTUB_00_BDL_KMTUB_00, + dRes_INDEX_KMTUB_00_BDL_KMTUB_00_e, 0x41, 0x32, 0x64, @@ -321,7 +323,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_4_e | DATA_FLAG_10_e | DATA_FLAG_20_e), - KTARU_01_BDL_KTARU_01, + dRes_INDEX_KTARU_01_BDL_KTARU_01_e, 0x3C, 0x32, 0x64, @@ -388,7 +390,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_4_e | DATA_FLAG_10_e), - OKMONO_BDL_OSTOOL, + dRes_INDEX_OKMONO_BDL_OSTOOL_e, 0x30, 0x28, 0x50, @@ -453,7 +455,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, DATA_FLAG_2_e, - ODOKURO_BDL_ODOKURO, + dRes_INDEX_ODOKURO_BDL_ODOKURO_e, 0x27, 0x1C, 0x3C, @@ -518,7 +520,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_10_e), - OKIOKE_BDL_OKIOKE, + dRes_INDEX_OKIOKE_BDL_OKIOKE_e, 0x26, 0x1A, 0x49, @@ -583,7 +585,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_10_e | DATA_FLAG_20_e), - DEMO_SELECT(SITEM_BDL_KMI_00, KMI00X_BDL_KMI_00X), + DEMO_SELECT(dRes_INDEX_SITEM_BDL_KMI_00_e, dRes_INDEX_KMI00X_BDL_KMI_00X_e), 0x32, 0x32, 0x64, @@ -648,7 +650,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_8_e | DATA_FLAG_10_e), - HBOX2_BDL_HBOX2, + dRes_INDEX_HBOX2_BDL_HBOX2_e, 0x30, 0x2D, 0x4B, @@ -713,7 +715,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_4_e), - HSEKI_BDL_HMON1, + dRes_INDEX_HSEKI_BDL_HMON1_e, 0x48, 0x38, 0x96, @@ -778,7 +780,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_4_e), - HSEKI_BDL_HMON1, + dRes_INDEX_HSEKI_BDL_HMON1_e, 0x48, 0x38, 0x96, @@ -843,7 +845,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_4_e), - HSEKI_BDL_HMON1, + dRes_INDEX_HSEKI_BDL_HMON1_e, 0x48, 0x38, 0x96, @@ -908,7 +910,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_4_e), - HSEKI_BDL_HMON1, + dRes_INDEX_HSEKI_BDL_HMON1_e, 0x48, 0x38, 0x96, @@ -973,7 +975,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_10_e), - SITEM_BDL_KMI_02, + dRes_INDEX_SITEM_BDL_KMI_02_e, 0x2D, 0x32, 0x64, @@ -1038,7 +1040,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_20_e), - PTUBO_BDL_PTUBO, + dRes_INDEX_PTUBO_BDL_PTUBO_e, 0x2F, 0x32, 0x64, @@ -1105,7 +1107,7 @@ const Act_c::Data_c Act_c::M_data[] = { 0x7D, 0x5, (DataFlag_e)(DATA_FLAG_2_e | DATA_FLAG_8_e | DATA_FLAG_10_e), - KKIBA_00_BDL_KKIBA_00, + dRes_INDEX_KKIBA_00_BDL_KKIBA_00_e, 0x30, 0x2D, 0x4B, @@ -1203,7 +1205,7 @@ bool Act_c::create_heap() { mpModel = mDoExt_J3DModel__create(modelData, 0x80000, modelFlag); bool ret = false; if (mType == 7) { - J3DAnmTevRegKey* brk_data = static_cast(dComIfG_getObjectRes(M_arcname[mType], DEMO_SELECT(SITEM_BRK_KMI_00, KMI00X_BRK_KMI_00X))); + J3DAnmTevRegKey* brk_data = static_cast(dComIfG_getObjectRes(M_arcname[mType], DEMO_SELECT(dRes_INDEX_SITEM_BRK_KMI_00_e, dRes_INDEX_KMI00X_BRK_KMI_00X_e))); JUT_ASSERT(DEMO_SELECT(1885, 1887), brk_data != NULL); mpBrk = new mDoExt_brkAnm(); @@ -3091,8 +3093,8 @@ void Act_c::eff_break_barrel() { /* 00006888-00006A48 .text eff_break_tsubo__Q27daTsubo5Act_cFv */ void Act_c::eff_break_tsubo() { u16 uVar1 = data().m80; - J3DModelData* pJVar2 = (J3DModelData*)(dComIfG_getObjectRes("Always", ALWAYS_BDL_MPM_TUBO)); - J3DAnmTexPattern* pJVar3 = static_cast(dComIfG_getObjectRes("Always", ALWAYS_BTP_MPM_TUBO)); + J3DModelData* pJVar2 = (J3DModelData*)(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPM_TUBO_e)); + J3DAnmTexPattern* pJVar3 = static_cast(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTP_MPM_TUBO_e)); JPABaseEmitter* pJVar4 = static_cast(dComIfGp_particle_set(dPa_name::ID_AK_JN_M_TUBOHAHEN, ¤t.pos, NULL, (cXyz*)data().get_particle_scale())); if (pJVar4 != NULL) { diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 821fd6d03..b3c650314 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -5,9 +5,9 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_wall.h" -#include "d/res/res_hbw1.h" -#include "d/res/res_htw1.h" -#include "d/res/res_hbw2.h" +#include "res/Object/Hbw1.h" +#include "res/Object/Htw1.h" +#include "res/Object/Hbw2.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -19,8 +19,8 @@ const s16 daWall_c::m_heapsize[3] = { 0x2000, }; -const s16 daWall_c::m_bmdname[3] = {HBW1_BDL_HBW1, HTW1_BDL_HTW1, HBW2_BDL_HBW2}; -const s16 daWall_c::m_dzbname[3] = {HBW1_DZB_HBW1, HTW1_DZB_HTW1, HBW2_DZB_HBW2}; +const s16 daWall_c::m_bmdname[3] = {dRes_INDEX_HBW1_BDL_HBW1_e, dRes_INDEX_HTW1_BDL_HTW1_e, dRes_INDEX_HBW2_BDL_HBW2_e}; +const s16 daWall_c::m_dzbname[3] = {dRes_INDEX_HBW1_DZB_HBW1_e, dRes_INDEX_HTW1_DZB_HTW1_e, dRes_INDEX_HBW2_DZB_HBW2_e}; const Vec daWall_c::m_tri_vtx[3][4] = { {{150.0f, -120.0f, 0.0f}, diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index a3488957e..21ad70507 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_ship.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_sea.h" -#include "d/res/res_gdemo20.h" +#include "res/Object/Gdemo20.h" #include "d/d_bg_s_func.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -34,7 +34,7 @@ static EventActionFunc event_action_tbl[] = { }; const char daWarpdm20_c::m_arcname[] = "Gdemo20"; -const s16 daWarpdm20_c::m_residxA[] = {GDEMO20_BDL_GDEMO20_1, GDEMO20_BCK_GDEMO20_1, GDEMO20_BTK_GDEMO20_1, GDEMO20_BRK_GDEMO20_1}; +const s16 daWarpdm20_c::m_residxA[] = {dRes_INDEX_GDEMO20_BDL_GDEMO20_1_e, dRes_INDEX_GDEMO20_BCK_GDEMO20_1_e, dRes_INDEX_GDEMO20_BTK_GDEMO20_1_e, dRes_INDEX_GDEMO20_BRK_GDEMO20_1_e}; const s16 daWarpdm20_c::m_residxB[] = {-1, -1, -1, -1}; const u32 daWarpdm20_c::m_heapsize = 0x3000; const f32 daWarpdm20_c::m_warp_distance = 500.0f; @@ -296,7 +296,7 @@ void daWarpdm20_c::initWaitDead(int) { sp08.z += 1000.0f; dComIfGp_evmng_setGoal(&sp08); m2CC = 1; - init_bck_anm(GDEMO20_BCK_GDEMO20_1A); + init_bck_anm(dRes_INDEX_GDEMO20_BCK_GDEMO20_1A_e); if (mpBrkAnm != NULL) { mpBrkAnm->setFrame(mpBrkAnm->getEndFrame()); diff --git a/src/d/actor/d_a_warpf.cpp b/src/d/actor/d_a_warpf.cpp index f296351f6..b99a78313 100644 --- a/src/d/actor/d_a_warpf.cpp +++ b/src/d/actor/d_a_warpf.cpp @@ -12,8 +12,8 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_camera.h" -#include "d/res/res_ysbwp00.h" -#include "d/res/res_gtfglow.h" +#include "res/Object/Ysbwp00.h" +#include "res/Object/Gtfglow.h" namespace daWarpf_prm { static inline u32 getSetType(daWarpf_c* i_this) { return fopAcM_GetParam(i_this) >> 0x1C; } @@ -71,7 +71,7 @@ BOOL daWarpf_c::CreateHeap() { switch (mStageNo) { case dSv_save_c::STAGE_TOTG: - modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mStageNo], YSBWP00_BDL_YSBWP00); + modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_YSBWP00_BDL_YSBWP00_e); JUT_ASSERT(343, modelData != NULL); m2A8 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222); @@ -79,7 +79,7 @@ BOOL daWarpf_c::CreateHeap() { return FALSE; } - pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], YSBWP00_BRK_YSBWP00); + pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_YSBWP00_BRK_YSBWP00_e); JUT_ASSERT(358, pbrk != NULL); m2AC = new mDoExt_brkAnm(); @@ -87,7 +87,7 @@ BOOL daWarpf_c::CreateHeap() { return FALSE; } - pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname[mStageNo], YSBWP00_BCK_YSBWP00); + pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_YSBWP00_BCK_YSBWP00_e); JUT_ASSERT(374, pbck != NULL); m2B0 = new mDoExt_bckAnm(); @@ -95,7 +95,7 @@ BOOL daWarpf_c::CreateHeap() { return FALSE; } - pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname[mStageNo], YSBWP00_BTK_YSBWP00); + pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_YSBWP00_BTK_YSBWP00_e); JUT_ASSERT(391, pbtk != NULL); m2B4 = new mDoExt_btkAnm(); @@ -109,7 +109,7 @@ BOOL daWarpf_c::CreateHeap() { if (!checkEndDemo()) { m2C0 = NULL; - modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mStageNo], GTFGLOW_BDL_GTFGLOW00); + modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_GTFGLOW_BDL_GTFGLOW00_e); JUT_ASSERT(411, modelData != NULL); m2A8 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -117,7 +117,7 @@ BOOL daWarpf_c::CreateHeap() { return FALSE; } - pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], GTFGLOW_BRK_GTFGLOW00); + pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_GTFGLOW_BRK_GTFGLOW00_e); JUT_ASSERT(424, pbrk != NULL); m2AC = new mDoExt_brkAnm(); @@ -126,7 +126,7 @@ BOOL daWarpf_c::CreateHeap() { } m2AC->setPlaySpeed(1.0f); - pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], GTFGLOW_BRK_GTFGLOW01); + pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_GTFGLOW_BRK_GTFGLOW01_e); JUT_ASSERT(441, pbrk != NULL); m2B8 = new mDoExt_brkAnm(); @@ -135,7 +135,7 @@ BOOL daWarpf_c::CreateHeap() { } m2B8->setPlaySpeed(0.0f); - pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], GTFGLOW_BRK_GTFGLOW02); + pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_GTFGLOW_BRK_GTFGLOW02_e); JUT_ASSERT(457, pbrk != NULL); m2BC = new mDoExt_brkAnm(); @@ -144,7 +144,7 @@ BOOL daWarpf_c::CreateHeap() { } m2BC->setPlaySpeed(0.0f); } else { - modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mStageNo], GTFGLOW_BDL_GDEMO29_A00); + modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_GTFGLOW_BDL_GDEMO29_A00_e); JUT_ASSERT(474, modelData != NULL); m2A8 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -152,7 +152,7 @@ BOOL daWarpf_c::CreateHeap() { return FALSE; } - pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], DEMO_SELECT(GTFGLOW_BRK_GDEMO29_A00, GTFGLOW_BRK_GDEMO29_A01)); + pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname[mStageNo], DEMO_SELECT(dRes_INDEX_GTFGLOW_BRK_GDEMO29_A00_e, dRes_INDEX_GTFGLOW_BRK_GDEMO29_A01_e)); JUT_ASSERT(488, pbrk != NULL); m2AC = new mDoExt_brkAnm(); @@ -161,7 +161,7 @@ BOOL daWarpf_c::CreateHeap() { } m2AC->setPlaySpeed(1.0f); - modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mStageNo], GTFGLOW_BDL_GDEMO29_B00); + modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mStageNo], dRes_INDEX_GTFGLOW_BDL_GDEMO29_B00_e); JUT_ASSERT(504, modelData != NULL); m2C0 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); diff --git a/src/d/actor/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp index f2a7d0516..b2e3ba374 100644 --- a/src/d/actor/d_a_warpgn.cpp +++ b/src/d/actor/d_a_warpgn.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_ship.h" #include "d/d_lib.h" -#include "d/res/res_gmjwp.h" +#include "res/Object/Gmjwp.h" const char daWarpgn_c::m_arcname[] = "Gmjwp"; const u32 daWarpgn_c::m_heapsize = 0x3000; @@ -61,7 +61,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000140-00000570 .text CreateHeap__10daWarpgn_cFv */ BOOL daWarpgn_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, GMJWP_BDL_GMJWP00); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BDL_GMJWP00_e); JUT_ASSERT(0xCF, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222); @@ -69,7 +69,7 @@ BOOL daWarpgn_c::CreateHeap() { return FALSE; } - J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BTK_GMJWP00); + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BTK_GMJWP00_e); JUT_ASSERT(0xDE, pbtk != NULL); mpBtkAnm1 = new mDoExt_btkAnm(); if ((mpBtkAnm1 == NULL) || mpBtkAnm1->init(modelData, pbtk, true, J3DFrameCtrl::EMode_LOOP) == 0) { @@ -77,7 +77,7 @@ BOOL daWarpgn_c::CreateHeap() { } mpBtkAnm1->setPlaySpeed(1.0f); - pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BTK_GMJWP02); + pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BTK_GMJWP02_e); JUT_ASSERT(0xED, pbtk != NULL); mpBtkAnm2 = new mDoExt_btkAnm(); if ((mpBtkAnm2 == NULL) || mpBtkAnm2->init(modelData, pbtk, true, J3DFrameCtrl::EMode_NONE) == 0) { @@ -85,7 +85,7 @@ BOOL daWarpgn_c::CreateHeap() { } mpBtkAnm2->setPlaySpeed(0.0f); - J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BRK_GMJWP01); + J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BRK_GMJWP01_e); JUT_ASSERT(0xFF, pbrk != NULL); mpBrkAnm = new mDoExt_brkAnm(); if (mpBrkAnm == NULL || mpBrkAnm->init(modelData, pbrk, true, J3DFrameCtrl::EMode_NONE) == 0) { @@ -93,7 +93,7 @@ BOOL daWarpgn_c::CreateHeap() { } mpBrkAnm->setPlaySpeed(0.0f); - J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, GMJWP_BCK_GMJWP01); + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BCK_GMJWP01_e); JUT_ASSERT(0x10F, pbck != NULL); mpBckAnm = new mDoExt_bckAnm(); if (mpBckAnm == NULL || mpBckAnm->init(modelData, pbck, true, J3DFrameCtrl::EMode_NONE) == 0) { diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index 100a3596f..b65e2deeb 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_warphr.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_ship.h" -#include "d/res/res_ghrwp.h" +#include "res/Object/Ghrwp.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" @@ -19,8 +19,8 @@ static inline u8 getType(daWarphr_c* i_this) { } // namespace daWarphr_prm const char daWarphr_c::m_arcname[] = "Ghrwp"; -const s16 daWarphr_c::m_residxA[] = {GHRWP_BDL_GHRWPA00, GHRWP_BTK_GHRWPA00, -1}; -const s16 daWarphr_c::m_residxB[] = {GHRWP_BDL_GHRWPB00, GHRWP_BTK_GHRWPB00, GHRWP_BRK_GHRWPB00}; +const s16 daWarphr_c::m_residxA[] = {dRes_INDEX_GHRWP_BDL_GHRWPA00_e, dRes_INDEX_GHRWP_BTK_GHRWPA00_e, -1}; +const s16 daWarphr_c::m_residxB[] = {dRes_INDEX_GHRWP_BDL_GHRWPB00_e, dRes_INDEX_GHRWP_BTK_GHRWPB00_e, dRes_INDEX_GHRWP_BRK_GHRWPB00_e}; const u32 daWarphr_c::m_heapsize = 0x3000; typedef void (daWarphr_c::*EventInitFunc)(int); diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 7cdb3df3c..c9b361d20 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -7,8 +7,8 @@ #include "d/actor/d_a_wind_tag.h" #include "d/actor/d_a_sea.h" #include "d/d_bg_s_func.h" -#include "d/res/res_yaflw00.h" -#include "d/res/res_ybgaf00.h" +#include "res/Object/Yaflw00.h" +#include "res/Object/Ybgaf00.h" #include "f_op/f_op_camera.h" #include "f_op/f_op_kankyo_mng.h" #include "d/d_cc_d.h" @@ -104,11 +104,11 @@ BOOL daWindTag_c::CreateHeap() { } const char *daWindTag_c::m_arcname[] = { "Yaflw00", "Ybgaf00" }; -s16 daWindTag_c::m_bdlidx[] = { YAFLW00_BDL_YAFLW00, YBGAF00_BDL_YBGAF00 }; +s16 daWindTag_c::m_bdlidx[] = { dRes_INDEX_YAFLW00_BDL_YAFLW00_e, dRes_INDEX_YBGAF00_BDL_YBGAF00_e }; s16 daWindTag_c::m_heapsize[] = { 0x0C40, 0x0C40 }; -s16 daWindTag_c::m_bckidx[] = { YAFLW00_BCK_YAFLW00, YBGAF00_BCK_YBGAF00 }; -s16 daWindTag_c::m_btkidx[] = { YAFLW00_BTK_YAFLW00_01, YBGAF00_BTK_YBGAF00_01 }; -s16 daWindTag_c::m_btkidx2[] = { YAFLW00_BTK_YAFLW00_02, YBGAF00_BTK_YBGAF00_02 }; +s16 daWindTag_c::m_bckidx[] = { dRes_INDEX_YAFLW00_BCK_YAFLW00_e, dRes_INDEX_YBGAF00_BCK_YBGAF00_e }; +s16 daWindTag_c::m_btkidx[] = { dRes_INDEX_YAFLW00_BTK_YAFLW00_01_e, dRes_INDEX_YBGAF00_BTK_YBGAF00_01_e }; +s16 daWindTag_c::m_btkidx2[] = { dRes_INDEX_YAFLW00_BTK_YAFLW00_02_e, dRes_INDEX_YBGAF00_BTK_YBGAF00_02_e }; f32 daWindTag_c::m_cullsize_far = 4.0f; f32 daWindTag_c::m_ef_cullsize_far = 2.0f; diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp index 5ba9a2fda..261a42c1a 100644 --- a/src/d/actor/d_a_windmill.cpp +++ b/src/d/actor/d_a_windmill.cpp @@ -6,8 +6,8 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_windmill.h" #include "d/actor/d_a_wind_tag.h" -#include "d/res/res_hpu1.h" -#include "d/res/res_hpu2.h" +#include "res/Object/Hpu1.h" +#include "res/Object/Hpu2.h" #include "m_Do/m_Do_ext.h" #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" @@ -106,8 +106,8 @@ static dCcD_SrcCyl l_cyl_src = { }}, }; -const s16 daWindMill_c::m_bmdidx[] = {HPU1_BDL_HPU1, HPU2_BDL_HPU2}; -const s16 daWindMill_c::m_dzbidx[] = {HPU1_DZB_HPU1, -1}; +const s16 daWindMill_c::m_bmdidx[] = {dRes_INDEX_HPU1_BDL_HPU1_e, dRes_INDEX_HPU2_BDL_HPU2_e}; +const s16 daWindMill_c::m_dzbidx[] = {dRes_INDEX_HPU1_DZB_HPU1_e, -1}; const s16 daWindMill_c::m_heapsize[] = { 0x3A40, 0xA00 }; const Vec daWindMill_c::m_cull_size[][2] = { {{-1400.0f, 0.0f, -1400.0f}, {1400.0f, 500.0f, 1400.0f}}, diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index e5bf46be4..5548ebb9e 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ygcwp.h" #include "d/actor/d_a_player.h" -#include "d/res/res_ygcwp.h" +#include "res/Object/Ygcwp.h" #include "d/d_com_inf_game.h" enum { @@ -16,8 +16,8 @@ enum { }; const u32 daYgcwp_c::M_brk_table[] = { - YGCWP_BRK_YGCWP00_COMMON, - YGCWP_BRK_YGCWP00_WARP, + dRes_INDEX_YGCWP_BRK_YGCWP00_COMMON_e, + dRes_INDEX_YGCWP_BRK_YGCWP00_WARP_e, }; const u32 daYgcwp_c::M_brk_mode_table[] = { @@ -50,7 +50,7 @@ BOOL daYgcwp_c::create_heap() { J3DAnmTevRegKey* brk_p; s32 i; BOOL ret = FALSE; - mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, YGCWP_BDL_YGCWP00)); + mdl_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YGCWP_BDL_YGCWP00_e)); JUT_ASSERT(0xBE, mdl_data != NULL); if (mdl_data != NULL) { diff --git a/src/d/actor/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp index 76f693965..439ef53ba 100644 --- a/src/d/actor/d_a_yougan.cpp +++ b/src/d/actor/d_a_yougan.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_yougan.h" -#include "d/res/res_yougan.h" +#include "res/Object/Yougan.h" #include "m_Do/m_Do_lib.h" class daYOUGAN_HIO_c : public JORReflexible { @@ -172,11 +172,11 @@ BOOL daYougan_c::_daYougan_delete() { /* 00000600-00000884 .text useHeapInit__10daYougan_cFv */ BOOL daYougan_c::useHeapInit() { - J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname, YOUGAN_BMD_YOUGAN_AWA); + J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname, dRes_INDEX_YOUGAN_BMD_YOUGAN_AWA_e); JUT_ASSERT(DEMO_SELECT(462, 464), modelData != NULL); - J3DAnmTransform* anmKey = (J3DAnmTransform*) dComIfG_getObjectRes(m_arcname, YOUGAN_BCK_YOUGAN_AWA); + J3DAnmTransform* anmKey = (J3DAnmTransform*) dComIfG_getObjectRes(m_arcname, dRes_INDEX_YOUGAN_BCK_YOUGAN_AWA_e); JUT_ASSERT(DEMO_SELECT(467,469), anmKey != NULL); - J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*) dComIfG_getObjectRes(m_arcname, YOUGAN_BTK_YOUGAN_AWA); + J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*) dComIfG_getObjectRes(m_arcname, dRes_INDEX_YOUGAN_BTK_YOUGAN_AWA_e); JUT_ASSERT(DEMO_SELECT(472, 474), srtKey != NULL); yg_awa_num = l_HIO.field_0x06; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index bd8420dd3..4737d1ad7 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_player_main.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_angle.h" -#include "d/res/res_always.h" +#include "res/Object/Always.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" @@ -67,13 +67,13 @@ dAttention_c::dAttention_c(fopAc_ac_c* i_player, u32 i_padNo) { heap = mDoExt_createSolidHeapFromGameToCurrent(0x3600, 0); JUT_ASSERT(0xb9, heap != NULL); - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_YAZIRUSHI_01); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_YAZIRUSHI_01_e); JUT_ASSERT(0xbe, modelData != NULL); int anmColNum = 0; for (u32 i = 0; i < 5; i++) { static u16 l_bpkIdx[] = { - ALWAYS_BPK_YJ_IN, ALWAYS_BPK_YJ_OUT, ALWAYS_BPK_YJ_SCALE, ALWAYS_BPK_YJ_LOOP, ALWAYS_BPK_YJ_DELETE, + dRes_INDEX_ALWAYS_BPK_YJ_IN_e, dRes_INDEX_ALWAYS_BPK_YJ_OUT_e, dRes_INDEX_ALWAYS_BPK_YJ_SCALE_e, dRes_INDEX_ALWAYS_BPK_YJ_LOOP_e, dRes_INDEX_ALWAYS_BPK_YJ_DELETE_e, }; J3DAnmColor* anmCol = (J3DAnmColor*)dComIfG_getObjectRes("Always", l_bpkIdx[i]); JUT_ASSERT(0xcc, anmCol != NULL); @@ -87,7 +87,7 @@ dAttention_c::dAttention_c(fopAc_ac_c* i_player, u32 i_padNo) { draw[i].anm = new mDoExt_McaMorf( modelData, &mCallBack, NULL, - (J3DAnmTransformKey*)dComIfG_getObjectRes("Always", ALWAYS_BCK_YJ_LOOP), + (J3DAnmTransformKey*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BCK_YJ_LOOP_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, @@ -653,13 +653,13 @@ void dAttention_c::runSoundProc() { /* 8009EB38-8009EDB8 .text runDrawProc__12dAttention_cFv */ void dAttention_c::runDrawProc() { if (chkFlag(AttnFlag_00000008)) { - draw[0].setAnm(ALWAYS_BCK_YJ_SCALE, ALWAYS_BPK_YJ_SCALE, J3DFrameCtrl::EMode_NONE); + draw[0].setAnm(dRes_INDEX_ALWAYS_BCK_YJ_SCALE_e, dRes_INDEX_ALWAYS_BPK_YJ_SCALE_e, J3DFrameCtrl::EMode_NONE); if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK37a02371_e) || dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e | daPyStts1_UNK10_e)) { mDoAud_seStart(JA_SE_L_FOCUS_SET); } } else if (chkFlag(AttnFlag_00000010)) { - draw[0].setAnm(ALWAYS_BCK_YJ_DELETE, ALWAYS_BPK_YJ_DELETE, J3DFrameCtrl::EMode_NONE); + draw[0].setAnm(dRes_INDEX_ALWAYS_BCK_YJ_DELETE_e, dRes_INDEX_ALWAYS_BPK_YJ_DELETE_e, J3DFrameCtrl::EMode_NONE); if (field_0x028 >= 0) { field_0x028 = 1; setFlag(AttnFlag_40000000); @@ -670,14 +670,14 @@ void dAttention_c::runDrawProc() { mDoAud_seStart(JA_SE_L_FOCUS_RESET); } } else if (chkFlag(AttnFlag_00000001)) { - draw[0].setAnm(ALWAYS_BCK_YJ_IN, ALWAYS_BPK_YJ_IN, J3DFrameCtrl::EMode_NONE); + draw[0].setAnm(dRes_INDEX_ALWAYS_BCK_YJ_IN_e, dRes_INDEX_ALWAYS_BPK_YJ_IN_e, J3DFrameCtrl::EMode_NONE); setFlag(AttnFlag_40000000); } else if (chkFlag(AttnFlag_00000002)) { - draw[0].setAnm(ALWAYS_BCK_YJ_IN, ALWAYS_BPK_YJ_IN, J3DFrameCtrl::EMode_NONE); - draw[1].setAnm(ALWAYS_BCK_YJ_OUT, ALWAYS_BPK_YJ_OUT, J3DFrameCtrl::EMode_NONE); + draw[0].setAnm(dRes_INDEX_ALWAYS_BCK_YJ_IN_e, dRes_INDEX_ALWAYS_BPK_YJ_IN_e, J3DFrameCtrl::EMode_NONE); + draw[1].setAnm(dRes_INDEX_ALWAYS_BCK_YJ_OUT_e, dRes_INDEX_ALWAYS_BPK_YJ_OUT_e, J3DFrameCtrl::EMode_NONE); setFlag(AttnFlag_40000000); } else if (mLockonCount <= 0 && field_0x028 == 0) { - draw[0].setAnm(ALWAYS_BCK_YJ_OUT, ALWAYS_BPK_YJ_OUT, J3DFrameCtrl::EMode_NONE); + draw[0].setAnm(dRes_INDEX_ALWAYS_BCK_YJ_OUT_e, dRes_INDEX_ALWAYS_BPK_YJ_OUT_e, J3DFrameCtrl::EMode_NONE); field_0x028 = 1; setFlag(AttnFlag_40000000); } @@ -686,7 +686,7 @@ void dAttention_c::runDrawProc() { if (mLockOnState == LockState_LOCK) { result = draw[0].anm->play(NULL, 0, 0); if (result) { - draw[0].setAnm(ALWAYS_BCK_YJ_LOOP, -1, J3DFrameCtrl::EMode_LOOP); + draw[0].setAnm(dRes_INDEX_ALWAYS_BCK_YJ_LOOP_e, -1, J3DFrameCtrl::EMode_LOOP); clrFlag(AttnFlag_40000000); } } else { @@ -969,7 +969,7 @@ void dAttDraw_c::draw(cXyz &pos, Mtx mtx) { J3DModelData *modeldata = model->getModelData(); if (mpAnmClr == NULL) { - J3DAnmColor *color = (J3DAnmColor*)dComIfG_getObjectRes("Always", ALWAYS_BPK_YJ_IN); + J3DAnmColor *color = (J3DAnmColor*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BPK_YJ_IN_e); modeldata->removeMatColorAnimator(color); } else { mpAnmClr->setFrame(anm->getFrame()); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index b0ef6af30..e8533cac7 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -5054,7 +5054,7 @@ bool dCamera_c::Chtyp(s32 nextType) { } } -/* 8017B51C-8017B524 .text U2__9dCamera_cFv */ +/* 8017B51C-8017B524 .text dRes_INDEX_U2__9dCamera_cFv_e */ s16 dCamera_c::U2() { return mAngleY.Val(); } diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp index 9afbe70cf..4a88989de 100644 --- a/src/d/d_door.cpp +++ b/src/d/d_door.cpp @@ -7,8 +7,8 @@ #include "d/d_door.h" #include "d/d_com_inf_game.h" #include "d/d_vibration.h" -#include "d/res/res_key.h" -#include "d/res/res_hkyo.h" +#include "res/Object/Key.h" +#include "res/Object/Hkyo.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_angle.h" @@ -464,14 +464,14 @@ BOOL dDoor_key2_c::keyProc() { /* 8006C650-8006C764 .text keyCreate_Nkey__12dDoor_key2_cFv */ BOOL dDoor_key2_c::keyCreate_Nkey() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Key", KEY_BDL_VLOCN); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Key", dRes_INDEX_KEY_BDL_VLOCN_e); JUT_ASSERT(DEMO_SELECT(713, 716), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpModel == NULL) return FALSE; - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("Key", KEY_BCK_VLOCN); + J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("Key", dRes_INDEX_KEY_BCK_VLOCN_e); if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; @@ -480,14 +480,14 @@ BOOL dDoor_key2_c::keyCreate_Nkey() { /* 8006C764-8006C910 .text keyCreate_Bkey__12dDoor_key2_cFv */ BOOL dDoor_key2_c::keyCreate_Bkey() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Key", KEY_BDL_VLOCB); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Key", dRes_INDEX_KEY_BDL_VLOCB_e); JUT_ASSERT(DEMO_SELECT(737, 740), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpModel == NULL) return FALSE; - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("Key", KEY_BCK_VLOCB); + J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("Key", dRes_INDEX_KEY_BCK_VLOCB_e); if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; @@ -707,7 +707,7 @@ BOOL dDoor_hkyo_c::create() { if (m11 == 0) return TRUE; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Hkyo", HKYO_BDL_HKYO1); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Hkyo", dRes_INDEX_HKYO_BDL_HKYO1_e); JUT_ASSERT(DEMO_SELECT(1049, 1052), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202); @@ -718,7 +718,7 @@ BOOL dDoor_hkyo_c::create() { if (mpBrkAnm == NULL) return FALSE; - J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Hkyo", HKYO_BRK_HKYO1B); + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Hkyo", dRes_INDEX_HKYO_BRK_HKYO1B_e); if (!mpBrkAnm->init(modelData, brk, TRUE, J3DFrameCtrl::EMode_LOOP)) return FALSE; @@ -736,9 +736,9 @@ void dDoor_hkyo_c::setAnm(u8 idx) { u32 fileIndex; switch (idx) { - case 1: fileIndex = HKYO_BRK_HKYO1A; break; - case 2: fileIndex = HKYO_BRK_HKYO1B; break; - default: fileIndex = HKYO_BRK_HKYO1C; break; + case 1: fileIndex = dRes_INDEX_HKYO_BRK_HKYO1A_e; break; + case 2: fileIndex = dRes_INDEX_HKYO_BRK_HKYO1B_e; break; + default: fileIndex = dRes_INDEX_HKYO_BRK_HKYO1C_e; break; } J3DModelData* modelData = mpModel->getModelData(); diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index fe82a4f5d..44f822506 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -1910,7 +1910,7 @@ void dDlst_mirrorPacket::draw() { /* 800855B4-80085624 .text init__18dDlst_mirrorPacketFP7ResTIMG */ void dDlst_mirrorPacket::init(ResTIMG* pImg) { if (pImg == NULL) - pImg = (ResTIMG*) dComIfG_getObjectRes("Always", ALWAYS_BTI_SHMREF); + pImg = (ResTIMG*) dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_SHMREF_e); mDoLib_setResTimgObj(pImg, &mTexObj, 0, NULL); } diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 4e9c0ba1a..9bd31e329 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -7,113 +7,113 @@ #include "d/d_item_data.h" #include "d/d_particle_name.h" #include "JSystem/JUtility/JUTAssert.h" -#include "d/res/res_always.h" -#include "d/res/res_vhutu.h" -#include "d/res/res_vhkak.h" -#include "d/res/res_vkeyn.h" -#include "d/res/res_key_01.h" -#include "d/res/res_tele_00.h" -#include "d/res/res_bomb_00.h" -#include "d/res/res_link.h" -#include "d/res/res_vhane.h" -#include "d/res/res_vboko.h" -#include "d/res/res_vchuj.h" -#include "d/res/res_vmapc.h" -#include "d/res/res_vsaim.h" -#include "d/res/res_vsail.h" -#include "d/res/res_vyatm.h" -#include "d/res/res_vyatl.h" -// #include "d/res/res_ball.h" -#include "d/res/res_bin.h" -#include "d/res/res_vbomm.h" -#include "d/res/res_boom.h" -#include "d/res/res_vboot.h" -#include "d/res/res_vboml.h" -// #include "d/res/res_bottle.h" -// #include "d/res/res_bottle_e.h" -#include "d/res/res_vboxn.h" -#include "d/res/res_vdunc.h" -#include "d/res/res_vdunm.h" -#include "d/res/res_vleaf.h" -#include "d/res/res_vbagh.h" -#include "d/res/res_vbage.h" -#include "d/res/res_vbagf.h" -#include "d/res/res_vhyoi.h" -#include "d/res/res_vesa.h" -#include "d/res/res_vobj07.h" -#include "d/res/res_vobj06.h" -#include "d/res/res_vobj05.h" -#include "d/res/res_vobj04.h" -#include "d/res/res_vobj03.h" -#include "d/res/res_vobj00.h" -#include "d/res/res_vobj01.h" -#include "d/res/res_vobj02.h" -#include "d/res/res_vhook.h" -#include "d/res/res_vpowr.h" -#include "d/res/res_vho.h" -#include "d/res/res_vmant.h" -#include "d/res/res_vohom.h" -#include "d/res/res_vchin.h" -#include "d/res/res_vhamm.h" -#include "d/res/res_vamuk.h" -#include "d/res/res_vamuy.h" -#include "d/res/res_med_b.h" -#include "d/res/res_med_g.h" -#include "d/res/res_med_r.h" -#include "d/res/res_vobj08.h" -#include "d/res/res_vobj09.h" -#include "d/res/res_vobj11.h" -#include "d/res/res_vobj10.h" -#include "d/res/res_vhapp.h" -#include "d/res/res_vrope.h" -#include "d/res/res_vmags.h" -#include "d/res/res_shinju_n.h" -// #include "d/res/res_sord_m.h" -// #include "d/res/res_sord_mvu.h" -#include "d/res/res_vswon.h" -#include "d/res/res_vshim.h" -#include "d/res/res_vshin.h" -#include "d/res/res_vtri1.h" -#include "d/res/res_vtact.h" -#include "d/res/res_varfi.h" -#include "d/res/res_vmapq.h" -#include "d/res/res_varrl.h" -#include "d/res/res_vbow.h" -// #include "d/res/res_fa.h" -#include "d/res/res_shinju_d.h" -#include "d/res/res_shinju_f.h" -#include "d/res/res_fwbin.h" -#include "d/res/res_vbiny.h" -#include "d/res/res_vbinh.h" -#include "d/res/res_vbins.h" -#include "d/res/res_vbinw.h" -#include "d/res/res_vfuku.h" -#include "d/res/res_vdoku.h" -#include "d/res/res_vbelt.h" -#include "d/res/res_vlupy.h" -#include "d/res/res_vlett.h" -#include "d/res/res_vleof.h" -#include "d/res/res_vlemg.h" -#include "d/res/res_vlemo.h" -#include "d/res/res_fdai.h" -#include "d/res/res_vtri2.h" -#include "d/res/res_vtri3.h" -#include "d/res/res_vtri4.h" -#include "d/res/res_vtri5.h" -#include "d/res/res_vtri6.h" -#include "d/res/res_vtri7.h" -#include "d/res/res_vtri8.h" -#include "d/res/res_vmapt.h" -#include "d/res/res_vmapr.h" -#include "d/res/res_vmaph.h" -#include "d/res/res_vmapg.h" -#include "d/res/res_vboxa.h" -#include "d/res/res_vtin1.h" -#include "d/res/res_vtin2.h" -#include "d/res/res_vtin3.h" -#include "d/res/res_vtin4.h" -#include "d/res/res_vtin5.h" -#include "d/res/res_vbeso.h" +#include "res/Object/Always.h" +#include "res/Object/Vhutu.h" +#include "res/Object/Vhkak.h" +#include "res/Object/VkeyN.h" +#include "res/Object/key_01.h" +#include "res/Object/tele_00.h" +#include "res/Object/Bomb_00.h" +#include "res/Object/Link.h" +#include "res/Object/Vhane.h" +#include "res/Object/Vboko.h" +#include "res/Object/Vchuj.h" +#include "res/Object/VmapC.h" +#include "res/Object/VsaiM.h" +#include "res/Object/VsaiL.h" +#include "res/Object/VyatM.h" +#include "res/Object/VyatL.h" +// #include "res/Object/Ball.h" +#include "res/Object/Bin.h" +#include "res/Object/VbomM.h" +#include "res/Object/Boom.h" +#include "res/Object/Vboot.h" +#include "res/Object/VbomL.h" +// #include "res/Object/Bottle.h" +// #include "res/Object/Bottle_e.h" +#include "res/Object/VboxN.h" +#include "res/Object/VdunC.h" +#include "res/Object/VdunM.h" +#include "res/Object/Vleaf.h" +#include "res/Object/VbagH.h" +#include "res/Object/VbagE.h" +#include "res/Object/VbagF.h" +#include "res/Object/Vhyoi.h" +#include "res/Object/Vesa.h" +#include "res/Object/Vobj07.h" +#include "res/Object/Vobj06.h" +#include "res/Object/Vobj05.h" +#include "res/Object/Vobj04.h" +#include "res/Object/Vobj03.h" +#include "res/Object/Vobj00.h" +#include "res/Object/Vobj01.h" +#include "res/Object/Vobj02.h" +#include "res/Object/Vhook.h" +#include "res/Object/Vpowr.h" +#include "res/Object/Vho.h" +#include "res/Object/Vmant.h" +#include "res/Object/Vohom.h" +#include "res/Object/Vchin.h" +#include "res/Object/Vhamm.h" +#include "res/Object/Vamuk.h" +#include "res/Object/VamuY.h" +#include "res/Object/Med_b.h" +#include "res/Object/Med_g.h" +#include "res/Object/Med_r.h" +#include "res/Object/Vobj08.h" +#include "res/Object/Vobj09.h" +#include "res/Object/Vobj11.h" +#include "res/Object/Vobj10.h" +#include "res/Object/Vhapp.h" +#include "res/Object/Vrope.h" +#include "res/Object/VmagS.h" +#include "res/Object/Shinju_n.h" +// #include "res/Object/Sord_m.h" +// #include "res/Object/Sord_mvu.h" +#include "res/Object/VswoN.h" +#include "res/Object/VshiM.h" +#include "res/Object/VshiN.h" +#include "res/Object/Vtri1.h" +#include "res/Object/Vtact.h" +#include "res/Object/Varfi.h" +#include "res/Object/VmapQ.h" +#include "res/Object/Varrl.h" +#include "res/Object/Vbow.h" +// #include "res/Object/Fa.h" +#include "res/Object/Shinju_d.h" +#include "res/Object/Shinju_f.h" +#include "res/Object/FwBin.h" +#include "res/Object/VBinY.h" +#include "res/Object/VbinH.h" +#include "res/Object/VbinS.h" +#include "res/Object/VbinW.h" +#include "res/Object/Vfuku.h" +#include "res/Object/Vdoku.h" +#include "res/Object/Vbelt.h" +#include "res/Object/Vlupy.h" +#include "res/Object/VleTT.h" +#include "res/Object/VleOF.h" +#include "res/Object/VleMG.h" +#include "res/Object/VleMO.h" +#include "res/Object/Fdai.h" +#include "res/Object/Vtri2.h" +#include "res/Object/Vtri3.h" +#include "res/Object/Vtri4.h" +#include "res/Object/Vtri5.h" +#include "res/Object/Vtri6.h" +#include "res/Object/Vtri7.h" +#include "res/Object/Vtri8.h" +#include "res/Object/VmapT.h" +#include "res/Object/VmapR.h" +#include "res/Object/VmapH.h" +#include "res/Object/VmapG.h" +#include "res/Object/VboxA.h" +#include "res/Object/Vtin1.h" +#include "res/Object/Vtin2.h" +#include "res/Object/Vtin3.h" +#include "res/Object/Vtin4.h" +#include "res/Object/Vtin5.h" +#include "res/Object/Vbeso.h" /* 80383F20-803840E0 .data item_arcname_tbl__10dItem_data */ char* dItem_data::item_arcname_tbl[0x70] = { @@ -591,7 +591,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x00: dItemNo_HEART_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ ALWAYS_BDL_VHRTL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VHRTL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -607,10 +607,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x01: dItemNo_GREEN_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -623,10 +623,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x02: dItemNo_BLUE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x01, @@ -639,10 +639,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x03: dItemNo_YELLOW_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x02, @@ -655,10 +655,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x04: dItemNo_RED_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x03, @@ -671,10 +671,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x05: dItemNo_PURPLE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -687,10 +687,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x06: dItemNo_ORANGE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x05, @@ -703,8 +703,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x07: dItemNo_HEART_PIECE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHKAK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_02], - /* mBmdIdx */ VHKAK_BDL_VHKAK, - /* mSrtIdx */ VHKAK_BTK_VHKAK, + /* mBmdIdx */ dRes_INDEX_VHKAK_BDL_VHKAK_e, + /* mSrtIdx */ dRes_INDEX_VHKAK_BTK_VHKAK_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -719,8 +719,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x08: dItemNo_HEART_CONTAINER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHUTU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_01], - /* mBmdIdx */ VHUTU_BDL_VHUTU, - /* mSrtIdx */ VHUTU_BTK_VHUTU, + /* mBmdIdx */ dRes_INDEX_VHUTU_BDL_VHUTU_e, + /* mSrtIdx */ dRes_INDEX_VHUTU_BTK_VHUTU_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -735,7 +735,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x09: dItemNo_SMALL_MAGIC_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ ALWAYS_BDL_MPODA, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_MPODA_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -751,7 +751,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0A: dItemNo_LARGE_MAGIC_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ ALWAYS_BDL_MPODB, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_MPODB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -767,7 +767,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0B: dItemNo_BOMB_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ BOMB_00_BDL_VBOMB, + /* mBmdIdx */ dRes_INDEX_BOMB_00_BDL_VBOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -783,7 +783,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0C: dItemNo_BOMB_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ BOMB_00_BDL_VBOMB, + /* mBmdIdx */ dRes_INDEX_BOMB_00_BDL_VBOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -799,7 +799,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0D: dItemNo_BOMB_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ BOMB_00_BDL_VBOMB, + /* mBmdIdx */ dRes_INDEX_BOMB_00_BDL_VBOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -815,7 +815,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0E: dItemNo_BOMB_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ BOMB_00_BDL_VBOMB, + /* mBmdIdx */ dRes_INDEX_BOMB_00_BDL_VBOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -831,10 +831,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0F: dItemNo_SILVER_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x06, @@ -847,7 +847,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x10: dItemNo_ARROW_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], - /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_ARROWITEM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -863,7 +863,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x11: dItemNo_ARROW_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], - /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_ARROWITEM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -879,7 +879,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x12: dItemNo_ARROW_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], - /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_ARROWITEM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -927,7 +927,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x15: dItemNo_SMALL_KEY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VKEYN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_KEY], - /* mBmdIdx */ VKEYN_BDL_VKEYN, + /* mBmdIdx */ dRes_INDEX_VKEYN_BDL_VKEYN_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -943,12 +943,12 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x16: dItemNo_RECOVER_FAIRY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_FA], /* mTexture */ NULL, - /* mBmdIdx */ ALWAYS_BDL_FA, // Note: This file index is for the wrong RARC. + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_FA_e, // Note: This file index is for the wrong RARC. /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_FA, // Note: This file index is for the wrong RARC. + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_FA_e, // Note: This file index is for the wrong RARC. /* mTevFrm */ -1, /* mItemMesgNum */ 0x0000, /* mUnused */ 0x00000000, @@ -1019,10 +1019,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x1A: dItemNo_SUB_DUN_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x02, @@ -1083,7 +1083,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x1E: dItemNo_TRIPLE_HEART_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ ALWAYS_BDL_VHRTL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VHRTL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1099,7 +1099,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x1F: dItemNo_JOY_PENDANT_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHAPP], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_08], - /* mBmdIdx */ VHAPP_BDL_VHAPP, + /* mBmdIdx */ dRes_INDEX_VHAPP_BDL_VHAPP_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1115,8 +1115,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x20: dItemNo_TELESCOPE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_TELE_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TELESCOPE], - /* mBmdIdx */ TELE_00_BDL_VTELE, - /* mSrtIdx */ TELE_00_BTK_VTELE, + /* mBmdIdx */ dRes_INDEX_TELE_00_BDL_VTELE_e, + /* mSrtIdx */ dRes_INDEX_TELE_00_BTK_VTELE_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1131,7 +1131,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x21: dItemNo_TINGLE_TUNER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_WHISTLE], - /* mBmdIdx */ VCHIN_BDL_VCHIN, + /* mBmdIdx */ dRes_INDEX_VCHIN_BDL_VCHIN_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1147,7 +1147,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x22: dItemNo_WIND_WAKER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTACT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ VTACT_BDL_VTACT, + /* mBmdIdx */ dRes_INDEX_VTACT_BDL_VTACT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1163,8 +1163,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x23: dItemNo_PICTO_BOX_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA], - /* mBmdIdx */ VBOXN_BDL_VBOXN, - /* mSrtIdx */ VBOXN_BTK_VBOXN, + /* mBmdIdx */ dRes_INDEX_VBOXN_BDL_VBOXN_e, + /* mSrtIdx */ dRes_INDEX_VBOXN_BTK_VBOXN_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1179,7 +1179,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x24: dItemNo_SPOILS_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COVEROFBEAST], - /* mBmdIdx */ VBAGE_BDL_VBAGE, + /* mBmdIdx */ dRes_INDEX_VBAGE_BDL_VBAGE_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1195,8 +1195,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x25: dItemNo_GRAPPLING_HOOK_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VROPE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ROPE], - /* mBmdIdx */ VROPE_BDL_VROPE, - /* mSrtIdx */ VROPE_BTK_VROPE, + /* mBmdIdx */ dRes_INDEX_VROPE_BDL_VROPE_e, + /* mSrtIdx */ dRes_INDEX_VROPE_BTK_VROPE_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1211,8 +1211,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x26: dItemNo_DELUXE_PICTO_BOX_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA_2], - /* mBmdIdx */ VBOXA_BDL_VBOXP, - /* mSrtIdx */ VBOXA_BTK_VBOXA, + /* mBmdIdx */ dRes_INDEX_VBOXA_BDL_VBOXP_e, + /* mSrtIdx */ dRes_INDEX_VBOXA_BTK_VBOXA_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1227,8 +1227,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x27: dItemNo_BOW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOW], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], - /* mBmdIdx */ VBOW_BDL_VBOW, - /* mSrtIdx */ VBOW_BTK_VBOW, + /* mBmdIdx */ dRes_INDEX_VBOW_BDL_VBOW_e, + /* mSrtIdx */ dRes_INDEX_VBOW_BTK_VBOW_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1243,8 +1243,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x28: dItemNo_POWER_BRACELETS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VPOWR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GLOVES_00_0x35], - /* mBmdIdx */ VPOWR_BDL_VPOWR, - /* mSrtIdx */ VPOWR_BTK_VPOWR, + /* mBmdIdx */ dRes_INDEX_VPOWR_BDL_VPOWR_e, + /* mSrtIdx */ dRes_INDEX_VPOWR_BTK_VPOWR_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1259,8 +1259,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x29: dItemNo_IRON_BOOTS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOOT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOOTS_00], - /* mBmdIdx */ VBOOT_BDL_VBOOT, - /* mSrtIdx */ VBOOT_BTK_VBOOT, + /* mBmdIdx */ dRes_INDEX_VBOOT_BDL_VBOOT_e, + /* mSrtIdx */ dRes_INDEX_VBOOT_BTK_VBOOT_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1275,10 +1275,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2A: dItemNo_MAGIC_ARMOR_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAGS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_02], - /* mBmdIdx */ VMAGS_BDL_VMAGS, - /* mSrtIdx */ VMAGS_BTK_VMAGS, + /* mBmdIdx */ dRes_INDEX_VMAGS_BDL_VMAGS_e, + /* mSrtIdx */ dRes_INDEX_VMAGS_BTK_VMAGS_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VMAGS_BRK_VMAGS, + /* mTevIdx */ dRes_INDEX_VMAGS_BRK_VMAGS_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ -1, @@ -1307,7 +1307,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2C: dItemNo_BAIT_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COVEROFBAIT], - /* mBmdIdx */ VBAGF_BDL_VBAGF, + /* mBmdIdx */ dRes_INDEX_VBAGF_BDL_VBAGF_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1323,7 +1323,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2D: dItemNo_BOOMERANG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOOM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOOMERANG], - /* mBmdIdx */ BOOM_BDL_VBOOM, + /* mBmdIdx */ dRes_INDEX_BOOM_BDL_VBOOM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1339,7 +1339,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2E: dItemNo_BARE_HAND_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VFUKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GLOVES_00_0x34], - /* mBmdIdx */ VFUKU_BDL_VFUKU, + /* mBmdIdx */ dRes_INDEX_VFUKU_BDL_VFUKU_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1355,8 +1355,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2F: dItemNo_HOOKSHOT_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHOOK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HOOKSHOT], - /* mBmdIdx */ VHOOK_BDL_VHOOK, - /* mSrtIdx */ VHOOK_BTK_VHOOK, + /* mBmdIdx */ dRes_INDEX_VHOOK_BDL_VHOOK_e, + /* mSrtIdx */ dRes_INDEX_VHOOK_BTK_VHOOK_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1371,7 +1371,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x30: dItemNo_DELIVERY_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY], - /* mBmdIdx */ VBAGH_BDL_VBAGH, + /* mBmdIdx */ dRes_INDEX_VBAGH_BDL_VBAGH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1387,7 +1387,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x31: dItemNo_BOMB_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ BOMB_00_BDL_VBOMB, + /* mBmdIdx */ dRes_INDEX_BOMB_00_BDL_VBOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1403,7 +1403,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x32: dItemNo_FUKU_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VFUKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CLOTHES], - /* mBmdIdx */ VFUKU_BDL_VFUKU, + /* mBmdIdx */ dRes_INDEX_VFUKU_BDL_VFUKU_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1419,7 +1419,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x33: dItemNo_SKULL_HAMMER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHAMM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HAMMER_01], - /* mBmdIdx */ VHAMM_BDL_VHAMM, + /* mBmdIdx */ dRes_INDEX_VHAMM_BDL_VHAMM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1435,7 +1435,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x34: dItemNo_DEKU_LEAF_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEAF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_FAN], - /* mBmdIdx */ VLEAF_BDL_VLEAF, + /* mBmdIdx */ dRes_INDEX_VLEAF_BDL_VLEAF_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1451,8 +1451,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x35: dItemNo_MAGIC_ARROW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VARFI], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROW_POWER_01], - /* mBmdIdx */ VARFI_BDL_VARFI, - /* mSrtIdx */ VARFI_BTK_VARFI, + /* mBmdIdx */ dRes_INDEX_VARFI_BDL_VARFI_e, + /* mSrtIdx */ dRes_INDEX_VARFI_BTK_VARFI_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1467,8 +1467,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x36: dItemNo_LIGHT_ARROW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VARRL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROW_POWER_02], - /* mBmdIdx */ VARRL_BDL_VARRL, - /* mSrtIdx */ VARRL_BTK_VARRL, + /* mBmdIdx */ dRes_INDEX_VARRL_BDL_VARRL_e, + /* mSrtIdx */ dRes_INDEX_VARRL_BTK_VARRL_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1499,7 +1499,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x38: dItemNo_SWORD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_00], - /* mBmdIdx */ VSWON_BDL_VSWON, + /* mBmdIdx */ dRes_INDEX_VSWON_BDL_VSWON_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1547,7 +1547,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x3B: dItemNo_SHIELD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSHIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_00], - /* mBmdIdx */ VSHIN_BDL_VSHIN, + /* mBmdIdx */ dRes_INDEX_VSHIN_BDL_VSHIN_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1563,8 +1563,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x3C: dItemNo_MIRROR_SHIELD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSHIM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_01], - /* mBmdIdx */ VSHIM_BDL_VSHIM, - /* mSrtIdx */ VSHIM_BTK_VSHIM, + /* mBmdIdx */ dRes_INDEX_VSHIM_BDL_VSHIM_e, + /* mSrtIdx */ dRes_INDEX_VSHIM_BTK_VSHIM_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1579,7 +1579,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x3D: dItemNo_DROPPED_SWORD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_00], - /* mBmdIdx */ VSWON_BDL_VSWON, + /* mBmdIdx */ dRes_INDEX_VSWON_BDL_VSWON_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1611,8 +1611,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x3F: dItemNo_HEART_PIECE_ALT_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHKAK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_02], - /* mBmdIdx */ VHKAK_BDL_VHKAK, - /* mSrtIdx */ VHKAK_BTK_VHKAK, + /* mBmdIdx */ dRes_INDEX_VHKAK_BDL_VHKAK_e, + /* mSrtIdx */ dRes_INDEX_VHKAK_BTK_VHKAK_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1659,8 +1659,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x42: dItemNo_PIRATES_CHARM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ VAMUK_BDL_VAMUK, - /* mSrtIdx */ VAMUK_BTK_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, + /* mSrtIdx */ dRes_INDEX_VAMUK_BTK_VAMUK_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1675,8 +1675,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x43: dItemNo_HEROS_CHARM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_01], - /* mBmdIdx */ VAMUY_BDL_VAMUY, - /* mSrtIdx */ VAMUY_BTK_VAMUY, + /* mBmdIdx */ dRes_INDEX_VAMUY_BDL_VAMUY_e, + /* mSrtIdx */ dRes_INDEX_VAMUY_BTK_VAMUY_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1707,8 +1707,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x45: dItemNo_SKULL_NECKLACE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDOKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_01], - /* mBmdIdx */ VDOKU_BDL_VDOKU, - /* mSrtIdx */ VDOKU_BTK_VDOKU, + /* mBmdIdx */ dRes_INDEX_VDOKU_BDL_VDOKU_e, + /* mSrtIdx */ dRes_INDEX_VDOKU_BTK_VDOKU_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1723,7 +1723,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x46: dItemNo_BOKOBABA_SEED_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOKO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_02], - /* mBmdIdx */ VBOKO_BDL_VBOKO, + /* mBmdIdx */ dRes_INDEX_VBOKO_BDL_VBOKO_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1739,10 +1739,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x47: dItemNo_GOLDEN_FEATHER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHANE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_03], - /* mBmdIdx */ VHANE_BDL_VHANE, - /* mSrtIdx */ VHANE_BTK_VHANE, + /* mBmdIdx */ dRes_INDEX_VHANE_BDL_VHANE_e, + /* mSrtIdx */ dRes_INDEX_VHANE_BTK_VHANE_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VHANE_BRK_VHANE, + /* mTevIdx */ dRes_INDEX_VHANE_BRK_VHANE_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ -1, @@ -1755,8 +1755,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x48: dItemNo_KNIGHTS_CREST_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBELT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_04], - /* mBmdIdx */ VBELT_BDL_VBELT, - /* mSrtIdx */ VBELT_BTK_VBELT, + /* mBmdIdx */ dRes_INDEX_VBELT_BDL_VBELT_e, + /* mSrtIdx */ dRes_INDEX_VBELT_BTK_VBELT_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1771,10 +1771,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x49: dItemNo_RED_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_05], - /* mBmdIdx */ VCHUJ_BDL_VCHUJ, + /* mBmdIdx */ dRes_INDEX_VCHUJ_BDL_VCHUJ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ VCHUJ_BRK_VCHUJ, + /* mTevIdx */ dRes_INDEX_VCHUJ_BRK_VCHUJ_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x01, @@ -1787,10 +1787,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4A: dItemNo_GREEN_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_06], - /* mBmdIdx */ VCHUJ_BDL_VCHUJ, + /* mBmdIdx */ dRes_INDEX_VCHUJ_BDL_VCHUJ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ VCHUJ_BRK_VCHUJ, + /* mTevIdx */ dRes_INDEX_VCHUJ_BRK_VCHUJ_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -1803,10 +1803,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4B: dItemNo_BLUE_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_07], - /* mBmdIdx */ VCHUJ_BDL_VCHUJ, + /* mBmdIdx */ dRes_INDEX_VCHUJ_BDL_VCHUJ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ VCHUJ_BRK_VCHUJ, + /* mTevIdx */ dRes_INDEX_VCHUJ_BRK_VCHUJ_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x02, @@ -1819,7 +1819,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4C: dItemNo_MAP_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDUNM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DUNGEON_MAP], - /* mBmdIdx */ VDUNM_BDL_VDUNM, + /* mBmdIdx */ dRes_INDEX_VDUNM_BDL_VDUNM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1835,8 +1835,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4D: dItemNo_COMPASS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDUNC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COMPASS], - /* mBmdIdx */ VDUNC_BDL_VDUNC, - /* mSrtIdx */ VDUNC_BTK_VDUNC, + /* mBmdIdx */ dRes_INDEX_VDUNC_BDL_VDUNC_e, + /* mSrtIdx */ dRes_INDEX_VDUNC_BTK_VDUNC_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1851,8 +1851,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4E: dItemNo_BOSS_KEY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_KEY_01], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOSS_KEY], - /* mBmdIdx */ KEY_01_BDL_VKEYB, - /* mSrtIdx */ KEY_01_BTK_VKEYB, + /* mBmdIdx */ dRes_INDEX_KEY_01_BDL_VKEYB_e, + /* mSrtIdx */ dRes_INDEX_KEY_01_BTK_VKEYB_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1883,8 +1883,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x50: dItemNo_EMPTY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ BIN_BDL_VBINX, - /* mSrtIdx */ BIN_BTK_VBINA_X, + /* mBmdIdx */ dRes_INDEX_BIN_BDL_VBINX_e, + /* mSrtIdx */ dRes_INDEX_BIN_BTK_VBINA_X_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1899,8 +1899,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x51: dItemNo_RED_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_R], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_01], - /* mBmdIdx */ MED_R_BDL_VBINR, - /* mSrtIdx */ MED_R_BTK_VBINA_R, + /* mBmdIdx */ dRes_INDEX_MED_R_BDL_VBINR_e, + /* mSrtIdx */ dRes_INDEX_MED_R_BTK_VBINA_R_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1915,8 +1915,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x52: dItemNo_GREEN_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_G], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_02], - /* mBmdIdx */ MED_G_BDL_VBING, - /* mSrtIdx */ MED_G_BTK_VBINA_G, + /* mBmdIdx */ dRes_INDEX_MED_G_BDL_VBING_e, + /* mSrtIdx */ dRes_INDEX_MED_G_BTK_VBINA_G_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1931,8 +1931,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x53: dItemNo_BLUE_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_B], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_03], - /* mBmdIdx */ MED_B_BDL_VBINB, - /* mSrtIdx */ MED_B_BTK_VBINA_B, + /* mBmdIdx */ dRes_INDEX_MED_B_BDL_VBINB_e, + /* mSrtIdx */ dRes_INDEX_MED_B_BTK_VBINA_B_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1947,8 +1947,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x54: dItemNo_HALF_SOUP_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_09], - /* mBmdIdx */ VBINS_BDL_VBINS, - /* mSrtIdx */ VBINS_BTK_VBINA_S, + /* mBmdIdx */ dRes_INDEX_VBINS_BDL_VBINS_e, + /* mSrtIdx */ dRes_INDEX_VBINS_BTK_VBINA_S_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1963,8 +1963,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x55: dItemNo_SOUP_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_04], - /* mBmdIdx */ VBINS_BDL_VBINS, - /* mSrtIdx */ VBINS_BTK_VBINA_S, + /* mBmdIdx */ dRes_INDEX_VBINS_BDL_VBINS_e, + /* mSrtIdx */ dRes_INDEX_VBINS_BTK_VBINA_S_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1979,8 +1979,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x56: dItemNo_WATER_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINW], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_05], - /* mBmdIdx */ VBINW_BDL_VBINW, - /* mSrtIdx */ VBINW_BTK_VBINA_W, + /* mBmdIdx */ dRes_INDEX_VBINW_BDL_VBINW_e, + /* mSrtIdx */ dRes_INDEX_VBINW_BTK_VBINA_W_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1995,8 +1995,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x57: dItemNo_FAIRY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_06], - /* mBmdIdx */ VBINY_BDL_VBINY, - /* mSrtIdx */ VBINY_BTK_VBINA_Y, + /* mBmdIdx */ dRes_INDEX_VBINY_BDL_VBINY_e, + /* mSrtIdx */ dRes_INDEX_VBINY_BTK_VBINA_Y_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2011,10 +2011,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x58: dItemNo_FIREFLY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_07], - /* mBmdIdx */ VBINH_BDL_VBINH, - /* mSrtIdx */ VBINH_BTK_VBINA_H, + /* mBmdIdx */ dRes_INDEX_VBINH_BDL_VBINH_e, + /* mSrtIdx */ dRes_INDEX_VBINH_BTK_VBINA_H_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VBINH_BRK_VBINH, + /* mTevIdx */ dRes_INDEX_VBINH_BRK_VBINH_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ -1, @@ -2027,8 +2027,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x59: dItemNo_FOREST_WATER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_FWBIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_08], - /* mBmdIdx */ FWBIN_BDL_VBINW_F, - /* mSrtIdx */ FWBIN_BTK_VBINA_F, + /* mBmdIdx */ dRes_INDEX_FWBIN_BDL_VBINW_F_e, + /* mSrtIdx */ dRes_INDEX_FWBIN_BTK_VBINA_F_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2155,8 +2155,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x61: dItemNo_TRIFORCE1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI1], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_00], - /* mBmdIdx */ VTRI1_BDL_VTRI1, - /* mSrtIdx */ VTRI1_BTK_VTRI1A, + /* mBmdIdx */ dRes_INDEX_VTRI1_BDL_VTRI1_e, + /* mSrtIdx */ dRes_INDEX_VTRI1_BTK_VTRI1A_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2171,8 +2171,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x62: dItemNo_TRIFORCE2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI2], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_01], - /* mBmdIdx */ VTRI2_BDL_VTRI2, - /* mSrtIdx */ VTRI2_BTK_VTRI2A, + /* mBmdIdx */ dRes_INDEX_VTRI2_BDL_VTRI2_e, + /* mSrtIdx */ dRes_INDEX_VTRI2_BTK_VTRI2A_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2187,8 +2187,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x63: dItemNo_TRIFORCE3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI3], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_02], - /* mBmdIdx */ VTRI3_BDL_VTRI3, - /* mSrtIdx */ VTRI3_BTK_VTRI3A, + /* mBmdIdx */ dRes_INDEX_VTRI3_BDL_VTRI3_e, + /* mSrtIdx */ dRes_INDEX_VTRI3_BTK_VTRI3A_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2203,8 +2203,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x64: dItemNo_TRIFORCE4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI4], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_03], - /* mBmdIdx */ VTRI4_BDL_VTRI4, - /* mSrtIdx */ VTRI4_BTK_VTRI4A, + /* mBmdIdx */ dRes_INDEX_VTRI4_BDL_VTRI4_e, + /* mSrtIdx */ dRes_INDEX_VTRI4_BTK_VTRI4A_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2219,8 +2219,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x65: dItemNo_TRIFORCE5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI5], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_04], - /* mBmdIdx */ VTRI5_BDL_VTRI5, - /* mSrtIdx */ VTRI5_BTK_VTRI5A, + /* mBmdIdx */ dRes_INDEX_VTRI5_BDL_VTRI5_e, + /* mSrtIdx */ dRes_INDEX_VTRI5_BTK_VTRI5A_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2235,8 +2235,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x66: dItemNo_TRIFORCE6_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI6], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_05], - /* mBmdIdx */ VTRI6_BDL_VTRI6, - /* mSrtIdx */ VTRI6_BTK_VTRI6A, + /* mBmdIdx */ dRes_INDEX_VTRI6_BDL_VTRI6_e, + /* mSrtIdx */ dRes_INDEX_VTRI6_BTK_VTRI6A_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2251,8 +2251,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x67: dItemNo_TRIFORCE7_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI7], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_06], - /* mBmdIdx */ VTRI7_BDL_VTRI7, - /* mSrtIdx */ VTRI7_BTK_VTRI7A, + /* mBmdIdx */ dRes_INDEX_VTRI7_BDL_VTRI7_e, + /* mSrtIdx */ dRes_INDEX_VTRI7_BTK_VTRI7A_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2267,8 +2267,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x68: dItemNo_TRIFORCE8_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI8], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_07], - /* mBmdIdx */ VTRI8_BDL_VTRI8, - /* mSrtIdx */ VTRI8_BTK_VTRI8A, + /* mBmdIdx */ dRes_INDEX_VTRI8_BDL_VTRI8_e, + /* mSrtIdx */ dRes_INDEX_VTRI8_BTK_VTRI8A_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2283,8 +2283,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x69: dItemNo_PEARL_NAYRU_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_N], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_02], - /* mBmdIdx */ SHINJU_N_BDL_VPEAN, - /* mSrtIdx */ SHINJU_N_BTK_VPEAA_N, + /* mBmdIdx */ dRes_INDEX_SHINJU_N_BDL_VPEAN_e, + /* mSrtIdx */ dRes_INDEX_SHINJU_N_BTK_VPEAA_N_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2299,8 +2299,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6A: dItemNo_PEARL_DIN_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_D], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_00], - /* mBmdIdx */ SHINJU_D_BDL_VPEAD, - /* mSrtIdx */ SHINJU_D_BTK_VPEAA_D, + /* mBmdIdx */ dRes_INDEX_SHINJU_D_BDL_VPEAD_e, + /* mSrtIdx */ dRes_INDEX_SHINJU_D_BTK_VPEAA_D_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2315,8 +2315,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6B: dItemNo_PEARL_FARORE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_F], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_01], - /* mBmdIdx */ SHINJU_F_BDL_VPEAF, - /* mSrtIdx */ SHINJU_F_BTK_VPEAA_F, + /* mBmdIdx */ dRes_INDEX_SHINJU_F_BDL_VPEAF_e, + /* mSrtIdx */ dRes_INDEX_SHINJU_F_BTK_VPEAA_F_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2331,7 +2331,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6C: dItemNo_KNOWLEDGE_TF_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2347,7 +2347,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6D: dItemNo_WINDS_REQUIEM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2363,7 +2363,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6E: dItemNo_BALLAD_OF_GALES_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2379,7 +2379,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6F: dItemNo_COMMAND_MELODY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2395,7 +2395,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x70: dItemNo_EARTH_GODS_LYRIC_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2411,7 +2411,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x71: dItemNo_WIND_GODS_ARIA_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2427,7 +2427,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x72: dItemNo_SONG_OF_PASSING_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2523,7 +2523,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x78: dItemNo_SAIL_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SAIL_00], - /* mBmdIdx */ VHO_BDL_VHO, + /* mBmdIdx */ dRes_INDEX_VHO_BDL_VHO_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2539,7 +2539,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x79: dItemNo_TRIFORCE_MAP_1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2555,7 +2555,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7A: dItemNo_TRIFORCE_MAP_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2571,7 +2571,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7B: dItemNo_TRIFORCE_MAP_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2587,7 +2587,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7C: dItemNo_TRIFORCE_MAP_4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2603,7 +2603,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7D: dItemNo_TRIFORCE_MAP_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2619,7 +2619,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7E: dItemNo_TRIFORCE_MAP_6_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2635,7 +2635,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7F: dItemNo_TRIFORCE_MAP_7_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2651,7 +2651,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x80: dItemNo_TRIFORCE_MAP_8_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2683,7 +2683,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x82: dItemNo_BIRD_BAIT_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VESA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BAIT_01], - /* mBmdIdx */ VESA_BDL_VESA, + /* mBmdIdx */ dRes_INDEX_VESA_BDL_VESA_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2699,7 +2699,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x83: dItemNo_HYOI_PEAR_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHYOI], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BAIT_02], - /* mBmdIdx */ VHYOI_BDL_VHYOI, + /* mBmdIdx */ dRes_INDEX_VHYOI_BDL_VHYOI_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2843,7 +2843,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x8C: dItemNo_TOWN_FLOWER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_01], - /* mBmdIdx */ VOBJ00_BDL_VOBJ00, + /* mBmdIdx */ dRes_INDEX_VOBJ00_BDL_VOBJ00_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2859,7 +2859,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x8D: dItemNo_SEA_FLOWER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ01], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_02], - /* mBmdIdx */ VOBJ01_BDL_VOBJ01, + /* mBmdIdx */ dRes_INDEX_VOBJ01_BDL_VOBJ01_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2875,7 +2875,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x8E: dItemNo_EXOTIC_FLOWER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ02], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_03], - /* mBmdIdx */ VOBJ02_BDL_VOBJ02, + /* mBmdIdx */ dRes_INDEX_VOBJ02_BDL_VOBJ02_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2891,7 +2891,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x8F: dItemNo_HEROS_FLAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ03], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_04], - /* mBmdIdx */ VOBJ03_BDL_VOBJ03, + /* mBmdIdx */ dRes_INDEX_VOBJ03_BDL_VOBJ03_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2907,7 +2907,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x90: dItemNo_BIG_CATCH_FLAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ04], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_05], - /* mBmdIdx */ VOBJ04_BDL_VOBJ04, + /* mBmdIdx */ dRes_INDEX_VOBJ04_BDL_VOBJ04_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2923,7 +2923,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x91: dItemNo_BIG_SALE_FLAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ05], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_06], - /* mBmdIdx */ VOBJ05_BDL_VOBJ05, + /* mBmdIdx */ dRes_INDEX_VOBJ05_BDL_VOBJ05_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2939,7 +2939,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x92: dItemNo_PINWHEEL_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ06], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_07], - /* mBmdIdx */ VOBJ06_BDL_VOBJ06, + /* mBmdIdx */ dRes_INDEX_VOBJ06_BDL_VOBJ06_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2955,7 +2955,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x93: dItemNo_SICKLE_MOON_FLAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ07], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_08], - /* mBmdIdx */ VOBJ07_BDL_VOBJ07, + /* mBmdIdx */ dRes_INDEX_VOBJ07_BDL_VOBJ07_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2971,7 +2971,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x94: dItemNo_SKULL_TOWER_IDOL_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ08], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_09], - /* mBmdIdx */ VOBJ08_BDL_VOBJ08, + /* mBmdIdx */ dRes_INDEX_VOBJ08_BDL_VOBJ08_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2987,7 +2987,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x95: dItemNo_FOUNTAIN_IDOL_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ09], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_10], - /* mBmdIdx */ VOBJ09_BDL_VOBJ09, + /* mBmdIdx */ dRes_INDEX_VOBJ09_BDL_VOBJ09_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3003,7 +3003,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x96: dItemNo_POSTMAN_STATUE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ10], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_11], - /* mBmdIdx */ VOBJ10_BDL_VOBJ10, + /* mBmdIdx */ dRes_INDEX_VOBJ10_BDL_VOBJ10_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3019,7 +3019,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x97: dItemNo_SHOP_GURU_STATUE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ11], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_12], - /* mBmdIdx */ VOBJ11_BDL_VOBJ11, + /* mBmdIdx */ dRes_INDEX_VOBJ11_BDL_VOBJ11_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3035,7 +3035,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x98: dItemNo_FATHER_LETTER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLETT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_13], - /* mBmdIdx */ VLETT_BDL_VLETT, + /* mBmdIdx */ dRes_INDEX_VLETT_BDL_VLETT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3051,7 +3051,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x99: dItemNo_NOTE_TO_MOM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEOF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_14], - /* mBmdIdx */ VLEOF_BDL_VLEOF, + /* mBmdIdx */ dRes_INDEX_VLEOF_BDL_VLEOF_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3067,7 +3067,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9A: dItemNo_MAGGIES_LETTER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEMG], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_15], - /* mBmdIdx */ VLEMG_BDL_VLEMG, + /* mBmdIdx */ dRes_INDEX_VLEMG_BDL_VLEMG_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3083,7 +3083,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9B: dItemNo_MOBLINS_LETTER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEMO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_16], - /* mBmdIdx */ VLEMO_BDL_VLEMO, + /* mBmdIdx */ dRes_INDEX_VLEMO_BDL_VLEMO_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3099,7 +3099,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9C: dItemNo_CABANA_DEED_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBESO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_17], - /* mBmdIdx */ VBESO_BDL_VBESO, + /* mBmdIdx */ dRes_INDEX_VBESO_BDL_VBESO_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3115,7 +3115,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9D: dItemNo_COMPLIMENTARY_ID_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOHOM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_18], - /* mBmdIdx */ VOHOM_BDL_VOHOM, + /* mBmdIdx */ dRes_INDEX_VOHOM_BDL_VOHOM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3131,7 +3131,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9E: dItemNo_FILL_UP_COUPON_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMANT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_19], - /* mBmdIdx */ VMANT_BDL_VMANT, + /* mBmdIdx */ dRes_INDEX_VMANT_BDL_VMANT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3147,8 +3147,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9F: dItemNo_LEGENDARY_PICTOGRAPH_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA], - /* mBmdIdx */ VBOXA_BDL_VBOXP, - /* mSrtIdx */ VBOXA_BTK_VBOXA, + /* mBmdIdx */ dRes_INDEX_VBOXA_BDL_VBOXP_e, + /* mSrtIdx */ dRes_INDEX_VBOXA_BTK_VBOXA_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3163,7 +3163,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA0: dItemNo_SALVAGE_ITEM_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3179,7 +3179,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA1: dItemNo_SALVAGE_ITEM_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3195,7 +3195,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA2: dItemNo_XXX_039_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mBmdIdx */ dRes_INDEX_VAMUK_BDL_VAMUK_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3211,7 +3211,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA3: dItemNo_TINGLE_STATUE_1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN1], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ VTIN1_BDL_VTIN1, + /* mBmdIdx */ dRes_INDEX_VTIN1_BDL_VTIN1_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3227,7 +3227,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA4: dItemNo_TINGLE_STATUE_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN2], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ VTIN2_BDL_VTIN2, + /* mBmdIdx */ dRes_INDEX_VTIN2_BDL_VTIN2_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3243,7 +3243,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA5: dItemNo_TINGLE_STATUE_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN3], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ VTIN3_BDL_VTIN3, + /* mBmdIdx */ dRes_INDEX_VTIN3_BDL_VTIN3_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3259,7 +3259,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA6: dItemNo_TINGLE_STATUE_4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN4], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ VTIN4_BDL_VTIN4, + /* mBmdIdx */ dRes_INDEX_VTIN4_BDL_VTIN4_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3275,7 +3275,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA7: dItemNo_TINGLE_STATUE_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN5], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ VTIN5_BDL_VTIN5, + /* mBmdIdx */ dRes_INDEX_VTIN5_BDL_VTIN5_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3323,7 +3323,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAA: dItemNo_HURRICANE_SPIN_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ NULL, - /* mBmdIdx */ VSWON_BDL_VSWON, + /* mBmdIdx */ dRes_INDEX_VSWON_BDL_VSWON_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3339,8 +3339,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAB: dItemNo_MAX_RUPEE_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSAIM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BIG_PURSE], - /* mBmdIdx */ VSAIM_BDL_VSAIM, - /* mSrtIdx */ VSAIM_BTK_VSAIM, + /* mBmdIdx */ dRes_INDEX_VSAIM_BDL_VSAIM_e, + /* mSrtIdx */ dRes_INDEX_VSAIM_BTK_VSAIM_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3355,8 +3355,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAC: dItemNo_MAX_RUPEE_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSAIL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_MAX_PURSE], - /* mBmdIdx */ VSAIL_BDL_VSAIL, - /* mSrtIdx */ VSAIL_BTK_VSAIL, + /* mBmdIdx */ dRes_INDEX_VSAIL_BDL_VSAIL_e, + /* mSrtIdx */ dRes_INDEX_VSAIL_BTK_VSAIL_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3371,8 +3371,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAD: dItemNo_MAX_BOMB_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOMM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMBPOUCH_1], - /* mBmdIdx */ VBOMM_BDL_VBOMM, - /* mSrtIdx */ VBOMM_BTK_VBOMM, + /* mBmdIdx */ dRes_INDEX_VBOMM_BDL_VBOMM_e, + /* mSrtIdx */ dRes_INDEX_VBOMM_BTK_VBOMM_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3387,8 +3387,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAE: dItemNo_MAX_BOMB_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOML], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMBPOUCH_2], - /* mBmdIdx */ VBOML_BDL_VBOML, - /* mSrtIdx */ VBOML_BTK_VBOML, + /* mBmdIdx */ dRes_INDEX_VBOML_BDL_VBOML_e, + /* mSrtIdx */ dRes_INDEX_VBOML_BTK_VBOML_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3403,8 +3403,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAF: dItemNo_MAX_ARROW_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VYATM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROWCASE_1], - /* mBmdIdx */ VYATM_BDL_VYATM, - /* mSrtIdx */ VYATM_BTK_VYATM, + /* mBmdIdx */ dRes_INDEX_VYATM_BDL_VYATM_e, + /* mSrtIdx */ dRes_INDEX_VYATM_BTK_VYATM_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3419,8 +3419,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB0: dItemNo_MAX_ARROW_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VYATL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROWCASE_2], - /* mBmdIdx */ VYATL_BDL_VYATL, - /* mSrtIdx */ VYATL_BTK_VYATL, + /* mBmdIdx */ dRes_INDEX_VYATL_BDL_VYATL_e, + /* mSrtIdx */ dRes_INDEX_VYATL_BTK_VYATL_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3467,10 +3467,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB3: dItemNo_TINGLE_RUPEE_1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3483,10 +3483,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB4: dItemNo_TINGLE_RUPEE_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3499,10 +3499,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB5: dItemNo_TINGLE_RUPEE_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3515,10 +3515,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB6: dItemNo_TINGLE_RUPEE_4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3531,10 +3531,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB7: dItemNo_TINGLE_RUPEE_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3547,10 +3547,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB8: dItemNo_TINGLE_RUPEE_6_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x05, @@ -3563,10 +3563,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB9: dItemNo_LITHOGRAPH_1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3579,10 +3579,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBA: dItemNo_LITHOGRAPH_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3595,10 +3595,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBB: dItemNo_LITHOGRAPH_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3611,10 +3611,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBC: dItemNo_LITHOGRAPH_4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3627,10 +3627,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBD: dItemNo_LITHOGRAPH_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3643,10 +3643,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBE: dItemNo_LITHOGRAPH_6_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3659,10 +3659,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBF: dItemNo_COLLECT_MAP_64_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3675,10 +3675,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC0: dItemNo_COLLECT_MAP_63_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3691,10 +3691,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC1: dItemNo_COLLECT_MAP_62_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ VLUPY_BDL_VLUPY, - /* mSrtIdx */ VLUPY_BTK_VLUPY, + /* mBmdIdx */ dRes_INDEX_VLUPY_BDL_VLUPY_e, + /* mSrtIdx */ dRes_INDEX_VLUPY_BTK_VLUPY_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ VLUPY_BRK_VLUPY, + /* mTevIdx */ dRes_INDEX_VLUPY_BRK_VLUPY_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3707,7 +3707,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC2: dItemNo_COLLECT_MAP_61_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3723,7 +3723,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC3: dItemNo_COLLECT_MAP_60_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3739,7 +3739,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC4: dItemNo_COLLECT_MAP_59_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3755,7 +3755,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC5: dItemNo_COLLECT_MAP_58_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3771,7 +3771,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC6: dItemNo_COLLECT_MAP_57_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3787,7 +3787,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC7: dItemNo_COLLECT_MAP_56_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3803,7 +3803,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC8: dItemNo_COLLECT_MAP_55_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3819,7 +3819,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC9: dItemNo_COLLECT_MAP_54_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3835,7 +3835,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCA: dItemNo_COLLECT_MAP_53_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ VMAPQ_BDL_VMAPQ, + /* mBmdIdx */ dRes_INDEX_VMAPQ_BDL_VMAPQ_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3851,7 +3851,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCB: dItemNo_COLLECT_MAP_52_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TINGLE2], - /* mBmdIdx */ VMAPC_BDL_VMAPC, + /* mBmdIdx */ dRes_INDEX_VMAPC_BDL_VMAPC_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3867,7 +3867,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCC: dItemNo_COLLECT_MAP_51_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3883,7 +3883,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCD: dItemNo_COLLECT_MAP_50_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3899,7 +3899,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCE: dItemNo_COLLECT_MAP_49_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3915,7 +3915,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCF: dItemNo_COLLECT_MAP_48_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3931,7 +3931,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD0: dItemNo_COLLECT_MAP_47_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3947,7 +3947,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD1: dItemNo_COLLECT_MAP_46_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3963,7 +3963,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD2: dItemNo_COLLECT_MAP_45_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3979,7 +3979,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD3: dItemNo_COLLECT_MAP_44_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3995,7 +3995,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD4: dItemNo_COLLECT_MAP_43_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4011,7 +4011,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD5: dItemNo_COLLECT_MAP_42_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4027,7 +4027,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD6: dItemNo_COLLECT_MAP_41_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4043,7 +4043,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD7: dItemNo_COLLECT_MAP_40_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4059,7 +4059,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD8: dItemNo_COLLECT_MAP_39_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4075,7 +4075,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD9: dItemNo_COLLECT_MAP_38_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4091,7 +4091,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDA: dItemNo_COLLECT_MAP_37_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4107,7 +4107,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDB: dItemNo_COLLECT_MAP_36_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPG], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_PHANTOMSHIP2], - /* mBmdIdx */ VMAPG_BDL_VMAPG, + /* mBmdIdx */ dRes_INDEX_VMAPG_BDL_VMAPG_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4123,7 +4123,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDC: dItemNo_COLLECT_MAP_35_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TINGLE2], - /* mBmdIdx */ VMAPC_BDL_VMAPC, + /* mBmdIdx */ dRes_INDEX_VMAPC_BDL_VMAPC_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4139,7 +4139,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDD: dItemNo_COLLECT_MAP_34_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4155,7 +4155,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDE: dItemNo_COLLECT_MAP_33_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4171,7 +4171,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDF: dItemNo_COLLECT_MAP_32_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4187,7 +4187,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE0: dItemNo_COLLECT_MAP_31_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4203,7 +4203,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE1: dItemNo_COLLECT_MAP_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4219,7 +4219,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE2: dItemNo_COLLECT_MAP_29_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4235,7 +4235,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE3: dItemNo_COLLECT_MAP_28_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4251,7 +4251,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE4: dItemNo_COLLECT_MAP_27_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4267,7 +4267,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE5: dItemNo_COLLECT_MAP_26_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4283,7 +4283,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE6: dItemNo_COLLECT_MAP_25_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4299,7 +4299,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE7: dItemNo_COLLECT_MAP_24_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4315,7 +4315,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE8: dItemNo_COLLECT_MAP_23_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4331,7 +4331,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE9: dItemNo_COLLECT_MAP_22_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4347,7 +4347,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEA: dItemNo_COLLECT_MAP_21_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4363,7 +4363,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEB: dItemNo_COLLECT_MAP_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4379,7 +4379,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEC: dItemNo_COLLECT_MAP_19_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ VMAPR_BDL_VMAPL, + /* mBmdIdx */ dRes_INDEX_VMAPR_BDL_VMAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4395,7 +4395,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xED: dItemNo_COLLECT_MAP_18_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4411,7 +4411,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEE: dItemNo_COLLECT_MAP_17_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4427,7 +4427,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEF: dItemNo_COLLECT_MAP_16_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4443,7 +4443,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF0: dItemNo_COLLECT_MAP_15_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4459,7 +4459,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF1: dItemNo_COLLECT_MAP_14_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4475,7 +4475,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF2: dItemNo_COLLECT_MAP_13_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4491,7 +4491,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF3: dItemNo_COLLECT_MAP_12_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4507,7 +4507,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF4: dItemNo_COLLECT_MAP_11_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4523,7 +4523,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF5: dItemNo_COLLECT_MAP_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4539,7 +4539,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF6: dItemNo_COLLECT_MAP_09_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ VMAPH_BDL_VMAPH, + /* mBmdIdx */ dRes_INDEX_VMAPH_BDL_VMAPH_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4555,7 +4555,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF7: dItemNo_COLLECT_MAP_08_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4571,7 +4571,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF8: dItemNo_COLLECT_MAP_07_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4587,7 +4587,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF9: dItemNo_COLLECT_MAP_06_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4603,7 +4603,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFA: dItemNo_COLLECT_MAP_05_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4619,7 +4619,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFB: dItemNo_COLLECT_MAP_04_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4635,7 +4635,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFC: dItemNo_COLLECT_MAP_03_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4651,7 +4651,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFD: dItemNo_COLLECT_MAP_02_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4667,7 +4667,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFE: dItemNo_COLLECT_MAP_01_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ VMAPT_BDL_VMAPT, + /* mBmdIdx */ dRes_INDEX_VMAPT_BDL_VMAPT_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4702,7 +4702,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x00: dItemNo_HEART_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VHRTL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VHRTL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4719,10 +4719,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x01: dItemNo_GREEN_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VLUPL, - /* mSrtIdx */ ALWAYS_BTK_VLUPL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VLUPL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VLUPL_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VLUPL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VLUPL_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -4736,10 +4736,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x02: dItemNo_BLUE_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VLUPL, - /* mSrtIdx */ ALWAYS_BTK_VLUPL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VLUPL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VLUPL_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VLUPL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VLUPL_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x01, @@ -4753,10 +4753,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x03: dItemNo_YELLOW_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VLUPL, - /* mSrtIdx */ ALWAYS_BTK_VLUPL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VLUPL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VLUPL_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VLUPL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VLUPL_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x02, @@ -4770,10 +4770,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x04: dItemNo_RED_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VLUPL, - /* mSrtIdx */ ALWAYS_BTK_VLUPL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VLUPL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VLUPL_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VLUPL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VLUPL_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x03, @@ -4787,10 +4787,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x05: dItemNo_PURPLE_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VLUPL, - /* mSrtIdx */ ALWAYS_BTK_VLUPL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VLUPL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VLUPL_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VLUPL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VLUPL_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -4804,10 +4804,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x06: dItemNo_ORANGE_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VLUPL, - /* mSrtIdx */ ALWAYS_BTK_VLUPL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VLUPL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VLUPL_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VLUPL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VLUPL_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x05, @@ -4821,8 +4821,8 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x07: dItemNo_HEART_PIECE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VHKAL, - /* mSrtIdx */ ALWAYS_BTK_VHKAL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VHKAL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VHKAL_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -4838,8 +4838,8 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x08: dItemNo_HEART_CONTAINER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VHUTL, - /* mSrtIdx */ ALWAYS_BTK_VHUTL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VHUTL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VHUTL_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -4855,7 +4855,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x09: dItemNo_SMALL_MAGIC_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_MPODA, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_MPODA_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4872,7 +4872,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0A: dItemNo_LARGE_MAGIC_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_MPODB, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_MPODB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4889,7 +4889,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0B: dItemNo_BOMB_5_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ LINK_BDL_BOMB, + /* mBmdIdx */ dRes_INDEX_LINK_BDL_BOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4906,7 +4906,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0C: dItemNo_BOMB_10_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ LINK_BDL_BOMB, + /* mBmdIdx */ dRes_INDEX_LINK_BDL_BOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4923,7 +4923,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0D: dItemNo_BOMB_20_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ LINK_BDL_BOMB, + /* mBmdIdx */ dRes_INDEX_LINK_BDL_BOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4940,7 +4940,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0E: dItemNo_BOMB_30_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ LINK_BDL_BOMB, + /* mBmdIdx */ dRes_INDEX_LINK_BDL_BOMB_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4957,10 +4957,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0F: dItemNo_SILVER_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VLUPL, - /* mSrtIdx */ ALWAYS_BTK_VLUPL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VLUPL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VLUPL_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VLUPL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VLUPL_e, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x06, @@ -4974,7 +4974,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x10: dItemNo_ARROW_10_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_ARROWITEM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4991,7 +4991,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x11: dItemNo_ARROW_20_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_ARROWITEM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5008,7 +5008,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x12: dItemNo_ARROW_30_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_ARROWITEM_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5051,7 +5051,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x15: dItemNo_SMALL_KEY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VKEYL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VKEYL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5068,12 +5068,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x16: dItemNo_RECOVER_FAIRY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_FA, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_FA_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_FA, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_FA_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x4000 @@ -5172,7 +5172,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x1E: dItemNo_TRIPLE_HEART_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VHRTL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VHRTL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5185,12 +5185,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x1F: dItemNo_JOY_PENDANT_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VHAPL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VHAPL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VHAPL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VHAPL_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -5462,7 +5462,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x34: dItemNo_DEKU_LEAF_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VLEAF], - /* mBmdIdx */ VLEAF_BDL_VLEAF, + /* mBmdIdx */ dRes_INDEX_VLEAF_BDL_VLEAF_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5475,7 +5475,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x35: dItemNo_MAGIC_ARROW_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ LINK_BDL_ARROW, + /* mBmdIdx */ dRes_INDEX_LINK_BDL_ARROW_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5488,7 +5488,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x36: dItemNo_LIGHT_ARROW_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ LINK_BDL_ARROW, + /* mBmdIdx */ dRes_INDEX_LINK_BDL_ARROW_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5514,7 +5514,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x38: dItemNo_SWORD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSWON], - /* mBmdIdx */ VSWON_BDL_VSWON, + /* mBmdIdx */ dRes_INDEX_VSWON_BDL_VSWON_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5553,7 +5553,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x3B: dItemNo_SHIELD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSHIN], - /* mBmdIdx */ VSHIN_BDL_VSHIN, + /* mBmdIdx */ dRes_INDEX_VSHIN_BDL_VSHIN_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5579,7 +5579,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x3D: dItemNo_DROPPED_SWORD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSWON], - /* mBmdIdx */ VSWON_BDL_VSWON, + /* mBmdIdx */ dRes_INDEX_VSWON_BDL_VSWON_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5683,12 +5683,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x45: dItemNo_SKULL_NECKLACE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VDOKL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VDOKL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VDOKL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VDOKL_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -5700,12 +5700,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x46: dItemNo_BOKOBABA_SEED_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VBOKL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VBOKL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VBOKL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VBOKL_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -5717,12 +5717,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x47: dItemNo_GOLDEN_FEATHER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VHANL, - /* mSrtIdx */ ALWAYS_BTK_VHANL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VHANL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VHANL_e, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VHANL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VHANL_e, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VHANL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VHANL_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000222, #if VERSION == VERSION_DEMO @@ -5734,12 +5734,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x48: dItemNo_KNIGHTS_CREST_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VBELL, - /* mSrtIdx */ ALWAYS_BTK_VBELL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VBELL_e, + /* mSrtIdx */ dRes_INDEX_ALWAYS_BTK_VBELL_e, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VBELL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VBELL_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000222, #if VERSION == VERSION_DEMO @@ -5751,12 +5751,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x49: dItemNo_RED_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VCHUL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VCHUL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VCHUL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VCHUL_e, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VCHUL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VCHUL_e, /* mTevFrm */ 0x01, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -5768,12 +5768,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x4A: dItemNo_GREEN_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VCHUL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VCHUL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VCHUL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VCHUL_e, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VCHUL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VCHUL_e, /* mTevFrm */ 0x00, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -5785,12 +5785,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x4B: dItemNo_BLUE_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VCHUL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VCHUL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ ALWAYS_BRK_VCHUL, + /* mTevIdx */ dRes_INDEX_ALWAYS_BRK_VCHUL_e, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VCHUL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VCHUL_e, /* mTevFrm */ 0x02, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -6504,12 +6504,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x82: dItemNo_BIRD_BAIT_5_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ ALWAYS_BDL_VESAL, + /* mBmdIdx */ dRes_INDEX_ALWAYS_BDL_VESAL_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ ALWAYS_BCK_VESAL, + /* mBckIdx */ dRes_INDEX_ALWAYS_BCK_VESAL_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -6521,7 +6521,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x83: dItemNo_HYOI_PEAR_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VHYOI], - /* mBmdIdx */ VHYOI_BDL_VHYOI, + /* mBmdIdx */ dRes_INDEX_VHYOI_BDL_VHYOI_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6642,12 +6642,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x8C: dItemNo_TOWN_FLOWER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x58], - /* mBmdIdx */ FDAI_BDL_FOBJ00, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ00_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ FDAI_BCK_FOBJ00, + /* mBckIdx */ dRes_INDEX_FDAI_BCK_FOBJ00_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -6659,12 +6659,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x8D: dItemNo_SEA_FLOWER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x59], - /* mBmdIdx */ FDAI_BDL_FOBJ01, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ01_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ FDAI_BCK_FOBJ01, + /* mBckIdx */ dRes_INDEX_FDAI_BCK_FOBJ01_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -6676,12 +6676,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x8E: dItemNo_EXOTIC_FLOWER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ FDAI_BDL_FOBJ02, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ02_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ FDAI_BCK_FOBJ02, + /* mBckIdx */ dRes_INDEX_FDAI_BCK_FOBJ02_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -6693,7 +6693,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x8F: dItemNo_HEROS_FLAG_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ FDAI_BDL_FOBJ03, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ03_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6710,7 +6710,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x90: dItemNo_BIG_CATCH_FLAG_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ FDAI_BDL_FOBJ04, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ04_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6727,12 +6727,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x91: dItemNo_BIG_SALE_FLAG_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ FDAI_BDL_FOBJ05, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ05_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ FDAI_BCK_FOBJ05, + /* mBckIdx */ dRes_INDEX_FDAI_BCK_FOBJ05_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x1200 @@ -6740,12 +6740,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x92: dItemNo_PINWHEEL_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], - /* mBmdIdx */ FDAI_BDL_FOBJ06, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ06_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ FDAI_BCK_FOBJ06, + /* mBckIdx */ dRes_INDEX_FDAI_BCK_FOBJ06_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, #if VERSION == VERSION_DEMO @@ -6757,12 +6757,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x93: dItemNo_SICKLE_MOON_FLAG_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ FDAI_BDL_FOBJ07, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ07_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ FDAI_BCK_FOBJ07, + /* mBckIdx */ dRes_INDEX_FDAI_BCK_FOBJ07_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x1200 @@ -6770,12 +6770,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x94: dItemNo_SKULL_TOWER_IDOL_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5C], - /* mBmdIdx */ FDAI_BDL_FOBJ08, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ08_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ FDAI_BCK_FOBJ08, + /* mBckIdx */ dRes_INDEX_FDAI_BCK_FOBJ08_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x1000 @@ -6783,7 +6783,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x95: dItemNo_FOUNTAIN_IDOL_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x64], - /* mBmdIdx */ FDAI_BDL_FOBJ09, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ09_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6796,7 +6796,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x96: dItemNo_POSTMAN_STATUE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], - /* mBmdIdx */ FDAI_BDL_FOBJ10, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ10_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6809,12 +6809,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x97: dItemNo_SHOP_GURU_STATUE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], - /* mBmdIdx */ FDAI_BDL_FOBJ11, + /* mBmdIdx */ dRes_INDEX_FDAI_BDL_FOBJ11_e, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ FDAI_BCK_FOBJ11, + /* mBckIdx */ dRes_INDEX_FDAI_BCK_FOBJ11_e, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x1000 diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 9cbb0d7ac..2fb04d0b1 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -691,8 +691,8 @@ void dKyr_sun_move() { /* 8008CF68-8008D0B4 .text dKyr_rain_init__Fv */ void dKyr_rain_init() { camera_class * pCamera = (camera_class*)dComIfGp_getCamera(0); - g_env_light.mpRainPacket->mpTxSnow01 = (u8*)dComIfG_getObjectRes("Always", ALWAYS_I8_TX_SNOW01); - g_env_light.mpRainPacket->mpTxRingAHalf = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_RING_A_32HAFE); + g_env_light.mpRainPacket->mpTxSnow01 = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_I8_TX_SNOW01_e); + g_env_light.mpRainPacket->mpTxRingAHalf = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_RING_A_32HAFE_e); g_env_light.mpRainPacket->mCamEyePos = pCamera->mLookat.mEye; g_env_light.mpRainPacket->mCamCenterPos = pCamera->mLookat.mCenter; g_env_light.mpRainPacket->mCenterDeltaMul = 0.0f; @@ -1233,7 +1233,7 @@ void dKyr_snow_init() { g_env_light.mpSnowPacket = new(0x20) dKankyo_snow_Packet(); if (g_env_light.mpSnowPacket != NULL) { if (strcmp(dComIfGp_getStartStageName(), "Adanmae") != 0) { - g_env_light.mpSnowPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", ALWAYS_I8_TX_SNOW01); + g_env_light.mpSnowPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_I8_TX_SNOW01_e); } else { g_env_light.mpSnowPacket->mpTexture = (u8*)dComIfG_getStageRes("Stage", "ak_kazanbai00.bti"); } @@ -1264,7 +1264,7 @@ void dKyr_kazanbai_tamari_move() { void dKyr_star_init() { g_env_light.mpStarPacket = new(0x20) dKankyo_star_Packet(); if (g_env_light.mpStarPacket != NULL) { - g_env_light.mpStarPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", ALWAYS_I8_TX_SNOW01); + g_env_light.mpStarPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_I8_TX_SNOW01_e); g_env_light.mpStarPacket->mEffect[0].mSin = 1.0f; g_env_light.mpStarPacket->mEffectNum = 0; } @@ -1743,7 +1743,7 @@ void poison_init() { g_env_light.mpPoisonPacket->field_0xbb9c.z = 0.0f; g_env_light.mpPoisonPacket->mCount = 0; if (g_env_light.mpPoisonPacket != NULL) { - g_env_light.mpPoisonPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_AK_SMOKE01); + g_env_light.mpPoisonPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_AK_SMOKE01_e); for (u32 i = 0; i < ARRAY_SIZE(g_env_light.mpPoisonPacket->mEff); i++) g_env_light.mpPoisonPacket->mEff[i].mStatus = 0; poison_move(); diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index e4ef004e5..6c65810d5 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -480,15 +480,15 @@ void wether_move_sun() { if (g_env_light.mpSunPacket != NULL && g_env_light.mpSunlenzPacket != NULL) { g_env_light.mpSunPacket->mpTextureData[0] = - (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TUKI_AS); + (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_TUKI_AS_e); g_env_light.mpSunPacket->mpTextureData[1] = - (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TUKI_BS); + (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_TUKI_BS_e); g_env_light.mpSunPacket->mpTextureData[2] = - (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TUKI_CS); + (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_TUKI_CS_e); g_env_light.mpSunPacket->mpTextureData[3] = - (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TUKI_DS); + (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_TUKI_DS_e); g_env_light.mpSunPacket->mpTextureData[4] = - (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TAIYO); + (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_TAIYO_e); g_env_light.mpSunPacket->field_0x3c = 0; g_env_light.mpSunPacket->field_0x3d = 0; g_env_light.mpSunPacket->mVisibility = 0.0f; @@ -500,11 +500,11 @@ void wether_move_sun() { g_env_light.mpSunPacket->mVizChkData[3] = 0; g_env_light.mpSunlenzPacket->mpTexSnow01 = - (u8*)dComIfG_getObjectRes("Always", ALWAYS_I8_TX_SNOW01); + (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_I8_TX_SNOW01_e); g_env_light.mpSunlenzPacket->mpTexLensHalf = - (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_LENS_32HALF); + (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_LENS_32HALF_e); g_env_light.mpSunlenzPacket->mpTexRingHalf = - (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_RING_A_32HAFE); + (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_RING_A_32HAFE_e); g_env_light.mpSunlenzPacket->field_0x88 = 1000000000.0f; // This is not G_CM3D_F_INF g_env_light.mpSunlenzPacket->field_0x8c = 0.0f; g_env_light.mpSunlenzPacket->mDistFalloff = 0.0f; @@ -689,7 +689,7 @@ void wether_move_housi() { return; } - g_env_light.mpHousiPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_AK_HOUSHI00); + g_env_light.mpHousiPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_AK_HOUSHI00_e); g_env_light.mpHousiPacket->field_0x5ddc = 0.0f; for (int i = 0; i < 300; i++) { @@ -722,7 +722,7 @@ void wether_move_moya() { return; } - g_env_light.mpMoyaPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_MOYA_B_64); + g_env_light.mpMoyaPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_MOYA_B_64_e); for (int i = 0; i < 100; i++) { g_env_light.mpMoyaPacket->mEff[i].mStatus = 0; @@ -855,8 +855,8 @@ void wether_move_wave() { return; } - g_env_light.mpWavePacket->mpTexUsonami = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_USONAMI_256_64MIP); - g_env_light.mpWavePacket->mpTexUsonamiM = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_USONAMI_M_256_64MIP); + g_env_light.mpWavePacket->mpTexUsonami = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_USONAMI_256_64MIP_e); + g_env_light.mpWavePacket->mpTexUsonamiM = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_USONAMI_M_256_64MIP_e); for (int i = 0; i < 300; i++) { g_env_light.mpWavePacket->mEff[i].mStatus = 0; diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 5a58c553b..f96cb3893 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -112,7 +112,7 @@ cPhs_State dThunder_c::create() { camera_class *pCamera = (camera_class*)dComIfGp_getCamera(0); new (this) dThunder_c(); - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_YTHDR00); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_YTHDR00_e); JUT_ASSERT(DEMO_SELECT(111, 110), modelData != NULL); mModelInfo.mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x01000200); @@ -122,12 +122,12 @@ cPhs_State dThunder_c::create() { if (!mModelInfo.mInvisModel.create(mModelInfo.mpModel)) return cPhs_ERROR_e; - J3DAnmTextureSRTKey * anm = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("Always", ALWAYS_BTK_YTHDR00); + J3DAnmTextureSRTKey * anm = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTK_YTHDR00_e); JUT_ASSERT(DEMO_SELECT(126, 125), anm != NULL); if (!mModelInfo.mBtk.init(modelData, anm, false, J3DFrameCtrl::EMode_LOOP)) return cPhs_ERROR_e; - J3DAnmTevRegKey * canm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Always", ALWAYS_BRK_YTHDR00); + J3DAnmTevRegKey * canm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BRK_YTHDR00_e); JUT_ASSERT(DEMO_SELECT(141, 140), canm != NULL); if (!mModelInfo.mBrk.init(modelData, canm, true, J3DFrameCtrl::EMode_NONE)) return cPhs_ERROR_e; diff --git a/src/d/d_magma.cpp b/src/d/d_magma.cpp index 7dd4a77f5..fb4b0fe35 100644 --- a/src/d/d_magma.cpp +++ b/src/d/d_magma.cpp @@ -7,7 +7,7 @@ #include "d/d_magma.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" -#include "d/res/res_magma.h" +#include "res/Object/Magma.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" @@ -281,13 +281,13 @@ Mtx dMagma_packet_c::mBallMtx; dMagma_packet_c::dMagma_packet_c() { dComIfG_setObjectRes("Magma", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL); - ResTIMG* kuro = (ResTIMG*)dComIfG_getObjectRes("Magma", MAGMA_BTI_MAG_KURO); + ResTIMG* kuro = (ResTIMG*)dComIfG_getObjectRes("Magma", dRes_INDEX_MAGMA_BTI_MAG_KURO_e); mDoLib_setResTimgObj(kuro, &mKuroTexObj, 0, NULL); C_MTXLightOrtho(l_kuroOrthoMtx, 1.0f, -1.0f, -1.0f, 1.0f, 0.5f, -0.5f, 0.5f, 0.5f); mDoMtx_copy(l_kuroOrthoMtx, l_colOrthoMtx); - ResTIMG* col = (ResTIMG*)dComIfG_getObjectRes("Magma", MAGMA_BTI_MAG_COL); + ResTIMG* col = (ResTIMG*)dComIfG_getObjectRes("Magma", dRes_INDEX_MAGMA_BTI_MAG_COL_e); mDoLib_setResTimgObj(col, &mColTexObj, 0, NULL); mDoMtx_identity(mFloorMtx); mDoMtx_identity(mBallMtx); diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index ae2ba0533..31ebe7e00 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_agb.h" #include "d/d_com_inf_game.h" #include "d/d_stage.h" -#include "d/res/res_always.h" +#include "res/Object/Always.h" #include "f_ap/f_ap_game.h" #include "m_Do/m_Do_gba_com.h" #include "m_Do/m_Do_lib.h" @@ -876,14 +876,14 @@ void dMap_c::create() { /* Nonmatching */ static const GXColor l_cursorColor = {255, 255, 0, 255}; static const int frameArcIdx[] = { - ALWAYS_BTI_MAP_FRAME1, - ALWAYS_BTI_MAP_FRAME3, - ALWAYS_BTI_MAP_FRAME2, - ALWAYS_BTI_MAP_FRAME4, - ALWAYS_BTI_MAP_FRAME1, - ALWAYS_BTI_MAP_FRAME3, - ALWAYS_BTI_MAP_FRAME1, - ALWAYS_BTI_MAP_FRAME2, + dRes_INDEX_ALWAYS_BTI_MAP_FRAME1_e, + dRes_INDEX_ALWAYS_BTI_MAP_FRAME3_e, + dRes_INDEX_ALWAYS_BTI_MAP_FRAME2_e, + dRes_INDEX_ALWAYS_BTI_MAP_FRAME4_e, + dRes_INDEX_ALWAYS_BTI_MAP_FRAME1_e, + dRes_INDEX_ALWAYS_BTI_MAP_FRAME3_e, + dRes_INDEX_ALWAYS_BTI_MAP_FRAME1_e, + dRes_INDEX_ALWAYS_BTI_MAP_FRAME2_e, }; static const f32 cord[][4] = { {0.0f, 0.0f, 1.0f, 1.0f}, @@ -973,27 +973,27 @@ void dMap_c::create() { mFrameTexture[i].setScroll(cord[i][0], cord[i][1], cord[i][2], cord[i][3]); mFrameTex[i].init(1, &mFrameTexture[i]); } - timg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_CAMERA_FREE); + timg = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_CAMERA_FREE_e); JUT_ASSERT(3476, timg != NULL); mIconFreeTexture.init(timg, 10, (GXColor){255, 210, 0, 255}); mIconFreeTexture.field_0x0 = 1; mIconFreeTexture.setScroll(0.0f, 0.0f, 1.0f, 1.0f); mIconFreeTex.init(1, &mIconFreeTexture); - timg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_CAMERA_SELF); + timg = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_CAMERA_SELF_e); JUT_ASSERT(3489, timg != NULL); mIconSelfTexture.init(timg, 10, (GXColor){255, 222, 255, 255}); mIconSelfTexture.field_0x0 = 1; mIconSelfTexture.setScroll(0.0f, 0.0f, 1.0f, 1.0f); mIconSelfTex.init(1, &mIconSelfTexture); - timg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_F_SHIPICON); + timg = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_F_SHIPICON_e); JUT_ASSERT(3502, timg != NULL); mShip.init(timg, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 1.0f, 1.0f, 0); - timg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TREASUREBOX); + timg = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TREASUREBOX_e); JUT_ASSERT(3511, timg != NULL); for (int i = 0; i < 8; i++) { mTbox[i].init(timg, 0.0f, 0.0f, 0.0f, 0.0f, 1, 0, 0, 1.0f, 1.0f, 0); } - timg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_BLACK_WHITE_2); + timg = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_BLACK_WHITE_2_e); for (int i = 0; i < 16; i++) { mDoor[i].init(timg, 0.0f, 0.0f, 0.0f, 0.0f, 1, 0, 0, 1.0f, 1.0f, 0); } diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index f46b8e074..92d9af8ed 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -634,7 +634,7 @@ void dPa_control_c::createCommon(const void* param_1) { mEmitterMng = new(mHeap, 0) JPAEmitterManager(mCommonResMng, 3000, 150, 200, mHeap); JUT_ASSERT(1324, mEmitterMng != NULL); JKRHeap* oldHeap = mDoExt_setCurrentHeap(mHeap); - mModelControl = new dPa_modelControl_c((J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPM_TUBO)); + mModelControl = new dPa_modelControl_c((J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPM_TUBO_e)); JUT_ASSERT(1332, mModelControl != NULL); for (u16 i = 0; i < 8; i++) { u16 id = dPa_name::j_o_id[i]; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index de30ecc1f..4c7a6155d 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -5,8 +5,8 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_logo.h" -#include "d/res/res_logo.h" -#include "d/res/res_system.h" +#include "res/Object/Logo.h" +#include "res/Object/System.h" #include "f_op/f_op_scene.h" #include "f_op/f_op_scene_mng.h" #include "c/c_dylink.h" @@ -582,7 +582,7 @@ static BOOL dScnLogo_Delete(dScnLogo_c* i_this) { delete l_lodCommand; #endif - ResTIMG * timg = (ResTIMG *)dComIfG_getObjectRes("Always", ALWAYS_I4_BALL128B); + ResTIMG * timg = (ResTIMG *)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_I4_BALL128B_e); dDlst_shadowControl_c::setSimpleTex(timg); dComIfG_deleteObjectRes("Logo"); dComIfGp_setWindowNum(0); @@ -681,12 +681,12 @@ cPhs_State phase_1(dScnLogo_c* i_this) { ResTIMG * toonImage; - toonImage = (ResTIMG *)dComIfG_getObjectRes("System", SYSTEM_BTI_TOON); + toonImage = (ResTIMG *)dComIfG_getObjectRes("System", dRes_INDEX_SYSTEM_BTI_TOON_e); JUT_ASSERT(VERSION_SELECT(1208, 1208, 1426, 1466), toonImage != NULL); dDlst_list_c::setToonImage(toonImage); - toonImage = (ResTIMG *)dComIfG_getObjectRes("System", SYSTEM_BTI_TOONEX); + toonImage = (ResTIMG *)dComIfG_getObjectRes("System", dRes_INDEX_SYSTEM_BTI_TOONEX_e); JUT_ASSERT(VERSION_SELECT(1213, 1213, 1431, 1471), toonImage != NULL); dDlst_list_c::setToonExImage(toonImage); @@ -718,7 +718,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) { ResTIMG * timg; - timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_NINTENDO_376X104); + timg = (ResTIMG *)dComIfG_getObjectRes("Logo", dRes_INDEX_LOGO_BTI_NINTENDO_376X104_e); JUT_ASSERT(VERSION_SELECT(1264, 1264, 1482, 1522), timg != NULL); i_this->nintendoImg = new dDlst_2D_c(timg, 133, 170, 0); JUT_ASSERT(VERSION_SELECT(1267, 1267, 1485, 1525), i_this->nintendoImg != NULL); @@ -731,7 +731,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) { i_this->nintendoImg->getPicture()->setWhite((GXColor){0xDC, 0x00, 0x00, 0xFF}); #endif - timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_TITLE_DOLBY_MARK); + timg = (ResTIMG *)dComIfG_getObjectRes("Logo", dRes_INDEX_LOGO_BTI_TITLE_DOLBY_MARK_e); JUT_ASSERT(VERSION_SELECT(1276, 1276, 1498, 1538), timg != NULL); i_this->dolbyImg = new dDlst_2D_c(timg, 218, 166, 0); JUT_ASSERT(VERSION_SELECT(1280, 1280, 1502, 1542), i_this->dolbyImg != NULL); @@ -739,46 +739,46 @@ cPhs_State phase_2(dScnLogo_c* i_this) { #if VERSION == VERSION_PAL static const u8 choice[] = { - LOGO_BTI_PROGRESSIVE_CHOICE, - LOGO_BTI_PROGRESSIVE_CHOICE_GM, - LOGO_BTI_PROGRESSIVE_CHOICE_FR, - LOGO_BTI_PROGRESSIVE_CHOICE_SP, - LOGO_BTI_PROGRESSIVE_CHOICE_IT, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_CHOICE_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_CHOICE_GM_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_CHOICE_FR_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_CHOICE_SP_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_CHOICE_IT_e, }; static const u8 yes[] = { - LOGO_BTI_PROGRESSIVE_YES, - LOGO_BTI_PROGRESSIVE_YES_GM, - LOGO_BTI_PROGRESSIVE_YES_FR, - LOGO_BTI_PROGRESSIVE_YES_SP, - LOGO_BTI_PROGRESSIVE_YES_IT, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_YES_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_YES_GM_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_YES_FR_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_YES_SP_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_YES_IT_e, }; static const u8 no[] = { - LOGO_BTI_PROGRESSIVE_NO, - LOGO_BTI_PROGRESSIVE_NO_GM, - LOGO_BTI_PROGRESSIVE_NO_FR, - LOGO_BTI_PROGRESSIVE_NO_SP, - LOGO_BTI_PROGRESSIVE_NO_IT, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_NO_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_NO_GM_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_NO_FR_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_NO_SP_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_NO_IT_e, }; static const u8 prog[] = { - LOGO_BTI_PROGRESSIVE_PRO, - LOGO_BTI_PROGRESSIVE_PRO_GM, - LOGO_BTI_PROGRESSIVE_PRO_FR, - LOGO_BTI_PROGRESSIVE_PRO_SP, - LOGO_BTI_PROGRESSIVE_PRO_IT, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_PRO_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_PRO_GM_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_PRO_FR_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_PRO_SP_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_PRO_IT_e, }; static const u8 intr[] = { - LOGO_BTI_PROGRESSIVE_INTER, - LOGO_BTI_PROGRESSIVE_INTER_GM, - LOGO_BTI_PROGRESSIVE_INTER_FR, - LOGO_BTI_PROGRESSIVE_INTER_SP, - LOGO_BTI_PROGRESSIVE_INTER_IT, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_INTER_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_INTER_GM_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_INTER_FR_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_INTER_SP_e, + dRes_INDEX_LOGO_BTI_PROGRESSIVE_INTER_IT_e, }; #endif #if VERSION == VERSION_PAL timg = (ResTIMG *)dComIfG_getObjectRes("Logo", choice[dComIfGs_getPalLanguage()]); #else - timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_CHOICE); + timg = (ResTIMG *)dComIfG_getObjectRes("Logo", dRes_INDEX_LOGO_BTI_PROGRESSIVE_CHOICE_e); #endif JUT_ASSERT(VERSION_SELECT(1286, 1286, 1565, 1605), timg != NULL); i_this->progchoiceImg = new dDlst_2D_c(timg, 113, 281, 0); @@ -788,7 +788,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) { #if VERSION == VERSION_PAL timg = (ResTIMG *)dComIfG_getObjectRes("Logo", yes[dComIfGs_getPalLanguage()]); #else - timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_YES); + timg = (ResTIMG *)dComIfG_getObjectRes("Logo", dRes_INDEX_LOGO_BTI_PROGRESSIVE_YES_e); #endif JUT_ASSERT(VERSION_SELECT(1295, 1295, 1579, 1619), timg != NULL); i_this->progyesImg = new dDlst_2D_c(timg, 211, 372, 0); @@ -799,7 +799,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) { #if VERSION == VERSION_PAL timg = (ResTIMG *)dComIfG_getObjectRes("Logo", no[dComIfGs_getPalLanguage()]); #else - timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_NO); + timg = (ResTIMG *)dComIfG_getObjectRes("Logo", dRes_INDEX_LOGO_BTI_PROGRESSIVE_NO_e); #endif JUT_ASSERT(VERSION_SELECT(1305, 1305, 1594, 1634), timg != NULL); i_this->prognoImg = new dDlst_2D_c(timg, 350, 372, 0); @@ -810,7 +810,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) { #if VERSION == VERSION_PAL timg = (ResTIMG *)dComIfG_getObjectRes("Logo", prog[dComIfGs_getPalLanguage()]); #else - timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_PRO); + timg = (ResTIMG *)dComIfG_getObjectRes("Logo", dRes_INDEX_LOGO_BTI_PROGRESSIVE_PRO_e); #endif JUT_ASSERT(VERSION_SELECT(1315, 1315, 1609, 1649), timg != NULL); i_this->progImg = new dDlst_2D_c(timg, 153, 309, 0); @@ -820,7 +820,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) { #if VERSION == VERSION_PAL timg = (ResTIMG *)dComIfG_getObjectRes("Logo", intr[dComIfGs_getPalLanguage()]); #else - timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_INTER); + timg = (ResTIMG *)dComIfG_getObjectRes("Logo", dRes_INDEX_LOGO_BTI_PROGRESSIVE_INTER_e); #endif JUT_ASSERT(VERSION_SELECT(1324, 1324, 1623, 1663), timg != NULL); i_this->interImg = new dDlst_2D_c(timg, 153, 309, 0); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 6151adfbd..6f6863b39 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -1283,8 +1283,8 @@ cPhs_State phase_1(dScnPly_ply_c* i_this) { int rt = dComIfG_setStageRes("Stage", NULL); JUT_ASSERT(VERSION_SELECT(3443, 3443, 3458, 3458), rt == 1); - dMat_control_c::create((J3DMaterialTable*)dComIfG_getObjectRes("Always", ALWAYS_BMT_ICE), - (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_ICE)); + dMat_control_c::create((J3DMaterialTable*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BMT_ICE_e), + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTK_ICE_e)); return cPhs_NEXT_e; } diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 5f23992a3..c83faee21 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -5,7 +5,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_throwstone.h" -#include "d/res/res_aisi.h" +#include "res/Object/Aisi.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" @@ -22,7 +22,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_actor) { /* 8023B564-8023B5DC .text CreateHeap__14daThrowstone_cFv */ BOOL daThrowstone_c::CreateHeap() { - J3DModelData* pModelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, AISI_INDEX_BDL_AISI); + J3DModelData* pModelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_AISI_BDL_AISI_e); if (pModelData == NULL) return FALSE; diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp index 1f5449cb2..765ff98d8 100644 --- a/src/d/d_wind_arrow.cpp +++ b/src/d/d_wind_arrow.cpp @@ -6,7 +6,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_wind_arrow.h" #include "d/d_kankyo_wether.h" -#include "d/res/res_always.h" +#include "res/Object/Always.h" #include "m_Do/m_Do_graphic.h" #include "f_op/f_op_kankyo_mng.h" #include "JSystem/JKernel/JKRSolidHeap.h" @@ -110,7 +110,7 @@ static BOOL dWindArrow_Delete(dWindArrow_c* i_this) { cPhs_State dWindArrow_c::create() { new (this) dWindArrow_c(); - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_YA); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_YA_e); JUT_ASSERT(0x56, modelData != NULL); mModelInfo.mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x200); @@ -122,7 +122,7 @@ cPhs_State dWindArrow_c::create() { return cPhs_ERROR_e; } - J3DAnmTextureSRTKey* anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_YA); + J3DAnmTextureSRTKey* anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTK_YA_e); JUT_ASSERT(0x65, anm != NULL); if (!mModelInfo.mBtkAnm.init(modelData, anm, TRUE, J3DFrameCtrl::EMode_LOOP)) {