From 12c8b6fcc72861a75656a5095b254c11d13505c0 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 23 Apr 2024 14:15:57 -0400 Subject: [PATCH] Move res enums in cpp files to include res headers instead --- src/d/actor/d_a_agb.cpp | 9 +--- src/d/actor/d_a_am.cpp | 35 +------------- src/d/actor/d_a_am2.cpp | 24 +--------- src/d/actor/d_a_bita.cpp | 17 +------ src/d/actor/d_a_branch.cpp | 17 +------ src/d/actor/d_a_dr.cpp | 20 +------- src/d/actor/d_a_ghostship.cpp | 13 +---- src/d/actor/d_a_mbdoor.cpp | 24 +--------- src/d/actor/d_a_npc_bs1.cpp | 65 +------------------------ src/d/actor/d_a_npc_btsw2.cpp | 67 +------------------------- src/d/actor/d_a_npc_kamome.cpp | 25 +--------- src/d/actor/d_a_obj_AjavW.cpp | 12 +---- src/d/actor/d_a_obj_eayogn.cpp | 9 +--- src/d/actor/d_a_obj_ganonbed.cpp | 10 +--- src/d/actor/d_a_obj_hfuck1.cpp | 9 +--- src/d/actor/d_a_obj_kanat.cpp | 9 +--- src/d/actor/d_a_obj_movebox.cpp | 81 +++----------------------------- src/d/actor/d_a_obj_mtest.cpp | 34 ++------------ src/d/actor/d_a_obj_ojtree.cpp | 11 +---- src/d/actor/d_a_pw.cpp | 46 +----------------- src/d/actor/d_a_rd.cpp | 35 +------------- src/d/actor/d_a_shop_item.cpp | 36 +------------- src/d/actor/d_a_tbox.cpp | 44 +---------------- src/d/actor/d_a_wall.cpp | 27 ++--------- 24 files changed, 35 insertions(+), 644 deletions(-) diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 722321bf3..5d2c4fb24 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_agb.h" +#include "d/res/res_agb.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTGba.h" @@ -29,14 +30,6 @@ static u8 dummy_3569[0xC]; static Vec dummy_2100 = {1.0f, 1.0f, 1.0f}; static Vec dummy_2080 = {1.0f, 1.0f, 1.0f}; -enum AGB_RES_FILE_ID { // IDs and indexes are synced - /* BDLM */ - AGB_BDL_AGBCURSOR=0x4, - - /* BRK */ - AGB_BRK_AGBCURSOR=0x7, -}; - static mDoDvdThd_toMainRam_c* l_gbaCommand; int daAgb_c::mEffect; diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 7844ecb3d..4887f85ae 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_am.h" +#include "d/res/res_am.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/J3DGraphAnimator/J3DNode.h" #include "SSystem/SComponent/c_xyz.h" @@ -37,40 +38,6 @@ enum Action { ACTION_ITAI_MOVE = 0x3, }; -enum AM_RES_FILE_ID { // IDs and indexes are synced - /* BAS */ - AM_BAS_BOM_NOMI=0x5, - AM_BAS_BOM_NOMI2=0x6, - AM_BAS_CLOSE=0x7, - AM_BAS_CLOSE_LOOP=0x8, - AM_BAS_DAMAGE=0x9, - AM_BAS_DAMAGE_END=0xA, - AM_BAS_DAMAGE_LOOP=0xB, - AM_BAS_DEAD=0xC, - AM_BAS_OKIRU=0xD, - AM_BAS_OPEN=0xE, - AM_BAS_OPEN_LOOP=0xF, - AM_BAS_SLEEP=0x10, - AM_BAS_SLEEP_LOOP=0x11, - - /* BCK */ - AM_BCK_BOM_NOMI=0x14, - AM_BCK_CLOSE=0x15, - AM_BCK_CLOSE_LOOP=0x16, - AM_BCK_DAMAGE=0x17, - AM_BCK_DAMAGE_END=0x18, - AM_BCK_DAMAGE_LOOP=0x19, - AM_BCK_DEAD=0x1A, - AM_BCK_OKIRU=0x1B, - AM_BCK_OPEN=0x1C, - AM_BCK_OPEN_LOOP=0x1D, - AM_BCK_SLEEP=0x1E, - AM_BCK_SLEEP_LOOP=0x1F, - - /* BDL */ - AM_BDL_AM=0x22, -}; - /* 00000078-0000021C .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode* node, int param_1) { if (!param_1) { diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 34342b7c0..2a76e0163 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_am2.h" +#include "d/res/res_am2.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" #include "d/d_bg_s_lin_chk.h" @@ -35,29 +36,6 @@ enum Action { ACTION_MODORU_MOVE = 0x4, }; -enum AM2_RES_FILE_ID { // IDs and indexes are synced - /* BCK */ - AM2_BCK_BURUBURU=0x6, - AM2_BCK_DAMAGE=0x7, - AM2_BCK_DEAD1=0x8, - AM2_BCK_DEAD2=0x9, - AM2_BCK_DEAD3=0xA, - AM2_BCK_JUMP=0xB, - AM2_BCK_MAHI=0xC, - AM2_BCK_SLEEP=0xD, - AM2_BCK_START=0xE, - AM2_BCK_WAIT=0xF, - - /* BDLM */ - AM2_BDL_AM2=0x12, - - /* BRK */ - AM2_BRK_AM2=0x15, - - /* BTK */ - AM2_BTK_AM2=0x18, -}; - /* 00000078-000001B0 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode* node, int param_1) { if (!param_1) { diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index 7c0f17d18..66f1518f3 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_bita.h" +#include "d/res/res_bita.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "d/d_bg_s_movebg_actor.h" @@ -32,22 +33,6 @@ struct _dummy { 0.0f, 2.125f, 0.0f, 1.75f, 0.0f, }; -enum BITA_RES_FILE_ID { // IDs and indexes are synced - /* BDLM */ - BITA_BDL_EF_BTDITA0=0x5, - BITA_BDL_EF_BTDITA1=0x6, - BITA_BDL_MBIT1=0x7, - BITA_BDL_MBIT2=0x8, - - /* BRK */ - BITA_BRK_EF_BTDITA0=0xB, - BITA_BRK_EF_BTDITA1=0xC, - - /* DZB */ - BITA_DZB_MBIT1=0xF, - BITA_DZB_MBIT2=0x10, -}; - static btd_class* btd = NULL; static u32 ita_bmd[] = { BITA_BDL_MBIT1, BITA_BDL_MBIT2 }; diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 192af0436..8702f2895 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_branch.h" +#include "d/res/res_kwood_00.h" #include "JSystem/JUtility/JUTAssert.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" @@ -12,22 +13,6 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "dolphin/mtx/mtx.h" -enum KWOOD_00_RES_FILE_ID { - /* BAS */ - KWOOD_00_BAS_BREAK=0x0, - KWOOD_00_BAS_SWING=0x1, - KWOOD_00_BAS_SWING02=0x8, - - /* BCK */ - KWOOD_00_BCK_BREAK=0x2, - KWOOD_00_BCK_SWING=0x3, - KWOOD_00_BCK_SWING02=0x7, - - /* BMDC */ - KWOOD_00_BMD_WB=0x5, - KWOOD_00_BMD_WS=0x6, -}; - static u16 anim_table[] = { KWOOD_00_BCK_SWING02, KWOOD_00_BAS_SWING02, KWOOD_00_BCK_SWING, KWOOD_00_BAS_SWING, diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 11a2d27c8..ec12c3355 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_dr.h" +#include "d/res/res_dr.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" #include "m_Do/m_Do_ext.h" @@ -14,25 +15,6 @@ static daDr_HIO_c l_HIO; -enum DR_RES_FILE_ID { // IDs and indexes are synced - /* BAS */ - DR_BAS_ABARE1=0x5, - DR_BAS_ABARE2=0x6, - DR_BAS_AKUBI1=0x7, - DR_BAS_BIKU1=0x8, - - /* BCK */ - DR_BCK_DR_ABARE1=0xB, - DR_BCK_DR_ABARE2=0xC, - DR_BCK_DR_AKUBI1=0xD, - DR_BCK_DR_BIKU1=0xE, - DR_BCK_DR_HO1=0xF, - DR_BCK_DR_WAIT1=0x10, - - /* BMD */ - DR_BMD_DR1=0x13, -}; - /* 000000EC-00000148 .text __ct__10daDr_HIO_cFv */ daDr_HIO_c::daDr_HIO_c() { mChildID = -1; diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index a0a92c157..e7bea9a9e 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_ghostship.h" +#include "d/res/res_ayush.h" #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" @@ -12,18 +13,6 @@ #include "d/d_kankyo_wether.h" #include "d/res/res_cloth.h" -enum AYUSH_RES_FILE_ID { // IDs and indexes are synced - /* BDLM */ - AYUSH_BDL_AYUSH=0x5, - - /* BTK */ - AYUSH_BTK_AYUSH=0x8, - - /* TEX */ - AYUSH_BTI_B_GSHIP_HATA=0xB, - AYUSH_BTI_B_GSHIP_HO=0xC, -}; - // Needed for .data to match. static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; static f32 dummy2[3] = {1.0f, 1.0f, 1.0f}; diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index 6078fac98..9116d3468 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -4,6 +4,8 @@ // #include "d/actor/d_a_mbdoor.h" +#include "d/res/res_mbdoor.h" +#include "d/res/res_gbdoor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" #include "d/d_com_inf_game.h" @@ -11,28 +13,6 @@ #include "m_Do/m_Do_mtx.h" #include "d/actor/d_a_player.h" -enum MBDOOR_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - MBDOOR_BDL_S_MBD_L=0x4, - MBDOOR_BDL_S_MBD_R=0x5, - MBDOOR_BDL_S_MBDFU=0x6, - MBDOOR_BDL_S_MBDTO=0x7, - - /* DZB */ - MBDOOR_DZB_S_MBDFU=0xA, -}; - -enum GBDOOR_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - GBDOOR_BDL_V_GBD_L=0x4, - GBDOOR_BDL_V_GBD_R=0x5, - GBDOOR_BDL_V_GBDFU=0x6, - GBDOOR_BDL_V_GBDTO=0x7, - - /* DZB */ - GBDOOR_DZB_GBD=0xA, -}; - /* 00000078-00000084 .text getSwbit__10daMbdoor_cFv */ u8 daMbdoor_c::getSwbit() { return fopAcM_GetParam(this) & 0xFF; diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 444f8d20d..d25c3c15b 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_npc_bs1.h" +#include "d/res/res_bs.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/actor/d_a_player.h" @@ -60,70 +61,6 @@ static dCcD_SrcCyl l_cyl_src = { }, }; -enum BS_RES_FILE_ID { - /* BCKS */ - BS_BCK_BS_TALK01 = 0x0, - BS_BCK_BS_TALK02 = 0x1, - BS_BCK_BS_TALK03 = 0x2, - BS_BCK_BS_TALK04 = 0x3, - BS_BCK_BS_WAIT01 = 0x4, - BS_BCK_BS_LAUGH = 0xC, - BS_BCK_BS_PRAISE = 0xD, - BS_BCK_BS_ANGRY = 0xF, - BS_BCK_BS_MANTAN = 0x10, - - /* BDLM */ - BS_BDL_BS = 0x5, - BS_BDL_BS_MET = 0x6, - - /* BMDM */ - BS_BMD_SHOP_CURSOR01 = 0x7, - - /* BRK */ - BS_BRK_SHOP_CURSOR01 = 0x8, - - /* BTP */ - BS_BTP_BS = 0x9, - BS_BTP_LOOK = 0xA, - BS_BTP_MABA = 0xB, - BS_BTP_BS_PRAISE = 0xE, - - /* BDL */ - BS_BDL_VSOLD = 0x11, -}; - -enum BS_RES_FILE_INDEX { - /* BCKS */ - BS_INDEX_BCK_BS_TALK01 = 0x8, - BS_INDEX_BCK_BS_TALK02 = 0x9, - BS_INDEX_BCK_BS_TALK03 = 0xA, - BS_INDEX_BCK_BS_TALK04 = 0xB, - BS_INDEX_BCK_BS_WAIT01 = 0xC, - BS_INDEX_BCK_BS_LAUGH = 0xD, - BS_INDEX_BCK_BS_PRAISE = 0xE, - BS_INDEX_BCK_BS_ANGRY = 0xF, - BS_INDEX_BCK_BS_MANTAN = 0x10, - - /* BDLM */ - BS_INDEX_BDL_BS = 0x13, - BS_INDEX_BDL_BS_MET = 0x14, - - /* BMDM */ - BS_INDEX_BMD_SHOP_CURSOR01 = 0x17, - - /* BRK */ - BS_INDEX_BRK_SHOP_CURSOR01 = 0x1A, - - /* BTP */ - BS_INDEX_BTP_BS = 0x1D, - BS_INDEX_BTP_LOOK = 0x1E, - BS_INDEX_BTP_MABA = 0x1F, - BS_INDEX_BTP_BS_PRAISE = 0x20, - - /* BDL */ - BS_INDEX_BDL_VSOLD = 0x23, -}; - /* 000000EC-00000108 .text __ct__20daNpc_Bs1_childHIO_cFv */ daNpc_Bs1_childHIO_c::daNpc_Bs1_childHIO_c() {} diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 50e5b1e22..a3dd8190c 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_npc_btsw2.h" +#include "d/res/res_btsw.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_procname.h" @@ -12,72 +13,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -enum BTSW_RES_FILE_ID { - /* BCKS */ - BTSW_BCK_BN_KASIGE=0xF, - BTSW_BCK_BN_ONEGAI=0x10, - BTSW_BCK_BN_SIWAKE01=0x11, - BTSW_BCK_BN_SIWAKE02=0x12, - BTSW_BCK_BN_SUGOI=0x13, - BTSW_BCK_BN_TALK01=0x14, - BTSW_BCK_BN_TALK02=0x15, - BTSW_BCK_BN_WAIT01=0x16, - BTSW_BCK_BN_WAIT02=0x17, - BTSW_BCK_BN_WALK=0x18, - - /* BDL */ - BTSW_BDL_BN_KABAN=0xC, - BTSW_BDL_BM_LETTER=0x19, - BTSW_BDL_BN_TIRASI=0x1A, - - /* BDLM */ - BTSW_BDL_QMAIL=0x4, - BTSW_BDL_BN=0xD, - - /* BMDM */ - BTSW_BMD_SHOP_CURSOR01=0x5, - - /* BRK */ - BTSW_BRK_SHOP_CURSOR01=0x8, - - /* BTP */ - BTSW_BTP_QMAIL=0xA, - BTSW_BTP_BN_MABA=0xE, -}; - -enum BTSW_RES_FILE_INDEX { - /* BCKS */ - BTSW_INDEX_BCK_BN_KASIGE=0x8, - BTSW_INDEX_BCK_BN_ONEGAI=0x9, - BTSW_INDEX_BCK_BN_SIWAKE01=0xA, - BTSW_INDEX_BCK_BN_SIWAKE02=0xB, - BTSW_INDEX_BCK_BN_SUGOI=0xC, - BTSW_INDEX_BCK_BN_TALK01=0xD, - BTSW_INDEX_BCK_BN_TALK02=0xE, - BTSW_INDEX_BCK_BN_WAIT01=0xF, - BTSW_INDEX_BCK_BN_WAIT02=0x10, - BTSW_INDEX_BCK_BN_WALK=0x11, - - /* BDL */ - BTSW_INDEX_BDL_BN_KABAN=0x14, - BTSW_INDEX_BDL_BM_LETTER=0x15, - BTSW_INDEX_BDL_BN_TIRASI=0x16, - - /* BDLM */ - BTSW_INDEX_BDL_QMAIL=0x19, - BTSW_INDEX_BDL_BN=0x1A, - - /* BMDM */ - BTSW_INDEX_BMD_SHOP_CURSOR01=0x1D, - - /* BRK */ - BTSW_INDEX_BRK_SHOP_CURSOR01=0x20, - - /* BTP */ - BTSW_INDEX_BTP_QMAIL=0x23, - BTSW_INDEX_BTP_BN_MABA=0x24, -}; - // Needed for the .data section to match. static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; static f32 dummy2[3] = {1.0f, 1.0f, 1.0f}; diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 2a6fa6535..12c6df1f8 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_npc_kamome.h" +#include "d/res/res_kamome.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "m_Do/m_Do_hostIO.h" @@ -36,30 +37,6 @@ static cXyz l_ms_at_local_end(-100.0f, 20.0f, 0.0f); static cXyz l_line_bg_local_end(0.0f, 0.0f, 500.0f); static cXyz l_call_local_kyori(0.0f, 0.0f, 500.0f); -enum KAMOME_RES_FILE_ID { // IDs and indexes are synced - /* BAS */ - KAMOME_BAS_KA_FLY1=0x5, - KAMOME_BAS_KA_LAND1=0x6, - KAMOME_BAS_KA_MOVE1=0x7, - KAMOME_BAS_KA_WAIT1=0x8, - KAMOME_BAS_KA_WAIT2=0x9, - - /* BCK */ - KAMOME_BCK_KA_EAT1=0xC, - KAMOME_BCK_KA_FLY1=0xD, - KAMOME_BCK_KA_LAND1=0xE, - KAMOME_BCK_KA_MOVE1=0xF, - KAMOME_BCK_KA_SING1=0x10, - KAMOME_BCK_KA_SING2=0x11, - KAMOME_BCK_KA_WAIT1=0x12, - KAMOME_BCK_KA_WAIT2=0x13, - KAMOME_BCK_KA_WAIT3=0x14, - - /* BDL */ - KAMOME_BDL_KA=0x17, - KAMOME_BDL_KA_HYOI=0x18, -}; - /* 000000EC-00000174 .text __ct__16daNpc_kam_HIO1_cFv */ daNpc_kam_HIO1_c::daNpc_kam_HIO1_c() { mSpeedF = 17.0f; diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index 94be21de9..72e2cc311 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_AjavW.h" +#include "d/res/res_ajavw.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -12,17 +13,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -enum AJAVW_RES_FILE_ID { // IDs and indexes are synced - /* BDLM */ - AJAVW_BDL_AJAVW=0x5, - - /* BTK */ - AJAVW_BTK_AJAVW=0x8, - - /* DZB */ - AJAVW_DZB_AJAVW=0xB, -}; - namespace { static const char l_arcname[] = "AjavW"; }; diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index 6ff1fd241..3372d416d 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/src/d/actor/d_a_obj_eayogn.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_eayogn.h" +#include "d/res/res_eayogn.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -12,14 +13,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -enum EAYOGN_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - EAYOGN_BDL_EAYOGN=0x4, - - /* DZB */ - EAYOGN_DZB_EAYOGN=0x7, -}; - const char daObjEayogn_c::M_arcname[7] = "Eayogn"; /* 00000078-00000098 .text solidHeapCB__13daObjEayogn_cFP10fopAc_ac_c */ diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index 989953154..c20f61763 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_ganonbed.h" +#include "d/res/res_gbed.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" @@ -12,15 +13,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -enum GBED_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - GBED_BDL_K_GBED=0x4, - - /* DZB */ - GBED_DZB_K_GBED=0x7, - GBED_DZB_VTENG=0x8, -}; - namespace { static const char l_arcname[] = "Gbed"; }; diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index 6dcd80277..cf1d1e5c5 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_hfuck1.h" +#include "d/res/res_hfuck1.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_cc_d.h" @@ -13,14 +14,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -enum HFUCK1_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - HFUCK1_BDL_HFUCK1=0x4, - - /* DZB */ - HFUCK1_DZB_HFUCK1=0x7, -}; - namespace { static const char l_arcname[] = "Hfuck1"; diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index d8abea1a2..fb90b91cd 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/src/d/actor/d_a_obj_kanat.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_obj_kanat.h" +#include "d/res/res_kanat.h" #include "d/d_procname.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -11,14 +12,6 @@ Mtx daObjKanat::Act_c::M_tmp_mtx; const char daObjKanat::Act_c::M_arcname[] = "Kanat"; -enum KANAT_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - KANAT_BDL_KANAT=0x4, - - /* DZB */ - KANAT_DZB_KANAT=0x7, -}; - /* 00000078-0000012C .text CreateHeap__Q210daObjKanat5Act_cFv */ int daObjKanat::Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KANAT_BDL_KANAT); diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index ad495a4f9..39f3fc1c3 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -14,6 +14,13 @@ static f64 dummy4[2] = {3.0, 0.5}; static u8 dummy5[0x4C]; #include "d/actor/d_a_obj_movebox.h" +#include "d/res/res_ecube.h" +#include "d/res/res_hbox2.h" +#include "d/res/res_hjump.h" +#include "d/res/res_kkiba_00.h" +#include "d/res/res_mmirror.h" +#include "d/res/res_mpwrb.h" +#include "d/res/res_osiblk.h" #include "d/d_cc_d.h" #include "d/d_procname.h" #include "JSystem/JUtility/JUTAssert.h" @@ -25,80 +32,6 @@ static u8 dummy5[0x4C]; #include "d/actor/d_a_obj_mkie.h" #include "d/actor/d_a_player.h" -enum ECUBE_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - ECUBE_BDL_ECUBE=0x4, - - /* DZB */ - ECUBE_DZB_ECUBE=0x7, -}; - -enum HBOX2_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - HBOX2_BDL_HBOX2=0x4, - - /* DZB */ - HBOX2_DZB_HBOX2=0x7, -}; - -enum HJUMP_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - HJUMP_BDL_HBOX1=0x4, - HJUMP_BDL_HJUMP1=0x5, - HJUMP_BDL_HJUMP2=0x6, - - /* DZB */ - HJUMP_DZB_HBOX1=0x9, - HJUMP_DZB_HJUMP1A=0xA, - HJUMP_DZB_HJUMP1B=0xB, - HJUMP_DZB_HJUMP2=0xC, -}; - -enum KKIBA_00_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - KKIBA_00_BDL_KKIBA_00=0x4, - - /* DZB */ - KKIBA_00_DZB_KKIBA_00=0x7, -}; - -enum MMIRROR_RES_FILE_ID { // IDs and indexes are synced - /* BCK */ - MMIRROR_BCK_MSUSW=0x6, - - /* BDLM */ - MMIRROR_BDL_MMRR=0x9, - MMIRROR_BDL_MSUSW=0xA, - MMIRROR_BDL_YSSMR00=0xB, - - /* BTK */ - MMIRROR_BTK_MMRR=0xE, - MMIRROR_BTK_MSUSW=0xF, - MMIRROR_BTK_YSSMR00=0x10, - - /* DZB */ - MMIRROR_DZB_MMRR=0x13, - MMIRROR_DZB_MSUSW=0x14, -}; - -enum MPWRB_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - MPWRB_BDL_MPWRB=0x4, - - /* DZB */ - MPWRB_DZB_MPWRB=0x7, -}; - -enum OSIBLK_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - OSIBLK_BDL_OBM_OSIHIKIBLK1=0x4, - OSIBLK_BDL_OBM_OSIHIKIBLK2=0x5, - - /* DZB */ - OSIBLK_DZB_OBM_OSIHIKIBLK1=0x8, - OSIBLK_DZB_OBM_OSIHIKIBLK2=0x9, -}; - namespace daObjMovebox { dBgS_ObjGndChk Bgc_c::M_gnd_work[23]; dBgS_WtrChk Bgc_c::M_wrt_work; diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 1b718be8d..9ba2bc733 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -4,6 +4,9 @@ // #include "d/actor/d_a_obj_mtest.h" +#include "d/res/res_mtest.h" +#include "d/res/res_owater.h" +#include "d/res/res_astop.h" #include "d/d_procname.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/d_com_inf_game.h" @@ -27,37 +30,6 @@ char* daObjMtest::Act_c::M_arcname[Type_Max] = { "Astop", }; -enum MTEST_RES_FILE_ID { // IDs and indexes are synced - /* BMDC */ - MTEST_BMD_MCUBE=0x4, - MTEST_BMD_MCYLN=0x5, - - /* DZB */ - MTEST_DZB_MCUBE=0x8, - MTEST_DZB_MCUBEHG=0x9, - MTEST_DZB_MCUBELK=0xA, - MTEST_DZB_MCUBENC=0xB, - MTEST_DZB_MCYLN=0xC, - MTEST_DZB_MCYLNHG=0xD, - MTEST_DZB_MCYLNNC=0xE, - MTEST_DZB_MWTRSB=0xF, - MTEST_DZB_MYGNSB=0x10, -}; - -enum OWATER_RES_FILE_ID { // IDs and indexes are synced - /* DZB */ - OWATER_DZB_OWATER=0x3, -}; - -enum ASTOP_RES_FILE_ID { // IDs and indexes are synced - /* DZB */ - ASTOP_DZB_A00=0x3, - ASTOP_DZB_ASLOW=0x4, - ASTOP_DZB_ASLOW00=0x5, - ASTOP_DZB_ASTOP=0x6, - ASTOP_DZB_ASTOP00=0x7, -}; - cXyz daObjMtest::Act_c::M_scl_mult[Type_Max] = { cXyz(1.0f, 1.0f, 1.0f), cXyz(1.0f, 0.5f, 1.0f), diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp index 2065ade1a..ad71865a1 100644 --- a/src/d/actor/d_a_obj_ojtree.cpp +++ b/src/d/actor/d_a_obj_ojtree.cpp @@ -4,24 +4,15 @@ // #include "SSystem/SComponent/c_bg_w.h" +#include "d/res/res_ojtree.h" #include "d/actor/d_a_obj_ojtree.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" - - Mtx daObjOjtree::Act_c::M_tmp_mtx; const char daObjOjtree::Act_c::M_arcname[] = "Ojtree"; -enum OJTREE_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - OJTREE_BDL_OJTREE=0x4, - - /* DZB */ - OJTREE_DZB_OJTREE=0x7, -}; - /* 00000078-0000012C .text CreateHeap__Q211daObjOjtree5Act_cFv */ int daObjOjtree::Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, OJTREE_BDL_OJTREE); diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 9b9dc1f86..8ca525e90 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_pw.h" +#include "d/res/res_pw.h" #include "d/actor/d_a_player_main.h" #include "d/d_kankyo_rain.h" #include "d/d_procname.h" @@ -19,51 +20,6 @@ enum daPW__BehaviorType { UseDefault = 0xFF }; -enum PW_RES_FILE_ID { // IDs and indexes are synced - /* BAS */ - PW_BAS_ATTACK1=0x7, - PW_BAS_NIGERU1=0x8, - - /* BCK */ - PW_BCK_ANSIN1=0xB, - PW_BCK_ATTACK1=0xC, - PW_BCK_BUNRETU1=0xD, - PW_BCK_DAMAGE1=0xE, - PW_BCK_DAMAGE_K1=0xF, - PW_BCK_DERUA1=0x10, - PW_BCK_DERUB1=0x11, - PW_BCK_DERUB2=0x12, - PW_BCK_DOKI1=0x13, - PW_BCK_IDOU1=0x14, - PW_BCK_IDOU2=0x15, - PW_BCK_IKIGIRE1=0x16, - PW_BCK_JITTAIKA1=0x17, - PW_BCK_KIDUKU1=0x18, - PW_BCK_KIDUKU2=0x19, - PW_BCK_KIZETU1=0x1A, - PW_BCK_NIGERU1=0x1B, - PW_BCK_PRESS1=0x1C, - PW_BCK_SIRIMOTI1=0x1D, - PW_BCK_SYOUTEN1=0x1E, - PW_BCK_TORITUKI1=0x1F, - PW_BCK_TORITUKI2=0x20, - PW_BCK_TORITUKI3=0x21, - PW_BCK_TORITUKI_WAIT1=0x22, - PW_BCK_WAIT1=0x23, - PW_BCK_WAIT2=0x24, - - /* BDLM */ - PW_BDL_PW=0x27, - - /* BRK */ - PW_BRK_DEFAULT=0x2A, - PW_BRK_HIT=0x2B, - PW_BRK_JITTAIKA1=0x2C, - - /* BTP */ - PW_BTP_IROGAE1=0x2F, -}; - static bool TORITUKI_ON = false; /* 00000078-00000158 .text nodeCallBack__FP7J3DNodei */ diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 167d60e72..7cac86c96 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_rd.h" +#include "d/res/res_rd.h" #include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" @@ -60,40 +61,6 @@ const dCcD_SrcCyl daRd_c::m_cyl_src = { }, }; -enum RD_RES_FILE_ID { // IDs and indexes are synced - /* BCKS */ - RD_BCK_ATACK=0x6, - RD_BCK_ATACK2WALK=0x7, - RD_BCK_BEAM=0x8, - RD_BCK_BEAM_END=0x9, - RD_BCK_BEAM_HIT=0xA, - RD_BCK_DAMAGE=0xB, - RD_BCK_DEAD=0xC, - RD_BCK_IKARI_SAMPLE=0xD, - RD_BCK_KANOKEP=0xE, - RD_BCK_SUWARIP=0xF, - RD_BCK_SUWARU=0x10, - RD_BCK_TACHIP=0x11, - RD_BCK_TATSU=0x12, - RD_BCK_WALK=0x13, - RD_BCK_WALK2ATACK=0x14, - - /* BDLM */ - RD_BDL_RD=0x17, - - /* BRK */ - RD_BRK_BEAM=0x1A, - RD_BRK_BEAM_END=0x1B, - RD_BRK_BEAM_HIT=0x1C, - RD_BRK_NML=0x1D, - - /* BTK */ - RD_BTK_RD_CLOSE=0x20, - RD_BTK_RD_IKARI=0x21, - RD_BTK_RD_NML=0x22, - RD_BTK_RD_OPEN=0x23, -}; - /* 000000EC-0000027C .text __ct__10daRd_HIO_cFv */ daRd_HIO_c::daRd_HIO_c() { m2C = 0x0; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index e83d772d1..e87ab45c9 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_shop_item.h" +#include "d/res/res_fdai.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" #include "d/d_com_inf_game.h" @@ -15,41 +16,6 @@ #include "m_Do/m_Do_lib.h" #include "d/res/res_cloth.h" -enum FDAI_RES_FILE_ID { // IDs and indexes are synced - /* BCK */ - FDAI_BCK_FOBJ00=0x5, - FDAI_BCK_FOBJ01=0x6, - FDAI_BCK_FOBJ02=0x7, - FDAI_BCK_FOBJ05=0x8, - FDAI_BCK_FOBJ06=0x9, - FDAI_BCK_FOBJ07=0xA, - FDAI_BCK_FOBJ08=0xB, - FDAI_BCK_FOBJ09=0xC, - FDAI_BCK_FOBJ10=0xD, - FDAI_BCK_FOBJ11=0xE, - - /* BDL */ - FDAI_BDL_FDAI=0x11, - FDAI_BDL_FOBJ00=0x12, - FDAI_BDL_FOBJ01=0x13, - FDAI_BDL_FOBJ02=0x14, - FDAI_BDL_FOBJ03=0x15, - FDAI_BDL_FOBJ04=0x16, - FDAI_BDL_FOBJ05=0x17, - FDAI_BDL_FOBJ06=0x18, - FDAI_BDL_FOBJ07=0x19, - FDAI_BDL_FOBJ08=0x1A, - FDAI_BDL_FOBJ09=0x1B, - FDAI_BDL_FOBJ10=0x1C, - FDAI_BDL_FOBJ11=0x1D, - - /* TEX */ - FDAI_BTI_FTEX03=0x20, - FDAI_BTI_FTEX04=0x21, - FDAI_BTI_FTEX05=0x22, - FDAI_BTI_FTEX07=0x23, -}; - const char daShopItem_c::m_cloth_arcname[] = "Cloth"; const f32 daShopItem_c::m_cullfar_max = 5000.0f; diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 2577f4fb2..9f576e84d 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_tbox.h" +#include "d/res/res_dalways.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_s_acch.h" #include "d/d_bg_w.h" @@ -34,49 +35,6 @@ #define FUNC_TYPE_EXTRA_SAVE_INFO 7 #define FUNC_TYPE_EXTRA_SAVE_INFO_SPAWN 8 -enum DALWAYS_RES_FILE_ID { // IDs and indexes are synced - /* BCK */ - DALWAYS_BCK_BOXOPENBOX=0x8, - DALWAYS_BCK_BOXOPENSHORTBOX=0x9, - DALWAYS_BCK_IT_TAKARA_FLASH=0xA, - DALWAYS_BCK_IT_TAKARA_FLASH2=0xB, - - /* BDLI */ - DALWAYS_BDL_BOXA=0xE, - DALWAYS_BDL_BOXB=0xF, - DALWAYS_BDL_BOXC=0x10, - - /* BDLM */ - DALWAYS_BDL_BOX_SHADOW=0x13, - DALWAYS_BDL_BOXD=0x14, - DALWAYS_BDL_BOXSEA=0x15, - DALWAYS_BDL_IT_TAKARA_FLASH=0x16, - DALWAYS_BDL_YTRIF00=0x17, - - /* BRK */ - DALWAYS_BRK_BOX_SHADOW=0x1A, - DALWAYS_BRK_BOXA=0x1B, - DALWAYS_BRK_BOXB=0x1C, - DALWAYS_BRK_BOXC=0x1D, - DALWAYS_BRK_IT_TAKARA_FLASH=0x1E, - DALWAYS_BRK_YTRIF00=0x1F, - - /* BTK */ - DALWAYS_BTK_BOXA=0x22, - DALWAYS_BTK_BOXB=0x23, - DALWAYS_BTK_BOXC=0x24, - DALWAYS_BTK_IT_TAKARA_FLASH=0x25, - - /* DZB */ - DALWAYS_DZB_BOXA_00=0x28, - DALWAYS_DZB_BOXA_01=0x29, - DALWAYS_DZB_BOXB_00=0x2A, - DALWAYS_DZB_BOXB_01=0x2B, - DALWAYS_DZB_BOXD_00=0x2C, - DALWAYS_DZB_BOXD_01=0x2D, - DALWAYS_DZB_KINB_00=0x2E, -}; - extern dCcD_SrcCyl dNpc_cyl_src; // Needed for the .data section to match. diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 1b473705c..008c2c934 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -4,6 +4,9 @@ // #include "d/actor/d_a_wall.h" +#include "d/res/res_hbw1.h" +#include "d/res/res_htw1.h" +#include "d/res/res_hbw2.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" @@ -16,30 +19,6 @@ static Vec dummy_2080 = {1.0f, 1.0f, 1.0f}; static u8 dummy_1811[] = {0x02, 0x00, 0x02, 0x01}; static f64 dummy4[2] = {3.0, 0.5}; -enum HBW1_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - HBW1_BDL_HBW1=0x4, - - /* DZB */ - HBW1_DZB_HBW1=0x7, -}; - -enum HTW1_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - HTW1_BDL_HTW1=0x4, - - /* DZB */ - HTW1_DZB_HTW1=0x7, -}; - -enum HBW2_RES_FILE_ID { // IDs and indexes are synced - /* BDL */ - HBW2_BDL_HBW2=0x4, - - /* DZB */ - HBW2_DZB_HBW2=0x7, -}; - const s16 daWall_c::m_heapsize[3] = { 0x1160, 0x1DD0,