From c95047ac7667e03479bae51b870771814390dbb4 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 7 Oct 2023 13:54:07 -0400 Subject: [PATCH] Add Always.arc files enum --- include/d/d_com_inf_game.h | 135 +++++++++++++++++++++++++++++++++++++ src/d/actor/d_a_nh.cpp | 4 +- src/d/d_kankyo_rain.cpp | 10 +-- src/d/d_kankyo_wether.cpp | 24 +++---- src/d/d_s_play.cpp | 10 +-- src/d/d_s_title.cpp | 6 +- 6 files changed, 162 insertions(+), 27 deletions(-) diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index a3ed183f0..1ff10474e 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -39,6 +39,141 @@ class camera_class; class J2DOrthoGraph; class dDemo_actor_c; +enum ALWAYS_RES_FILE_IDS { + /* BCK */ + ALWAYS_BCK_FA=0xC, + ALWAYS_BCK_OBM_SYOUGEKISW=0xD, + ALWAYS_BCK_START=0xE, + ALWAYS_BCK_VBELL=0xF, + ALWAYS_BCK_VBOKL=0x10, + ALWAYS_BCK_VCHUL=0x11, + ALWAYS_BCK_VDOKL=0x12, + ALWAYS_BCK_VESAL=0x13, + ALWAYS_BCK_VHANL=0x14, + ALWAYS_BCK_VHAPL=0x15, + ALWAYS_BCK_W_PILLAR_A=0x16, + ALWAYS_BCK_YJ_DELETE=0x17, + ALWAYS_BCK_YJ_IN=0x18, + ALWAYS_BCK_YJ_LOOP=0x19, + ALWAYS_BCK_YJ_OUT=0x1A, + ALWAYS_BCK_YJ_SCALE=0x1B, + + /* BDL */ + ALWAYS_BDL_ARROWITEM=0x1E, + ALWAYS_BDL_FA=0x1F, + ALWAYS_BDL_KROCK_00=0x20, + ALWAYS_BDL_OBM_KOISI1=0x21, + ALWAYS_BDL_OBM_KOISI2=0x22, + ALWAYS_BDL_OBM_KOTUBO1=0x23, + ALWAYS_BDL_OBM_OOTUBO1=0x24, + ALWAYS_BDL_VBELL=0x25, + ALWAYS_BDL_VBOKL=0x26, + ALWAYS_BDL_VDOKL=0x27, + ALWAYS_BDL_VESAL=0x28, + ALWAYS_BDL_VHAPL=0x29, + ALWAYS_BDL_VHRTL=0x2A, + ALWAYS_BDL_VKEYL=0x2B, + + /* BDLM */ + ALWAYS_BDL_IB=0x2E, + ALWAYS_BDL_MPA_SIMI=0x2F, + ALWAYS_BDL_MPI_KOISHI=0x30, + ALWAYS_BDL_MPM_TUBO=0x31, + ALWAYS_BDL_MPODA=0x32, + ALWAYS_BDL_MPODB=0x33, + ALWAYS_BDL_NH=0x34, + ALWAYS_BDL_OBM_SYOUGEKISW=0x35, + ALWAYS_BDL_VCHUL=0x36, + ALWAYS_BDL_VHANL=0x37, + ALWAYS_BDL_VHKAL=0x38, + ALWAYS_BDL_VHUTL=0x39, + ALWAYS_BDL_VLUPL=0x3A, + ALWAYS_BDL_W_PILLAR_A=0x3B, + ALWAYS_BDL_YA=0x3C, + ALWAYS_BDL_YAZIRUSHI_01=0x3D, + ALWAYS_BDL_YTHDR00=0x3E, + + /* BMTM */ + ALWAYS_BMT_ICE=0x41, + + /* BPK */ + ALWAYS_BPK_YJ_DELETE=0x44, + ALWAYS_BPK_YJ_IN=0x45, + ALWAYS_BPK_YJ_LOOP=0x46, + ALWAYS_BPK_YJ_OUT=0x47, + ALWAYS_BPK_YJ_SCALE=0x48, + + /* BRK */ + ALWAYS_BRK_IB_01=0x4B, + ALWAYS_BRK_IB_02=0x4C, + ALWAYS_BRK_MPA_SIMI=0x4D, + ALWAYS_BRK_TNH=0x4E, + ALWAYS_BRK_VCHUL=0x4F, + ALWAYS_BRK_VHANL=0x50, + ALWAYS_BRK_VLUPL=0x51, + ALWAYS_BRK_YTHDR00=0x52, + + /* BTK */ + ALWAYS_BTK_EFA_USONAMI_01=0x55, + ALWAYS_BTK_IB=0x56, + ALWAYS_BTK_ICE=0x57, + ALWAYS_BTK_OBM_SYOUGEKISW=0x58, + ALWAYS_BTK_VBELL=0x59, + ALWAYS_BTK_VHANL=0x5A, + ALWAYS_BTK_VHKAL=0x5B, + ALWAYS_BTK_VHUTL=0x5C, + ALWAYS_BTK_VLUPL=0x5D, + ALWAYS_BTK_W_PILLAR_A=0x5E, + ALWAYS_BTK_YA=0x5F, + ALWAYS_BTK_YTHDR00=0x60, + + /* BTP */ + ALWAYS_BTP_MPA_SIMI=0x63, + ALWAYS_BTP_MPI_KIBAKO_TARU=0x64, + ALWAYS_BTP_MPI_KINOHAHEN=0x65, + ALWAYS_BTP_MPI_KOISHI=0x66, + ALWAYS_BTP_MPM_TUBO=0x67, + + /* DAT */ + ALWAYS_BIN_ITEM_TABLE=0x6A, + + /* TEX */ + ALWAYS_BTI_AK_HOUSHI00=0x6D, + ALWAYS_BTI_AK_SMOKE01=0x6E, + ALWAYS_BTI_B_SEA_TEX0AND2=0x6F, + ALWAYS_BTI_B_WYURAYURA_TEX1=0x70, + ALWAYS_I4_BALL128B=0x71, + ALWAYS_BTI_BLACK_WHITE_2=0x72, + ALWAYS_BTI_CAMERA_FREE=0x73, + ALWAYS_BTI_CAMERA_SELF=0x74, + ALWAYS_BTI_F_SHIPICON=0x75, + ALWAYS_CI4_MAP08G=0x76, + ALWAYS_CI4_MAP16G=0x77, + ALWAYS_BTI_MAP_BLACK_CI8=0x78, + ALWAYS_BTI_MAP_CHECK16_CI4=0x79, + ALWAYS_BTI_MAP_FRAME1=0x7A, + ALWAYS_BTI_MAP_FRAME2=0x7B, + ALWAYS_BTI_MAP_FRAME3=0x7C, + ALWAYS_BTI_MAP_FRAME4=0x7D, + ALWAYS_BTI_ROPE=0x7E, + ALWAYS_BTI_SHMREF=0x7F, + ALWAYS_BTI_TREASUREBOX=0x80, + ALWAYS_I8_TX_SNOW01=0x81, + ALWAYS_BTI_TXA_LENS_32HALF=0x82, + ALWAYS_BTI_TXA_MOYA_A_64=0x83, + ALWAYS_BTI_TXA_MOYA_B_64=0x84, + ALWAYS_BTI_TXA_RING_A_32HAFE=0x85, + ALWAYS_BTI_TXA_TAIYO=0x86, + ALWAYS_BTI_TXA_TUKI_AS=0x87, + ALWAYS_BTI_TXA_TUKI_BS=0x88, + ALWAYS_BTI_TXA_TUKI_CS=0x89, + ALWAYS_BTI_TXA_TUKI_DS=0x8A, + ALWAYS_BTI_TXA_USONAMI_256_64MIP=0x8B, + ALWAYS_BTI_TXA_USONAMI_M_256_64MIP=0x8C, + ALWAYS_BTI_TXM_ROPE1=0x8D, + ALWAYS_BTI_UMIPT=0x8E, +}; + class __d_timer_info_c { public: __d_timer_info_c() { diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index c8691a402..11fff8b6d 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -209,7 +209,7 @@ void daNh_c::setBaseMtx() { /* 800F9980-800F9A54 .text createHeap__6daNh_cFv */ BOOL daNh_c::createHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", 0x34); // nh.bdl + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_NH); JUT_ASSERT(359, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); @@ -533,7 +533,7 @@ BOOL daNh_c::initBrkAnm(bool i_modify) { J3DModelData* modelData = mpModel->getModelData(); bool success = false; - J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", 0x4E); // tnh.brk + J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", ALWAYS_BRK_TNH); JUT_ASSERT(883, a_brk != 0); if (mBrkAnm.init(modelData, a_brk, true, 2, 1.0f, 0, -1, i_modify, false)) { diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 7ebc4ac71..3b1d4caec 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -182,8 +182,8 @@ void dKyr_sun_move() { /* 8008CF68-8008D0B4 .text dKyr_rain_init__Fv */ void dKyr_rain_init() { camera_class * pCamera = dComIfGp_getCamera(0); - g_env_light.mpRainPacket->mpTxSnow01 = (u8*)dComIfG_getObjectRes("Always", 0x81); - g_env_light.mpRainPacket->mpTxRingAHalf = (u8*)dComIfG_getObjectRes("Always", 0x85); + g_env_light.mpRainPacket->mpTxSnow01 = (u8*)dComIfG_getObjectRes("Always", ALWAYS_I8_TX_SNOW01); + g_env_light.mpRainPacket->mpTxRingAHalf = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_RING_A_32HAFE); g_env_light.mpRainPacket->mCamEyePos = pCamera->mLookat.mEye; g_env_light.mpRainPacket->mCamCenterPos = pCamera->mLookat.mCenter; g_env_light.mpRainPacket->mCenterDeltaMul = 0.0f; @@ -232,7 +232,7 @@ void dKyr_snow_init() { g_env_light.mpSnowPacket = new(0x20) dKankyo_snow_Packet(); if (g_env_light.mpSnowPacket != NULL) { if (strcmp(dComIfGp_getStartStageName(), "Adanmae") != 0) { - g_env_light.mpSnowPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", 0x81); + g_env_light.mpSnowPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", ALWAYS_I8_TX_SNOW01); } else { g_env_light.mpSnowPacket->mpTexture = (u8*)dComIfG_getStageRes("Stage", "ak_kazanbai00.bti"); } @@ -262,7 +262,7 @@ void dKyr_kazanbai_tamari_move() { void dKyr_star_init() { g_env_light.mpStarPacket = new(0x20) dKankyo_star_Packet(); if (g_env_light.mpStarPacket != NULL) { - g_env_light.mpStarPacket->field_0x10 = (u8*)dComIfG_getObjectRes("Always", 0x81); + g_env_light.mpStarPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", ALWAYS_I8_TX_SNOW01); g_env_light.mpStarPacket->mStarEff[0].mSin = 1.0f; g_env_light.mpStarPacket->mCount = 0; } @@ -313,7 +313,7 @@ void poison_init() { g_env_light.mpPoisonPacket->field_0xbb9c.z = 0.0f; g_env_light.mpPoisonPacket->mCount = 0; if (g_env_light.mpPoisonPacket != NULL) { - g_env_light.mpPoisonPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", 0x6e); + g_env_light.mpPoisonPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_AK_SMOKE01); for (u32 i = 0; i < ARRAY_SIZE(g_env_light.mpPoisonPacket->mEff); i++) g_env_light.mpPoisonPacket->mEff[i].mStatus = 0; poison_move(); diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 9a6c86d22..63b365d03 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -477,15 +477,15 @@ void wether_move_sun() { if (g_env_light.mpSunPacket != NULL && g_env_light.mpSunlenzPacket != NULL) { g_env_light.mpSunPacket->mpTextureData[0] = - (u8*)dComIfG_getObjectRes("Always", 0x87); + (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TUKI_AS); g_env_light.mpSunPacket->mpTextureData[1] = - (u8*)dComIfG_getObjectRes("Always", 0x88); + (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TUKI_BS); g_env_light.mpSunPacket->mpTextureData[2] = - (u8*)dComIfG_getObjectRes("Always", 0x89); + (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TUKI_CS); g_env_light.mpSunPacket->mpTextureData[3] = - (u8*)dComIfG_getObjectRes("Always", 0x8A); + (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TUKI_DS); g_env_light.mpSunPacket->mpTextureData[4] = - (u8*)dComIfG_getObjectRes("Always", 0x86); + (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_TAIYO); g_env_light.mpSunPacket->field_0x3c = 0; g_env_light.mpSunPacket->field_0x3d = 0; g_env_light.mpSunPacket->mVisibility = 0.0f; @@ -497,11 +497,11 @@ void wether_move_sun() { g_env_light.mpSunPacket->mVizChkData[3] = 0; g_env_light.mpSunlenzPacket->mpTexSnow01 = - (u8*)dComIfG_getObjectRes("Always", 0x81); + (u8*)dComIfG_getObjectRes("Always", ALWAYS_I8_TX_SNOW01); g_env_light.mpSunlenzPacket->mpTexLensHalf = - (u8*)dComIfG_getObjectRes("Always", 0x82); + (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_LENS_32HALF); g_env_light.mpSunlenzPacket->mpTexRingHalf = - (u8*)dComIfG_getObjectRes("Always", 0x85); + (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_RING_A_32HAFE); g_env_light.mpSunlenzPacket->field_0x88 = 1000000000.0f; g_env_light.mpSunlenzPacket->field_0x8c = 0.0f; g_env_light.mpSunlenzPacket->mDistFalloff = 0.0f; @@ -682,7 +682,7 @@ void wether_move_housi() { return; } - g_env_light.mpHousiPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", 0x6D); + g_env_light.mpHousiPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_AK_HOUSHI00); g_env_light.mpHousiPacket->field_0x5ddc = 0.0f; for (int i = 0; i < 300; i++) { @@ -715,7 +715,7 @@ void wether_move_moya() { return; } - g_env_light.mpMoyaPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", 0x84); + g_env_light.mpMoyaPacket->mpTexture = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_MOYA_B_64); for (int i = 0; i < 100; i++) { g_env_light.mpMoyaPacket->mEff[i].mStatus = 0; @@ -844,8 +844,8 @@ void wether_move_wave() { return; } - g_env_light.mpWavePacket->mpTexUsonami = (u8*)dComIfG_getObjectRes("Always", 0x8B); - g_env_light.mpWavePacket->mpTexUsonamiM = (u8*)dComIfG_getObjectRes("Always", 0x8C); + g_env_light.mpWavePacket->mpTexUsonami = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_USONAMI_256_64MIP); + g_env_light.mpWavePacket->mpTexUsonamiM = (u8*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXA_USONAMI_M_256_64MIP); for (int i = 0; i < 300; i++) { g_env_light.mpWavePacket->mpWaveEff[i].mState = 0; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 82ae7d827..7b7cff940 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -504,8 +504,8 @@ int phase_1(dScnPly_ply_c* i_this) { int rt = dComIfG_setStageRes("Stage", NULL); JUT_ASSERT(3458, rt == 1); - dMat_control_c::create((J3DMaterialTable*)dComIfG_getObjectRes("Always", 0x41), - (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", 0x57)); + dMat_control_c::create((J3DMaterialTable*)dComIfG_getObjectRes("Always", ALWAYS_BMT_ICE), + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_ICE)); return cPhs_NEXT_e; } @@ -585,7 +585,7 @@ extern scene_process_profile_definition g_profile_PLAY_SCENE = { 0, 0, &g_fopScn_Method.mBase, - &l_dScnPly_Method.base.mBase, + &l_dScnPly_Method, }; extern scene_process_profile_definition g_profile_OPENING_SCENE = { @@ -598,7 +598,7 @@ extern scene_process_profile_definition g_profile_OPENING_SCENE = { 0, 0, &g_fopScn_Method.mBase, - &l_dScnPly_Method.base.mBase, + &l_dScnPly_Method, }; extern scene_process_profile_definition g_profile_OPENING2_SCENE = { @@ -611,5 +611,5 @@ extern scene_process_profile_definition g_profile_OPENING2_SCENE = { 0, 0, &g_fopScn_Method.mBase, - &l_dScnPly_Method.base.mBase, + &l_dScnPly_Method, }; diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 9d4434168..59069c32f 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -42,7 +42,7 @@ void dScnTitle_Create(scene_class*) { /* Nonmatching */ } -static leafdraw_method_class l_dScnTitle_Method = { +static scene_method_class l_dScnTitle_Method = { (process_method_func)dScnTitle_Create, (process_method_func)dScnTitle_Delete, (process_method_func)dScnTitle_Execute, @@ -60,7 +60,7 @@ extern scene_process_profile_definition g_profile_TITLE_SCENE = { 0, 0, &g_fopScn_Method.mBase, - &l_dScnTitle_Method.mBase, + &l_dScnTitle_Method, }; extern scene_process_profile_definition g_profile_ENDING_SCENE = { @@ -73,5 +73,5 @@ extern scene_process_profile_definition g_profile_ENDING_SCENE = { 0, 0, &g_fopScn_Method.mBase, - &l_dScnTitle_Method.mBase, + &l_dScnTitle_Method, };