diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-04-25 12:36:12 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-04-25 12:36:12 -0400 |
| commit | e235db537908cf03fcc6aefbb6c62bea148c48cd (patch) | |
| tree | ad4650570abcbf198bde6e5bbfd59f1d7966106a | |
| parent | ae0bc3ff9507a9b0bdbdf17e6a4ca0613cd66e6f (diff) | |
Use resource enums for all other old actors
30 files changed, 729 insertions, 542 deletions
diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index ce9cee43..3b6b926f 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -4,6 +4,8 @@ // #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 "f_op/f_op_kankyo_mng.h" #include "d/d_com_inf_game.h" @@ -14,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] = { 0x05, 0x05, 0x04, }; -const s16 daFan_c::m_dzbidx[3] = { 0x0C, 0x0C, 0x07, }; +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 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, }, }; diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index 2b7072d7..a3ce87ca 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/src/d/actor/d_a_floor.cpp @@ -62,7 +62,7 @@ s32 daFloor_c::_create() { s32 rt = dComIfG_resLoad(&mPhs, m_arcname); if (rt == cPhs_COMPLEATE_e) { - if (!MoveBGCreate(m_arcname, 0x07, NULL, 0x8A0)) + if (!MoveBGCreate(m_arcname, HHYU1_DZB_HHYU1, NULL, 0x8A0)) return cPhs_ERROR_e; } return rt; diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index bee24590..f5b2f713 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_ikari.h" +#include "d/res/res_ikari.h" #include "d/d_kankyo_wether.h" #include "d/d_procname.h" #include "d/d_s_play.h" @@ -33,7 +34,13 @@ void daIkari_c::setMtx() { /* 000001C4-00000290 .text _createHeap__9daIkari_cFv */ BOOL daIkari_c::_createHeap() { - static int ikari_bdl[5] = {0x03, 0x03, 0x03, 0x04, 0x05}; + static int ikari_bdl[5] = { + IKARI_BDL_S_IKARI2, + IKARI_BDL_S_IKARI2, + IKARI_BDL_S_IKARI2, + IKARI_BDL_S_IKARI3, + IKARI_BDL_S_IKARI4, + }; J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, ikari_bdl[mModelType])); diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index b7b3774a..f93fe9e5 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -28,7 +28,7 @@ BOOL daItemBase_c::clothCreate() { } /* 800F8A44-800F9074 .text CreateItemHeap__12daItemBase_cFPCcsssssss */ -BOOL daItemBase_c::CreateItemHeap(const char* resName, short resIdx, short btkAnm1, short btkAnm2, short brkAnm1, short brkAnm2, short bckAnm, short) { +BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, s16 btkAnm2, s16 brkAnm1, s16 brkAnm2, s16 bckAnm, s16) { JUT_ASSERT(78, 0 <= m_itemNo && m_itemNo <= 255); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(resName, resIdx); diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 9ebcc4b3..5a51960b 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_npc_ji1.h" +#include "d/res/res_ji.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_snap.h" @@ -2457,146 +2458,146 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { switch(param_1) { case 0: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x38)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_WAIT01)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1C); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WAIT01); break; case 1: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x39)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_WAIT02)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1D); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WAIT02); break; case 2: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x32)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TALK01)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x16); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TALK01); break; case 3: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x33)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TALK02)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x17); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TALK02); break; case 4: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x24)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_AKIRE)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x8); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_AKIRE); break; case 5: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2C)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_KAMAE)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x10); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_KAMAE); break; case 6: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2D)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_KROT)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x11); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_KROT); speed = l_HIO.field_0x48; break; case 7: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2A)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_INASI)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xE); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_INASI); speed = l_HIO.field_0x44; break; case 8: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x35)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TATEGUARD)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x19); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TATEGUARD); break; case 9: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x3B)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_YKGUARD)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1F); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_YKGUARD); break; case 10: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2B)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_JPGUARD)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xF); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_JPGUARD); break; case 11: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x36)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TOKAMAE)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1A); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TOKAMAE); break; case 12: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x31)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_REI)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x15); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_REI); break; case 13: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x3A)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_WARAI)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1E); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_WARAI); speed = l_HIO.field_0x4C; break; case 14: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2B)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_JPGUARD)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xF); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_JPGUARD); speed = 2.0f; break; case 15: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x29)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_GUARD)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xD); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_GUARD); speed = 2.0f; break; case 16: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x27)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_BTKAMASI)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xB); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BTKAMASI); break; case 17: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x26)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_BTKAMAE)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xA); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BTKAMAE); break; case 18: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x37)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_UDEGUMI)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x1B); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_UDEGUMI); break; case 19: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x34)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_TATEATTACK)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x18); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_TATEATTACK); break; case 20: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x3C)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_YOKOATTACK)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x20); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_YOKOATTACK); break; case 21: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x30)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_ODOROKU)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x14); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_ODOROKU); break; case 22: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x25)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_BIBIRI)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x9); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_BIBIRI); BackSlideInit(); if(field_0xD84 == 1) { @@ -2605,9 +2606,9 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { break; case 23: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2E)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_NAKU)); temp2 = 2; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x12); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NAKU); if(field_0x430 == 0) { field_0x430 = dComIfGp_particle_set(0x81A4, ¤t.pos); @@ -2616,15 +2617,15 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { break; case 24: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x2F)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_NUGUI)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0x13); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NUGUI); break; case 25: - temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", 0x28)); + temp1 = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Ji", JI_BCK_JI_DAMAGE)); temp2 = 0; - pSoundAnimRes = dComIfG_getObjectRes("Ji", 0xC); + pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_DAMAGE); break; default: @@ -2633,10 +2634,10 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { field_0x330->setAnm(temp1, temp2, param_2, speed, 0.0f, -1.0f, pSoundAnimRes); if(field_0xD64 == 0x13) { - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", 0x3D), 2, 0.0f, 1.0f, 0.0f, -1.0f, 0); + mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK), 2, 0.0f, 1.0f, 0.0f, -1.0f, 0); } else if(field_0xD64 == 0x14) { - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", 0x3E), 2, 0.0f, 1.0f, 0.0f, -1.0f, 0); + mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_YOKOATTACK), 2, 0.0f, 1.0f, 0.0f, -1.0f, 0); } return true; @@ -2764,13 +2765,13 @@ s32 daNpc_Ji1_c::_create() { BOOL daNpc_Ji1_c::CreateHeap() { /* Nonmatching */ - J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", 0x42)); + J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", JI_BDL_JI)); field_0x330 = new mDoExt_McaMorf( modelData, NULL, NULL, - static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Ji", 0x3F)), + static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Ji", JI_BCK_WAIT01)), J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, - dComIfG_getObjectRes("Ji", 0x21), + dComIfG_getObjectRes("Ji", JI_BAS_WAIT01), 0x00000000, 0x11020203 ); @@ -2799,9 +2800,9 @@ BOOL daNpc_Ji1_c::CreateHeap() { JUT_ASSERT(0x15BA, handRJointNo >= 0); mpMorf = new mDoExt_McaMorf( - static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", 0x43)), + static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", JI_BDL_JI_YARI)), NULL, NULL, - static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Ji", 0x3D)), + static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK)), J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1, 1, 0, 0x00000000, @@ -2813,13 +2814,13 @@ BOOL daNpc_Ji1_c::CreateHeap() { return false; } - modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", 0x44)); + modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ji", JI_BDL_YJITR00)); field_0x3F8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); - J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Ji", 0x47)); + J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Ji", JI_BRK_YJITR00)); JUT_ASSERT(0x15CD, a_brk != 0); - J3DAnmTextureSRTKey* a_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Ji", 0x4A)); + J3DAnmTextureSRTKey* a_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Ji", JI_BTK_YJITR00)); JUT_ASSERT(0x15D0, a_btk != 0); int temp1 = field_0x3FC.init(modelData, a_brk, false, 2, 1.0f, 0, -1, false, 0); @@ -2829,7 +2830,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { return false; } - headTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Ji", 0x4D)); + headTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Ji", JI_BTP_JI)); JUT_ASSERT(0x15D8, headTexPattern != 0); if(field_0x3D8.init(modelData, headTexPattern, 1, 2, 1.0f, 0, -1, false, 0) == 0) { diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index be1d6f80..e2431578 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -1604,10 +1604,9 @@ void daNpc_Os_c::setAnm(int param_1) { }; static s8 l_anmTbl[] = { - 6, - 6, - 5, - 0 + OS_BCK_OS_MOVE01, + OS_BCK_OS_MOVE01, + OS_BCK_OS_AWAKE, }; static anmPrm_c l_anmPrm[] = { @@ -1680,32 +1679,32 @@ BOOL daNpc_Os_c::dNpc_Os_setAnm(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f /* 00004DD4-00004F48 .text initBrkAnm__10daNpc_Os_cFUcb */ BOOL daNpc_Os_c::initBrkAnm(u8 param_1, bool param_2) { struct AnmTableEntry { - u8 unk_1; - u32 unk_2; - f32 unk_3; - s32 unk_4; - }; + /* 0x00 */ u8 brkFileIndex; + /* 0x04 */ int loopMode; + /* 0x08 */ f32 speed; + /* 0x0C */ s32 unk_4; + }; // Size: 0x10 static AnmTableEntry brkAnmTbl[] = { - {0x0F, 0x00, 1.0f, 0}, - {0x0F, 0x00, 1.0f, -1}, - {0x0D, 0x00, 1.0f, 0}, - {0x0D, 0x00, -1.0f, 0}, - {0x10, 0x00, 1.0f, 0}, - {0x10, 0x00, 0.0f, 0}, - {0x0E, 0x02, 1.0f, 0}, - {0x0D, 0x00, 0.0f, -1}, - {0x0C, 0x02, 1.0f, 0}, + {OS_BRK_TURN_OFF, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0}, + {OS_BRK_TURN_OFF, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1}, + {OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0}, + {OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, -1.0f, 0}, + {OS_BRK_TURN_ON, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0}, + {OS_BRK_TURN_ON, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0}, + {OS_BRK_TENMETU, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0}, + {OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, -1}, + {OS_BRK_LINK, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0}, }; J3DModelData* modelData = mpMorf->getModel()->getModelData(); bool ret = false; if(field_0x7A2 != param_1) { - J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Os", brkAnmTbl[param_1].unk_1)); + J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Os", brkAnmTbl[param_1].brkFileIndex)); JUT_ASSERT(0xBB9, a_brk != 0); - if(mBrkAnm.init(modelData, a_brk, true, brkAnmTbl[param_1].unk_2, brkAnmTbl[param_1].unk_3, 0, -1, param_2, 0)) { + if(mBrkAnm.init(modelData, a_brk, TRUE, brkAnmTbl[param_1].loopMode, brkAnmTbl[param_1].speed, 0, -1, param_2, 0)) { field_0x7A2 = param_1; if(brkAnmTbl[param_1].unk_4 < 0) { mBrkAnm.setFrame(mBrkAnm.getEndFrame()); diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 23f6eadd..3596a22a 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_npc_roten.h" +#include "d/res/res_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" @@ -1389,72 +1390,72 @@ static char* l_npc_staff_id[] = { const char daNpcRoten_c::m_arcname[] = "Ro"; static const int l_bmd_ix_tbl[] = { - 0x02, - 0x02, - 0x02, + RO_BDL_RO, + RO_BDL_RO, + RO_BDL_RO, }; static const int l_bck_ix_tbl[][10] = { { - 0x00, - 0x04, - 0x07, - 0x05, - 0x06, - 0x0A, - 0x0B, - 0x08, - 0x09, - 0x13, + 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, }, { - 0x00, - 0x04, - 0x07, - 0x05, - 0x06, - 0x0A, - 0x0B, - 0x08, - 0x09, - 0x13, + 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, }, { - 0x00, - 0x04, - 0x07, - 0x05, - 0x06, - 0x0A, - 0x0B, - 0x08, - 0x09, - 0x13, + 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, }, }; static const int l_head_bmd_ix_tbl[] = { - 0x17, - 0x18, - 0x19, + RO_BDL_RO_HAT, + RO_BDL_RO_HAT2, + RO_BDL_RO_HAT3, }; static const int l_head_bck_ix_tbl[] = { - 0x12, - 0x10, - 0x11, + RO_BCK_HAT_WID, + RO_BCK_HAT2_WIND, + RO_BCK_HAT3_WID, }; static const int l_btp_ix_tbl[] = { - 0x03, - 0x03, - 0x03, + RO_BTP_RO, + RO_BTP_RO, + RO_BTP_RO, }; static const int l_bmt_ix_tbl[] = { -1, - 0x0E, - 0x0F, + RO_BMT_RO2, + RO_BMT_RO3, }; static const int l_diff_flag_tbl[] = { diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index dbc8ea75..66b414b9 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_Vteng.h" +#include "d/res/res_vteng.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -35,8 +36,8 @@ BOOL daObjVteng_c::solidHeapCB(fopAc_ac_c* i_this) { bool daObjVteng_c::create_heap() { bool ret = true; - J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 0x08)); - J3DAnmTransform * pAnm = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, 0x05); + J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, VTENG_BDL_VTENG)); + J3DAnmTransform * pAnm = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, VTENG_BCK_VTENG); if (!pModelData || !pAnm) { JUT_ASSERT(0xb7, 0); @@ -56,7 +57,7 @@ bool daObjVteng_c::create_heap() { } else { J3DModel * model = mpMorf->getModel(); mpModel = model; - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, 0x0B), cBgW::MOVE_BG_e, &mtx); + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, VTENG_DZB_VTENG), 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 086b6ea1..7e7fcff2 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_Yboil.h" +#include "d/res/res_yboil.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" @@ -18,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", 0x06); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Yboil", YBOIL_BDL_YBOIL00); JUT_ASSERT(92, modelData != 0); - J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Yboil", 0x09)); + J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Yboil", YBOIL_BCK_YBOIL00)); JUT_ASSERT(96, bck != 0); - J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Yboil", 0x0F)); + J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Yboil", YBOIL_BTK_YBOIL00)); JUT_ASSERT(100, btk != 0); - J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Yboil", 0x0C)); + J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Yboil", YBOIL_BRK_YBOIL00)); JUT_ASSERT(104, brk != 0); 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 3cba2862..952cd26b 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_Ygush00.h" +#include "d/res/res_ygush00.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_a_obj.h" @@ -31,9 +32,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[] = { 0x0A, 0x09, 0x09, 0x09 }; - static u32 btk_table[] = { 0x0E, 0x0D, 0x0D, 0x0D }; - static u32 bck_table[] = { 0x06, 0x05, 0x05, 0x05 }; + 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 }; bool ret = true; diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index 607e3a30..349d460e 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_adnno.h" +#include "d/res/res_adnno.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -13,7 +14,22 @@ #include "m_Do/m_Do_mtx.h" static const u32 daObjAdnno_bmt_table[16] = { - 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, + 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, }; /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ @@ -23,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", 0x04)); + J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Adnno", ADNNO_BDL_ADNNO)); JUT_ASSERT(0x5c, modelData != 0); for (s32 i = 0; i < 16; i++) { mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x37441422); diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index d8b94882..ca6ff0c5 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/src/d/actor/d_a_obj_akabe.cpp @@ -4,6 +4,10 @@ // #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 "d/d_item.h" #include "d/d_item_data.h" #include "d/d_cc_d.h" @@ -30,7 +34,7 @@ namespace daObjAkabe { mpBgW = new dBgW(); if (mpBgW != NULL) { - static const s16 dzb[4] = { 3, 3, 3, 3, }; + static const s16 dzb[4] = { AKABE_DZB_AKABE, AKABED_DZB_AKABED, AKABEK_DZB_AKABEK, NBOX_DZB_NBOX, }; cBgD_t * bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname[mType], dzb[mType]); JUT_ASSERT(0x82, bgw_data != 0); if (!mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx)) diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 8206a411..6753fc3f 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_barrier.h" +#include "d/res/res_ycage.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" @@ -98,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<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 10)); - J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, 18)); - J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, 14)); + J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, YCAGE_BDL_YCAGE00)); + J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YCAGE00)); + J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YCAGE00)); if (modelData == NULL || pbtk == NULL || pbrk == NULL) { JUT_PANIC(407); @@ -129,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, 22); + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(l_arcname, YCAGE_DZB_KEKKAI); mpBgW = dBgW_NewSet(dzb, cBgW::MOVE_BG_e, &mBgMtx); if (mpBgW == NULL) { rt = false; @@ -373,13 +374,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<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, 19)); + J3DAnmTextureSRTKey* btk_anm_p = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00)); JUT_ASSERT(937, btk_anm_p != 0); - J3DAnmTransform* bck_anm_p = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, 7)); + J3DAnmTransform* bck_anm_p = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00)); JUT_ASSERT(942, bck_anm_p != 0); - J3DAnmTevRegKey* brk_anm_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, 15)); + J3DAnmTevRegKey* brk_anm_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00)); JUT_ASSERT(947, brk_anm_p != 0); mBtk[effect_idx].init(modelData, btk_anm_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, @@ -400,10 +401,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<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 11)); - J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, 19)); - J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, 7)); - J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, 15)); + J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, YCAGE_BDL_YHRBR00)); + J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00)); + J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00)); + J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00)); if (modelData == NULL || pbtk == NULL || pbck == NULL || pbrk == NULL) { JUT_PANIC(1016); diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 00c1bf2f..29f9f19f 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_dmgroom.h" +#include "d/res/res_dmgroom.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -19,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", 0x04)); + J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BDL_DMGROOM)); JUT_ASSERT(0x52, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203); if (!mpModel) return FALSE; - J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", 0x07)); + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BRK_DMGROOM)); JUT_ASSERT(0x5c, brk != 0); if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) return FALSE; diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp index ca1d5353..88ac4d24 100644 --- a/src/d/actor/d_a_obj_doguu_demo.cpp +++ b/src/d/actor/d_a_obj_doguu_demo.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_doguu_demo.h" +#include "d/res/res_doguud.h" #include "d/d_bg_w.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" @@ -21,7 +22,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { BOOL daObjDoguuD_c::CreateHeap() { mUnusedParam = fopAcM_GetParam(this) & 0xFF; - J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("DoguuD", 0x04)); + J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("DoguuD", DOGUUD_BDL_ESKZTO)); JUT_ASSERT(0x65, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203); if (mpModel == NULL) @@ -38,7 +39,7 @@ BOOL daObjDoguuD_c::CreateHeap() { return FALSE; } - if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("DoguuD", 0x07), cBgW::MOVE_BG_e, &mMtx)) + if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("DoguuD", DOGUUD_DZB_ESKZTO), 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 ff575b16..14db164f 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_dragonhead.h" +#include "d/res/res_qdghd.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -53,7 +54,7 @@ namespace daObjDragonhead_prm { /* 00000098-00000228 .text CreateHeap__17daObjDragonhead_cFv */ BOOL daObjDragonhead_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", 0x04)); + J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", QDGHD_BDL_QDGHD)); JUT_ASSERT(0xA0, model_data != 0); mpModel = mDoExt_J3DModel__create(model_data, 0x00, 0x11020203); if (!mpModel) @@ -67,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", 0x07), cBgW::MOVE_BG_e, &mtx)) + if (!mpBgW || mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("Qdghd", QDGHD_DZB_QDGHD), cBgW::MOVE_BG_e, &mtx)) ret = 0; if (ret != 1) diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index 5a5e3b6b..50c132cf 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_gaship2.h" +#include "d/res/res_yakerom.h" #include "SSystem/SComponent/c_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" @@ -22,12 +23,12 @@ bool daObjGaship2::Act_c::create_heap() { J3DModelData *mdl_data; cBgD_t *bgw_data; - mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, 4)); + mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, YAKEROM_BDL_YAKEROM)); JUT_ASSERT(0x5A, mdl_data != 0); mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002); set_mtx(); - bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, 7)); + bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, YAKEROM_DZB_YAKEROM)); JUT_ASSERT(0x67, bgw_data != 0); if (bgw_data != NULL) { mpBgW = new dBgW(); diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index 5d53adf9..4358d8c8 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_gong.h" +#include "d/res/res_vdora.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_a_obj.h" @@ -38,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<J3DModelData*>(dComIfG_getObjectRes(M_arcname, 0x04)); - J3DAnmTransformKey* bck = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(M_arcname, 0x07)); + J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BDL_VDORA)); + J3DAnmTransformKey* bck = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BCK_05_VDORA_CUT02_HIT)); JUT_ASSERT(0xbd, (modelData != 0) && (bck != 0)); mpMorf = new mDoExt_McaMorf( diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index 9c77a797..c323003a 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_hole.h" +#include "d/res/res_aana.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_bg_s_acch.h" #include "d/d_com_inf_game.h" @@ -222,7 +223,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, 3); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, AANA_BDL_AANA); JUT_ASSERT(0x13D, modelData != 0); diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 717f9ae3..5480b9b3 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_mknjd.h" +#include "d/res/res_mknjd.h" #include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_manager.h" #include "f_op/f_op_msg.h" @@ -37,11 +38,6 @@ #define ACT_LESSON 7 #define ACT_TACT 8 -#define ID_EARTH_MDL 4 -#define ID_BREAK_MDL 5 -#define ID_WIND_MDL 6 -#define ID_COL_DZB 9 - static const char* daObjMknjD_jointName[] = { "Hahen1", "Hahen2", @@ -171,14 +167,14 @@ s16 daObjMknjD::Act_c::XyEventCB(int) { int daObjMknjD::Act_c::CreateHeap() { const void* temp_r26; // Fakematch to get it to use the same register for model_data_d and jntName if (m043E == true) { - temp_r26 = dComIfG_getObjectRes(M_arcname, ID_WIND_MDL); + temp_r26 = dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJK); } else { - temp_r26 = dComIfG_getObjectRes(M_arcname, ID_EARTH_MDL); + temp_r26 = dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJD); } J3DModelData* model_data_d = (J3DModelData*)temp_r26; - J3DModelData* model_data_h = (J3DModelData*)dComIfG_getObjectRes(M_arcname, ID_BREAK_MDL); + J3DModelData* model_data_h = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJH); JUT_ASSERT(0x123, model_data_d != 0) JUT_ASSERT(0x124, model_data_h != 0) @@ -313,7 +309,7 @@ s32 daObjMknjD::Act_c::Mthd_Create() { else { phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, ID_COL_DZB, NULL, 0x65A0); + phase_state = MoveBGCreate(M_arcname, MKNJD_DZB_MKNJD, 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 962ef83a..12809c22 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/src/d/actor/d_a_obj_monument.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_monument.h" +#include "d/res/res_esekh.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_a_obj.h" @@ -16,8 +17,8 @@ namespace daObjMonument { namespace { static Attr_c L_attr[2] = { - { 0x04, 0x08 }, - { 0x05, 0x09 }, + { ESEKH_BDL_ESEKH, ESEKH_DZB_ESEKH }, + { ESEKH_BDL_ESEKH2, ESEKH_DZB_ESEKH2 }, }; inline const Attr_c & attr(Type_e type) { return L_attr[type]; } diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index b23f6aa4..1fbf6989 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -4,6 +4,9 @@ // #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 "JSystem/JUtility/JUTAssert.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" @@ -34,19 +37,56 @@ namespace daObjPaper { /* 0x0A */ s16 mAttentionOffset; /* 0x0C */ s16 mCullSphereRadius; /* 0x0E */ s16 mCullSphereYOffset; - /* 0x10 */ s8 mAttentionDist1; /* 0x11 */ s8 mAttentionDist2; /* 0x12 */ u8 mTevType; - /* 0x14 */ s16 mColCylinderRadius; /* 0x16 */ s16 mColCylinderHeight; }; static const Attr_c L_attr[3] = { - { "Opaper", 0x04C0, 3, 0x00, 0x28, 0x28, 0x00, 0x1D, 0x1E, 0x01, 0x00, 0x00 }, - { "Ppos", 0x04C0, 3, 0x00, 0x32, 0x3C, 0x00, 0x1F, 0x20, 0x00, 0x00, 0x00 }, - { "Piwa", 0x04C0, 3, 0x3C, 0x82, 0x50, 0x3C, 0x1D, 0x1E, 0x00, 0x37, 0x73 } + { + /* mResName */ "Opaper", + /* mHeapSize */ 0x04C0, + /* mModelId */ OPAPER_BDL_OPAPER, + /* mEyeOffset */ 0x00, + /* mAttentionOffset */ 0x28, + /* mCullSphereRadius */ 0x28, + /* mCullSphereYOffset */ 0x00, + /* mAttentionDist1 */ 0x1D, + /* mAttentionDist2 */ 0x1E, + /* mTevType */ 0x01, + /* mColCylinderRadius */ 0x00, + /* mColCylinderHeight */ 0x00, + }, + { + /* mResName */ "Ppos", + /* mHeapSize */ 0x04C0, + /* mModelId */ PPOS_BDL_PPOS, + /* mEyeOffset */ 0x00, + /* mAttentionOffset */ 0x32, + /* mCullSphereRadius */ 0x3C, + /* mCullSphereYOffset */ 0x00, + /* mAttentionDist1 */ 0x1F, + /* mAttentionDist2 */ 0x20, + /* mTevType */ 0x00, + /* mColCylinderRadius */ 0x00, + /* mColCylinderHeight */ 0x00, + }, + { + /* mResName */ "Piwa", + /* mHeapSize */ 0x04C0, + /* mModelId */ PIWA_BDL_PIWA, + /* mEyeOffset */ 0x3C, + /* mAttentionOffset */ 0x82, + /* mCullSphereRadius */ 0x50, + /* mCullSphereYOffset */ 0x3C, + /* mAttentionDist1 */ 0x1D, + /* mAttentionDist2 */ 0x1E, + /* mTevType */ 0x00, + /* mColCylinderRadius */ 0x37, + /* mColCylinderHeight */ 0x73, + } }; inline const Attr_c & attr(Type_e type) { return L_attr[type]; } diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index 2bbaa312..f3f21b71 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_pbco.h" +#include "d/res/res_pbco.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_procname.h" @@ -34,16 +35,16 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { BOOL daObj_Pbco_c::CreateHeap() { J3DModelData* modelData; if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) { - modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x04)); + modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBCO)); } else { - modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x05)); + modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBC2)); } JUT_ASSERT(0xa9, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) { mpBgW = NULL; } else { - mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, 0x08), cBgW::MOVE_BG_e, + mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, PBCO_INDEX_DZB_PBCO), 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 a57692eb..610bf4a9 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -3,6 +3,7 @@ */ #include "d/actor/d_a_obj_pbka.h" +#include "d/res/res_pbka.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -16,7 +17,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", 3); + J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes("Pbka", PBKA_BDL_PBKA); JUT_ASSERT(0x51, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData,0,0x11020203); if(mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index ae44d50a..e3ce8d18 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_roten.h" +#include "d/res/res_roten.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" @@ -35,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[] = { - 0x04, - 0x05, - 0x06 + ROTEN_BDL_ROTEN02, + ROTEN_BDL_ROTEN03, + ROTEN_BDL_ROTEN04 }; static u32 dzb_arc_idx[] = { - 0x09, - 0x0A, - 0x0B + ROTEN_DZB_ROTEN02, + ROTEN_DZB_ROTEN03, + ROTEN_DZB_ROTEN04 }; J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, bdl_arc_idx[mType])); diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 8dd1f0f3..001a1797 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -571,9 +571,9 @@ void daObjTpost_c::setAttention() { /* 00000EA4-0000100C .text setAnm__12daObjTpost_cFScb */ void daObjTpost_c::setAnm(s8 param_1, bool param_2) { static const int a_anm_bcks_tbl[] = { - 0x04, - 0x05, - 0x06, + TORIPOST_BCK_POST_GET, + TORIPOST_BCK_POST_PUTOUT, + TORIPOST_BCK_POST_WAIT, }; static const dLib_anm_prm_c a_anm_prm_tbl[] = { { diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp index 3d75522f..0702752e 100644 --- a/src/d/actor/d_a_obj_tower.cpp +++ b/src/d/actor/d_a_obj_tower.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_tower.h" +#include "d/res/res_x_tower.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "dolphin/mtx/mtx.h" @@ -17,7 +18,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", 4); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("X_tower", X_TOWER_BDL_X_TOWER); JUT_ASSERT(0x56, modelData != 0); @@ -36,7 +37,7 @@ BOOL daObjTower_c::CreateHeap() { if (mpBgW == NULL) return FALSE; - cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("X_tower", 7); + cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("X_tower", X_TOWER_DZB_X_TOWER); return mpBgW->Set(pData, cBgW::MOVE_BG_e, &mMtx) ? FALSE : TRUE; } diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index d56ff75b..7b93ba1e 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -93,7 +93,7 @@ s32 daObjVfan::Act_c::Mthd_Create() { } else { phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = MoveBGCreate(M_arcname, 7, NULL, 0xa60); + phase_state = MoveBGCreate(M_arcname, VFAN_DZB_V_FAN_00, NULL, 0xa60); JUT_ASSERT(0xc6, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 28b8797f..6ec541f2 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_zouK.h" +#include "d/res/res_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 +66,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, 0x08); + J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_BDL_VZOUK); JUT_ASSERT(0x171, mdl_data != 0); - M_bck_data = (J3DAnmTransformKey*)dComIfG_getObjectRes(M_arcname, 0x05); + M_bck_data = (J3DAnmTransformKey*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_BCK_VZOUK); JUT_ASSERT(0x175, M_bck_data != 0); if (mdl_data != NULL && M_bck_data != NULL) { M_anm = new mDoExt_McaMorf( @@ -92,7 +93,7 @@ bool daObjZouk::Act_c::create_heap() { } set_mtx(); - cBgD_t* bgw_data_before = (cBgD_t*)dComIfG_getObjectRes(M_arcname, 0x0B); + cBgD_t* bgw_data_before = (cBgD_t*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_DZB_MAEKISI); JUT_ASSERT(0x196, bgw_data_before != 0); if (bgw_data_before != NULL) { mBgBefore = new dBgW(); @@ -102,7 +103,7 @@ bool daObjZouk::Act_c::create_heap() { } } - cBgD_t* bgw_data_after = (cBgD_t*)dComIfG_getObjectRes(M_arcname, 0x0C); + cBgD_t* bgw_data_after = (cBgD_t*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_DZB_ATOKISI); JUT_ASSERT(0x1a4, bgw_data_after != 0); if (bgw_data_after != NULL) { mBgAfter = new dBgW(); diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 0fa2a77f..b680b732 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -7,7 +7,112 @@ #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" // Needed for the .data section to match. static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; @@ -31,14 +136,14 @@ char* dItem_data::item_arcname_tbl[0x70] = { "VsaiL", "VyatM", "VyatL", - "Ball", + "Ball", // Doesn't exist, unused "Bin", "VbomM", "Boom", "Vboot", "VbomL", - "Bottle", - "Bottle_e", + "Bottle", // Doesn't exist, unused + "Bottle_e", // Doesn't exist, unused "VboxN", "VdunC", "VdunM", @@ -76,8 +181,8 @@ char* dItem_data::item_arcname_tbl[0x70] = { "Vrope", "VmagS", "Shinju_n", - "Sord_m", - "Sord_mvu", + "Sord_m", // Doesn't exist, unused + "Sord_mvu", // Doesn't exist, unused "VswoN", "VshiM", "VshiN", @@ -505,10 +610,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x01: dItem_GREEN_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -521,10 +626,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x02: dItem_BLUE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x01, @@ -537,10 +642,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x03: dItem_YELLOW_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x02, @@ -553,10 +658,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x04: dItem_RED_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x03, @@ -569,10 +674,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x05: dItem_PURPLE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -585,10 +690,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x06: dItem_ORANGE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x05, @@ -601,8 +706,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x07: KAKERA_HEART /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHKAK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_02], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VHKAK_BDL_VHKAK, + /* mSrtIdx */ VHKAK_BTK_VHKAK, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -617,8 +722,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x08: UTUWA_HEART /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHUTU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VHUTU_BDL_VHUTU, + /* mSrtIdx */ VHUTU_BTK_VHUTU, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -665,7 +770,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0B: BOMB_5 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ BOMB_00_BDL_VBOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -681,7 +786,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0C: BOMB_10 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ BOMB_00_BDL_VBOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -697,7 +802,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0D: BOMB_20 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ BOMB_00_BDL_VBOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -713,7 +818,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0E: BOMB_30 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ BOMB_00_BDL_VBOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -729,10 +834,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0F: dItem_SILVER_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x06, @@ -825,7 +930,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x15: dItem_SMALL_KEY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VKEYN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_KEY], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VKEYN_BDL_VKEYN, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -841,12 +946,12 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x16: RECOVER_FAIRY /* mArcname */ item_arcname_tbl[ARCNAME_IDX_FA], /* mTexture */ NULL, - /* mBmdIdx */ 0x001F, + /* mBmdIdx */ ALWAYS_BDL_FA, // Note: This file index is for the wrong RARC. /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x000C, + /* mBckIdx */ ALWAYS_BCK_FA, // Note: This file index is for the wrong RARC. /* mTevFrm */ -1, /* mItemMesgNum */ 0x0000, /* mUnused */ 0x00000000, @@ -905,10 +1010,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x1A: SUB_DUN_RUPEE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x02, @@ -985,7 +1090,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x1F: dItem_JOY_PENDANT_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHAPP], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_08], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VHAPP_BDL_VHAPP, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1001,8 +1106,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x20: dItem_TELESCOPE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_TELE_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TELESCOPE], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ TELE_00_BDL_VTELE, + /* mSrtIdx */ TELE_00_BTK_VTELE, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1017,7 +1122,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x21: dItem_TINGLE_TUNER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_WHISTLE], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VCHIN_BDL_VCHIN, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1033,7 +1138,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x22: dItem_WIND_WAKER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTACT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VTACT_BDL_VTACT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1049,8 +1154,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x23: CAMERA /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBOXN_BDL_VBOXN, + /* mSrtIdx */ VBOXN_BTK_VBOXN, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1065,7 +1170,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x24: EMONO_BAG /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COVEROFBEAST], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VBAGE_BDL_VBAGE, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1081,8 +1186,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x25: dItem_GRAPPLING_HOOK_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VROPE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ROPE], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VROPE_BDL_VROPE, + /* mSrtIdx */ VROPE_BTK_VROPE, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1097,8 +1202,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x26: CAMERA2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA_2], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBOXA_BDL_VBOXP, + /* mSrtIdx */ VBOXA_BTK_VBOXA, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1113,8 +1218,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x27: dItem_BOW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOW], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBOW_BDL_VBOW, + /* mSrtIdx */ VBOW_BTK_VBOW, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1129,8 +1234,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x28: PWR_GROOVE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VPOWR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GLOVES_00_0x35], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VPOWR_BDL_VPOWR, + /* mSrtIdx */ VPOWR_BTK_VPOWR, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1145,8 +1250,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x29: dItem_IRON_BOOTS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOOT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOOTS_00], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBOOT_BDL_VBOOT, + /* mSrtIdx */ VBOOT_BTK_VBOOT, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1161,10 +1266,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2A: dItem_MAGIC_ARMOR_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAGS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_02], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VMAGS_BDL_VMAGS, + /* mSrtIdx */ VMAGS_BTK_VMAGS, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VMAGS_BRK_VMAGS, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ -1, @@ -1193,7 +1298,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2C: ESA_BAG /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COVEROFBAIT], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VBAGF_BDL_VBAGF, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1209,7 +1314,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2D: dItem_BOOMERANG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOOM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOOMERANG], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ BOOM_BDL_VBOOM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1225,7 +1330,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2E: BARE_HAND /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VFUKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GLOVES_00_0x34], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VFUKU_BDL_VFUKU, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1241,8 +1346,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x2F: dItem_HOOKSHOT_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHOOK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HOOKSHOT], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VHOOK_BDL_VHOOK, + /* mSrtIdx */ VHOOK_BTK_VHOOK, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1257,7 +1362,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x30: dItem_DELIVERY_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VBAGH_BDL_VBAGH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1273,7 +1378,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x31: BOMB_BAG /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ BOMB_00_BDL_VBOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1289,7 +1394,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x32: dItem_FUKU_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VFUKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CLOTHES], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VFUKU_BDL_VFUKU, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1305,7 +1410,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x33: dItem_SKULL_HAMMER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHAMM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HAMMER_01], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VHAMM_BDL_VHAMM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1321,7 +1426,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x34: dItem_DEKU_LEAF_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEAF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_FAN], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VLEAF_BDL_VLEAF, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1337,8 +1442,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x35: dItem_MAGIC_ARROW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VARFI], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROW_POWER_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VARFI_BDL_VARFI, + /* mSrtIdx */ VARFI_BTK_VARFI, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1353,8 +1458,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x36: dItem_LIGHT_ARROW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VARRL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROW_POWER_02], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VARRL_BDL_VARRL, + /* mSrtIdx */ VARRL_BTK_VARRL, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1385,7 +1490,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x38: SWORD /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1433,7 +1538,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x3B: SHIELD /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSHIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VSHIN_BDL_VSHIN, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1449,8 +1554,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x3C: MIRROR_SHIELD /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSHIM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VSHIM_BDL_VSHIM, + /* mSrtIdx */ VSHIM_BTK_VSHIM, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1465,7 +1570,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x3D: DROPPED_SWORD /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1497,8 +1602,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x3F: KAKERA_HEART2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHKAK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_02], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VHKAK_BDL_VHKAK, + /* mSrtIdx */ VHKAK_BTK_VHKAK, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1545,8 +1650,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x42: PIRATES_OMAMORI /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VAMUK_BDL_VAMUK, + /* mSrtIdx */ VAMUK_BTK_VAMUK, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1561,8 +1666,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x43: HEROS_OMAMORI /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VAMUY_BDL_VAMUY, + /* mSrtIdx */ VAMUY_BTK_VAMUY, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1593,8 +1698,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x45: SKULL_NECKLACE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDOKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VDOKU_BDL_VDOKU, + /* mSrtIdx */ VDOKU_BTK_VDOKU, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1609,7 +1714,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x46: BOKOBABA_SEED /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOKO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_02], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VBOKO_BDL_VBOKO, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1625,10 +1730,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x47: GOLDEN_FEATHER /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHANE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_03], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VHANE_BDL_VHANE, + /* mSrtIdx */ VHANE_BTK_VHANE, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VHANE_BRK_VHANE, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ -1, @@ -1641,8 +1746,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x48: BOKO_BELT /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBELT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_04], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBELT_BDL_VBELT, + /* mSrtIdx */ VBELT_BTK_VBELT, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1657,10 +1762,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x49: RED_JELLY /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_05], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VCHUJ_BDL_VCHUJ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0007, + /* mTevIdx */ VCHUJ_BRK_VCHUJ, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x01, @@ -1673,10 +1778,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4A: GREEN_JELLY /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_06], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VCHUJ_BDL_VCHUJ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0007, + /* mTevIdx */ VCHUJ_BRK_VCHUJ, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -1689,10 +1794,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4B: BLUE_JELLY /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_07], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VCHUJ_BDL_VCHUJ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0007, + /* mTevIdx */ VCHUJ_BRK_VCHUJ, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x02, @@ -1705,7 +1810,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4C: dItem_MAP_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDUNM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DUNGEON_MAP], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VDUNM_BDL_VDUNM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -1721,8 +1826,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4D: dItem_COMPASS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDUNC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COMPASS], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VDUNC_BDL_VDUNC, + /* mSrtIdx */ VDUNC_BTK_VDUNC, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1737,8 +1842,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x4E: dItem_BOSS_KEY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_KEY_01], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOSS_KEY], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ KEY_01_BDL_VKEYB, + /* mSrtIdx */ KEY_01_BTK_VKEYB, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1769,8 +1874,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x50: EMPTY_BOTTLE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ BIN_BDL_VBINX, + /* mSrtIdx */ BIN_BTK_VBINA_X, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1785,8 +1890,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x51: RED_BOTTLE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_R], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ MED_R_BDL_VBINR, + /* mSrtIdx */ MED_R_BTK_VBINA_R, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1801,8 +1906,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x52: GREEN_BOTTLE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_G], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_02], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ MED_G_BDL_VBING, + /* mSrtIdx */ MED_G_BTK_VBINA_G, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1817,8 +1922,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x53: BLUE_BOTTLE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_B], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_03], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ MED_B_BDL_VBINB, + /* mSrtIdx */ MED_B_BTK_VBINA_B, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1833,8 +1938,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x54: dItem_HALF_SOUP_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_09], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBINS_BDL_VBINS, + /* mSrtIdx */ VBINS_BTK_VBINA_S, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1849,8 +1954,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x55: dItem_SOUP_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_04], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBINS_BDL_VBINS, + /* mSrtIdx */ VBINS_BTK_VBINA_S, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1865,8 +1970,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x56: BIN_IN_WATER /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINW], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_05], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBINW_BDL_VBINW, + /* mSrtIdx */ VBINW_BTK_VBINA_W, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1881,8 +1986,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x57: FAIRY_BOTTLE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_06], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBINY_BDL_VBINY, + /* mSrtIdx */ VBINY_BTK_VBINA_Y, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -1897,10 +2002,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x58: FIREFLY_BOTTLE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_07], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VBINH_BDL_VBINH, + /* mSrtIdx */ VBINH_BTK_VBINA_H, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VBINH_BRK_VBINH, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ -1, @@ -1913,8 +2018,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x59: FWATER_BOTTLE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_FWBIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_08], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ FWBIN_BDL_VBINW_F, + /* mSrtIdx */ FWBIN_BTK_VBINA_F, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2041,8 +2146,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x61: TRIFORCE1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI1], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_00], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VTRI1_BDL_VTRI1, + /* mSrtIdx */ VTRI1_BTK_VTRI1A, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2057,8 +2162,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x62: TRIFORCE2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI2], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VTRI2_BDL_VTRI2, + /* mSrtIdx */ VTRI2_BTK_VTRI2A, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2073,8 +2178,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x63: TRIFORCE3 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI3], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_02], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VTRI3_BDL_VTRI3, + /* mSrtIdx */ VTRI3_BTK_VTRI3A, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2089,8 +2194,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x64: TRIFORCE4 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI4], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_03], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VTRI4_BDL_VTRI4, + /* mSrtIdx */ VTRI4_BTK_VTRI4A, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2105,8 +2210,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x65: TRIFORCE5 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI5], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_04], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VTRI5_BDL_VTRI5, + /* mSrtIdx */ VTRI5_BTK_VTRI5A, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2121,8 +2226,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x66: TRIFORCE6 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI6], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_05], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VTRI6_BDL_VTRI6, + /* mSrtIdx */ VTRI6_BTK_VTRI6A, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2137,8 +2242,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x67: TRIFORCE7 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI7], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_06], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VTRI7_BDL_VTRI7, + /* mSrtIdx */ VTRI7_BTK_VTRI7A, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2153,8 +2258,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x68: TRIFORCE8 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI8], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_07], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VTRI8_BDL_VTRI8, + /* mSrtIdx */ VTRI8_BTK_VTRI8A, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2169,8 +2274,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x69: dItem_PEARL_NAYRU_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_N], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_02], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ SHINJU_N_BDL_VPEAN, + /* mSrtIdx */ SHINJU_N_BTK_VPEAA_N, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2185,8 +2290,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6A: dItem_PEARL_DIN_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_D], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_00], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ SHINJU_D_BDL_VPEAD, + /* mSrtIdx */ SHINJU_D_BTK_VPEAA_D, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2201,8 +2306,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6B: dItem_PEARL_FARORE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_F], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_01], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ SHINJU_F_BDL_VPEAF, + /* mSrtIdx */ SHINJU_F_BTK_VPEAA_F, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -2217,7 +2322,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6C: KNOWLEDGE_TF /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2233,7 +2338,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6D: TACT_SONG1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2249,7 +2354,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6E: TACT_SONG2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2265,7 +2370,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x6F: TACT_SONG3 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2281,7 +2386,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x70: TACT_SONG4 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2297,7 +2402,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x71: TACT_SONG5 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2313,7 +2418,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x72: TACT_SONG6 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2409,7 +2514,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x78: NORMAL_SAIL /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SAIL_00], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VHO_BDL_VHO, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2425,7 +2530,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x79: TRIFORCE_MAP1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2441,7 +2546,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7A: TRIFORCE_MAP2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2457,7 +2562,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7B: TRIFORCE_MAP3 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2473,7 +2578,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7C: TRIFORCE_MAP4 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2489,7 +2594,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7D: TRIFORCE_MAP5 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2505,7 +2610,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7E: TRIFORCE_MAP6 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2521,7 +2626,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x7F: TRIFORCE_MAP7 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2537,7 +2642,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x80: TRIFORCE_MAP8 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2569,7 +2674,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x82: BIRD_ESA_5 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VESA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BAIT_01], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VESA_BDL_VESA, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2585,7 +2690,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x83: dItem_HYOI_PEAR_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHYOI], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BAIT_02], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VHYOI_BDL_VHYOI, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2729,7 +2834,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x8C: FLOWER_1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_01], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ00_BDL_VOBJ00, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2745,7 +2850,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x8D: FLOWER_2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ01], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_02], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ01_BDL_VOBJ01, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2761,7 +2866,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x8E: FLOWER_3 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ02], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_03], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ02_BDL_VOBJ02, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2777,7 +2882,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x8F: HEROS_FLAG /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ03], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_04], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ03_BDL_VOBJ03, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2793,7 +2898,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x90: TAIRYO_FLAG /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ04], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_05], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ04_BDL_VOBJ04, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2809,7 +2914,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x91: SALES_FLAG /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ05], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_06], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ05_BDL_VOBJ05, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2825,7 +2930,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x92: WIND_FLAG /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ06], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_07], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ06_BDL_VOBJ06, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2841,7 +2946,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x93: RED_FLAG /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ07], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_08], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ07_BDL_VOBJ07, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2857,7 +2962,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x94: FOSSIL_HEAD /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ08], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_09], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ08_BDL_VOBJ08, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2873,7 +2978,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x95: WATER_STATUE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ09], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_10], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ09_BDL_VOBJ09, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2889,7 +2994,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x96: POSTMAN_STATUE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ10], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_11], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ10_BDL_VOBJ10, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2905,7 +3010,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x97: PRESIDENT_STATUE /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ11], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_12], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOBJ11_BDL_VOBJ11, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2921,7 +3026,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x98: dItem_FATHER_LETTER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLETT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_13], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VLETT_BDL_VLETT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2937,7 +3042,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x99: dItem_NOTE_TO_MOM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEOF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_14], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VLEOF_BDL_VLEOF, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2953,7 +3058,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9A: MAGYS_LETTER /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEMG], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_15], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VLEMG_BDL_VLEMG, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2969,7 +3074,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9B: MO_LETTER /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEMO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_16], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VLEMO_BDL_VLEMO, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -2985,7 +3090,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9C: COTTAGE_PAPER /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBESO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_17], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VBESO_BDL_VBESO, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3001,7 +3106,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9D: KAISEN_PRESENT1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOHOM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_18], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VOHOM_BDL_VOHOM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3017,7 +3122,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9E: KAISEN_PRESENT2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMANT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_19], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMANT_BDL_VMANT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3033,8 +3138,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x9F: SALVAGE_ITEM1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBOXA_BDL_VBOXP, + /* mSrtIdx */ VBOXA_BTK_VBOXA, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3049,7 +3154,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA0: SALVAGE_ITEM2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3065,7 +3170,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA1: SALVAGE_ITEM3 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3081,7 +3186,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA2: XXX_039 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], - /* mBmdIdx */ 0x0004, + /* mBmdIdx */ VAMUK_BDL_VAMUK, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3097,7 +3202,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA3: TINGLE_STATUE1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN1], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VTIN1_BDL_VTIN1, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3113,7 +3218,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA4: TINGLE_STATUE2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN2], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VTIN2_BDL_VTIN2, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3129,7 +3234,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA5: TINGLE_STATUE3 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN3], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VTIN3_BDL_VTIN3, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3145,7 +3250,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA6: TINGLE_STATUE4 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN4], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VTIN4_BDL_VTIN4, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3161,7 +3266,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xA7: TINGLE_STATUE5 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN5], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VTIN5_BDL_VTIN5, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3209,7 +3314,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAA: dItem_HURRICANE_SPIN_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ NULL, - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3225,8 +3330,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAB: MAX_RUPEE_UP1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSAIM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BIG_PURSE], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VSAIM_BDL_VSAIM, + /* mSrtIdx */ VSAIM_BTK_VSAIM, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3241,8 +3346,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAC: MAX_RUPEE_UP2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSAIL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_MAX_PURSE], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VSAIL_BDL_VSAIL, + /* mSrtIdx */ VSAIL_BTK_VSAIL, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3257,8 +3362,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAD: MAX_BOMB_UP1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOMM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMBPOUCH_1], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBOMM_BDL_VBOMM, + /* mSrtIdx */ VBOMM_BTK_VBOMM, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3273,8 +3378,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAE: MAX_BOMB_UP2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOML], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMBPOUCH_2], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VBOML_BDL_VBOML, + /* mSrtIdx */ VBOML_BTK_VBOML, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3289,8 +3394,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xAF: MAX_ARROW_UP1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VYATM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROWCASE_1], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VYATM_BDL_VYATM, + /* mSrtIdx */ VYATM_BTK_VYATM, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3305,8 +3410,8 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB0: MAX_ARROW_UP2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VYATL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROWCASE_2], - /* mBmdIdx */ 0x0004, - /* mSrtIdx */ 0x0007, + /* mBmdIdx */ VYATL_BDL_VYATL, + /* mSrtIdx */ VYATL_BTK_VYATL, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -3353,10 +3458,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB3: TINCLE_RUPEE1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3369,10 +3474,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB4: TINCLE_RUPEE2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3385,10 +3490,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB5: TINCLE_RUPEE3 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3401,10 +3506,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB6: TINCLE_RUPEE4 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3417,10 +3522,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB7: TINCLE_RUPEE5 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -3433,10 +3538,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB8: TINCLE_RUPEE6 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x05, @@ -3449,10 +3554,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xB9: LITHOGRAPH1 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3465,10 +3570,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBA: LITHOGRAPH2 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3481,10 +3586,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBB: LITHOGRAPH3 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3497,10 +3602,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBC: LITHOGRAPH4 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3513,10 +3618,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBD: LITHOGRAPH5 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3529,10 +3634,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBE: LITHOGRAPH6 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3545,10 +3650,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xBF: COLLECT_MAP_64 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3561,10 +3666,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC0: COLLECT_MAP_63 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3577,10 +3682,10 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC1: COLLECT_MAP_62 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], - /* mBmdIdx */ 0x0005, - /* mSrtIdx */ 0x000B, + /* mBmdIdx */ VLUPY_BDL_VLUPY, + /* mSrtIdx */ VLUPY_BTK_VLUPY, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0008, + /* mTevIdx */ VLUPY_BRK_VLUPY, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -3593,7 +3698,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC2: COLLECT_MAP_61 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3609,7 +3714,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC3: COLLECT_MAP_60 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3625,7 +3730,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC4: COLLECT_MAP_59 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3641,7 +3746,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC5: COLLECT_MAP_58 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3657,7 +3762,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC6: COLLECT_MAP_57 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3673,7 +3778,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC7: COLLECT_MAP_56 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3689,7 +3794,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC8: COLLECT_MAP_55 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3705,7 +3810,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xC9: COLLECT_MAP_54 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3721,7 +3826,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCA: COLLECT_MAP_53 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPQ_BDL_VMAPQ, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3737,7 +3842,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCB: COLLECT_MAP_52 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TINGLE2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPC_BDL_VMAPC, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3753,7 +3858,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCC: COLLECT_MAP_51 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3769,7 +3874,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCD: COLLECT_MAP_50 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3785,7 +3890,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCE: COLLECT_MAP_49 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3801,7 +3906,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xCF: COLLECT_MAP_48 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3817,7 +3922,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD0: COLLECT_MAP_47 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3833,7 +3938,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD1: COLLECT_MAP_46 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3849,7 +3954,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD2: COLLECT_MAP_45 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3865,7 +3970,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD3: COLLECT_MAP_44 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3881,7 +3986,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD4: COLLECT_MAP_43 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3897,7 +4002,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD5: COLLECT_MAP_42 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3913,7 +4018,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD6: COLLECT_MAP_41 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3929,7 +4034,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD7: COLLECT_MAP_40 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3945,7 +4050,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD8: COLLECT_MAP_39 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3961,7 +4066,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xD9: COLLECT_MAP_38 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3977,7 +4082,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDA: COLLECT_MAP_37 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -3993,7 +4098,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDB: COLLECT_MAP_36 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPG], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_PHANTOMSHIP2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPG_BDL_VMAPG, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4009,7 +4114,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDC: COLLECT_MAP_35 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TINGLE2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPC_BDL_VMAPC, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4025,7 +4130,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDD: COLLECT_MAP_34 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4041,7 +4146,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDE: COLLECT_MAP_33 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4057,7 +4162,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xDF: COLLECT_MAP_32 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4073,7 +4178,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE0: COLLECT_MAP_31 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4089,7 +4194,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE1: COLLECT_MAP_30 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4105,7 +4210,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE2: COLLECT_MAP_29 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4121,7 +4226,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE3: COLLECT_MAP_28 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4137,7 +4242,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE4: COLLECT_MAP_27 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4153,7 +4258,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE5: COLLECT_MAP_26 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4169,7 +4274,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE6: COLLECT_MAP_25 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4185,7 +4290,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE7: COLLECT_MAP_24 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4201,7 +4306,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE8: COLLECT_MAP_23 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4217,7 +4322,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xE9: COLLECT_MAP_22 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4233,7 +4338,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEA: COLLECT_MAP_21 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4249,7 +4354,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEB: COLLECT_MAP_20 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4265,7 +4370,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEC: COLLECT_MAP_19 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPR_BDL_VMAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4281,7 +4386,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xED: COLLECT_MAP_18 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4297,7 +4402,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEE: COLLECT_MAP_17 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4313,7 +4418,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xEF: COLLECT_MAP_16 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4329,7 +4434,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF0: COLLECT_MAP_15 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4345,7 +4450,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF1: COLLECT_MAP_14 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4361,7 +4466,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF2: COLLECT_MAP_13 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4377,7 +4482,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF3: COLLECT_MAP_12 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4393,7 +4498,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF4: COLLECT_MAP_11 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4409,7 +4514,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF5: COLLECT_MAP_10 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4425,7 +4530,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF6: COLLECT_MAP_09 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPH_BDL_VMAPH, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4441,7 +4546,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF7: COLLECT_MAP_08 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4457,7 +4562,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF8: COLLECT_MAP_07 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4473,7 +4578,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xF9: COLLECT_MAP_06 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4489,7 +4594,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFA: COLLECT_MAP_05 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4505,7 +4610,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFB: COLLECT_MAP_04 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4521,7 +4626,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFC: COLLECT_MAP_03 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4537,7 +4642,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFD: COLLECT_MAP_02 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4553,7 +4658,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0xFE: COLLECT_MAP_01 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VMAPT_BDL_VMAPT, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5264,7 +5369,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x34: dItem_DEKU_LEAF_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VLEAF], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VLEAF_BDL_VLEAF, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5316,7 +5421,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x38: SWORD /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSWON], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5355,7 +5460,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x3B: SHIELD /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSHIN], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VSHIN_BDL_VSHIN, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5381,7 +5486,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x3D: DROPPED_SWORD /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSWON], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6291,7 +6396,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x83: dItem_HYOI_PEAR_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VHYOI], - /* mBmdIdx */ 0x0003, + /* mBmdIdx */ VHYOI_BDL_VHYOI, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6408,12 +6513,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x8C: FLOWER_1 /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x58], - /* mBmdIdx */ 0x0012, + /* mBmdIdx */ FDAI_BDL_FOBJ00, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0005, + /* mBckIdx */ FDAI_BCK_FOBJ00, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x08E0 @@ -6421,12 +6526,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x8D: FLOWER_2 /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x59], - /* mBmdIdx */ 0x0013, + /* mBmdIdx */ FDAI_BDL_FOBJ01, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0006, + /* mBckIdx */ FDAI_BCK_FOBJ01, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0860 @@ -6434,12 +6539,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x8E: FLOWER_3 /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ 0x0014, + /* mBmdIdx */ FDAI_BDL_FOBJ02, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0007, + /* mBckIdx */ FDAI_BCK_FOBJ02, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0880 @@ -6447,7 +6552,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x8F: HEROS_FLAG /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ 0x0015, + /* mBmdIdx */ FDAI_BDL_FOBJ03, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6460,7 +6565,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x90: TAIRYO_FLAG /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ 0x0016, + /* mBmdIdx */ FDAI_BDL_FOBJ04, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6473,12 +6578,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x91: SALES_FLAG /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ 0x0017, + /* mBmdIdx */ FDAI_BDL_FOBJ05, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0008, + /* mBckIdx */ FDAI_BCK_FOBJ05, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x1200 @@ -6486,12 +6591,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x92: WIND_FLAG /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], - /* mBmdIdx */ 0x0018, + /* mBmdIdx */ FDAI_BDL_FOBJ06, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0009, + /* mBckIdx */ FDAI_BCK_FOBJ06, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0760 @@ -6499,12 +6604,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x93: RED_FLAG /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], - /* mBmdIdx */ 0x0019, + /* mBmdIdx */ FDAI_BDL_FOBJ07, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x000A, + /* mBckIdx */ FDAI_BCK_FOBJ07, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x1200 @@ -6512,12 +6617,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x94: FOSSIL_HEAD /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5C], - /* mBmdIdx */ 0x001A, + /* mBmdIdx */ FDAI_BDL_FOBJ08, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x000B, + /* mBckIdx */ FDAI_BCK_FOBJ08, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x1000 @@ -6525,7 +6630,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x95: WATER_STATUE /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x64], - /* mBmdIdx */ 0x001B, + /* mBmdIdx */ FDAI_BDL_FOBJ09, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6538,7 +6643,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x96: POSTMAN_STATUE /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], - /* mBmdIdx */ 0x001C, + /* mBmdIdx */ FDAI_BDL_FOBJ10, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -6551,12 +6656,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x97: PRESIDENT_STATUE /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], - /* mBmdIdx */ 0x001D, + /* mBmdIdx */ FDAI_BDL_FOBJ11, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x000E, + /* mBckIdx */ FDAI_BCK_FOBJ11, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x1000 |