mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 21:18:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update all code to use the new enum formats

Browse Source
This commit is contained in:
LagoLunatic
2026-05-29 15:45:57 -04:00
parent 5ac87a6885
commit bae595b973
299 changed files with 5151 additions and 5134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_tbox.cpp
+30 -30
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_tbox.h"
#include "d/d_npc.h"
#include "d/res/res_dalways.h"
#include "res/Object/Dalways.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_bg_s_acch.h"
#include "d/d_bg_w.h"
@@ -34,36 +34,36 @@ static daTbox_HIO_c l_HIO;
static daTbox_c::modelInfo l_modelInfo[] = {
{
DALWAYS_BDL_BOXA,
DALWAYS_BCK_BOXOPENSHORTBOX,
DALWAYS_BTK_BOXA,
DALWAYS_BRK_BOXA,
DALWAYS_DZB_BOXB_00,
DALWAYS_DZB_BOXB_01,
dRes_INDEX_DALWAYS_BDL_BOXA_e,
dRes_INDEX_DALWAYS_BCK_BOXOPENSHORTBOX_e,
dRes_INDEX_DALWAYS_BTK_BOXA_e,
dRes_INDEX_DALWAYS_BRK_BOXA_e,
dRes_INDEX_DALWAYS_DZB_BOXB_00_e,
dRes_INDEX_DALWAYS_DZB_BOXB_01_e,
},
{
DALWAYS_BDL_BOXB,
DALWAYS_BCK_BOXOPENBOX,
DALWAYS_BTK_BOXB,
DALWAYS_BRK_BOXB,
DALWAYS_DZB_BOXB_00,
DALWAYS_DZB_BOXB_01,
dRes_INDEX_DALWAYS_BDL_BOXB_e,
dRes_INDEX_DALWAYS_BCK_BOXOPENBOX_e,
dRes_INDEX_DALWAYS_BTK_BOXB_e,
dRes_INDEX_DALWAYS_BRK_BOXB_e,
dRes_INDEX_DALWAYS_DZB_BOXB_00_e,
dRes_INDEX_DALWAYS_DZB_BOXB_01_e,
},
{
DALWAYS_BDL_BOXC,
DALWAYS_BCK_BOXOPENBOX,
DALWAYS_BTK_BOXC,
DALWAYS_BRK_BOXC,
DALWAYS_DZB_BOXB_00,
DALWAYS_DZB_BOXB_01,
dRes_INDEX_DALWAYS_BDL_BOXC_e,
dRes_INDEX_DALWAYS_BCK_BOXOPENBOX_e,
dRes_INDEX_DALWAYS_BTK_BOXC_e,
dRes_INDEX_DALWAYS_BRK_BOXC_e,
dRes_INDEX_DALWAYS_DZB_BOXB_00_e,
dRes_INDEX_DALWAYS_DZB_BOXB_01_e,
},
{
DALWAYS_BDL_BOXD,
DALWAYS_BCK_BOXOPENBOX,
dRes_INDEX_DALWAYS_BDL_BOXD_e,
dRes_INDEX_DALWAYS_BCK_BOXOPENBOX_e,
-1,
-1,
DALWAYS_DZB_BOXD_00,
DALWAYS_DZB_BOXD_01,
dRes_INDEX_DALWAYS_DZB_BOXD_00_e,
dRes_INDEX_DALWAYS_DZB_BOXD_01_e,
}
};
@@ -130,7 +130,7 @@ cPhs_State daTbox_c::commonShapeSet() {
// Set up Triforce platform for the type that spawns via Wind Waker song
if (getFuncType() == FUNC_TYPE_TACT) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", DALWAYS_BDL_YTRIF00);
modelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BDL_YTRIF00_e);
JUT_ASSERT(0xE2, modelData);
mpTactPlatformMdl = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000000);
@@ -138,7 +138,7 @@ cPhs_State daTbox_c::commonShapeSet() {
return cPhs_ERROR_e;
}
J3DAnmTevRegKey* tactPlatformBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BRK_YTRIF00);
J3DAnmTevRegKey* tactPlatformBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BRK_YTRIF00_e);
if (mTactPlatformBrk.init(modelData, tactPlatformBrk, true, J3DFrameCtrl::EMode_NONE) == 0) {
return cPhs_ERROR_e;
}
@@ -162,7 +162,7 @@ cPhs_State daTbox_c::commonShapeSet() {
/* 00000598-00000764 .text effectShapeSet__8daTbox_cFv */
cPhs_State daTbox_c::effectShapeSet() {
J3DModelData* flashModelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", DALWAYS_BDL_IT_TAKARA_FLASH);
J3DModelData* flashModelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BDL_IT_TAKARA_FLASH_e);
JUT_ASSERT(0x117, flashModelData != NULL);
mpFlashMdl = mDoExt_J3DModel__create(flashModelData, 0x80000, 0x1000200);
@@ -170,17 +170,17 @@ cPhs_State daTbox_c::effectShapeSet() {
return cPhs_ERROR_e;
}
J3DAnmTransform* flashAnm = (J3DAnmTransform*)dComIfG_getObjectRes("Dalways", DALWAYS_BCK_IT_TAKARA_FLASH2);
J3DAnmTransform* flashAnm = (J3DAnmTransform*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BCK_IT_TAKARA_FLASH2_e);
if (mFlashAnm.init(flashModelData, flashAnm, true, J3DFrameCtrl::EMode_NONE) == 0) {
return cPhs_ERROR_e;
}
J3DAnmTextureSRTKey* flashTexAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BTK_IT_TAKARA_FLASH);
J3DAnmTextureSRTKey* flashTexAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BTK_IT_TAKARA_FLASH_e);
if (mFlashTexAnm.init(flashModelData, flashTexAnm, true, J3DFrameCtrl::EMode_NONE) == 0) {
return cPhs_ERROR_e;
}
J3DAnmTevRegKey* flashRegAnm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BRK_IT_TAKARA_FLASH);
J3DAnmTevRegKey* flashRegAnm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BRK_IT_TAKARA_FLASH_e);
int regInit = mFlashRegAnm.init(flashModelData, flashRegAnm, true, J3DFrameCtrl::EMode_NONE);
if (regInit) {
@@ -250,7 +250,7 @@ cPhs_State daTbox_c::bgCheckSet() {
}
if (getFuncType() == FUNC_TYPE_SWITCH_VISIBLE) {
bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", DALWAYS_DZB_KINB_00);
bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_DZB_KINB_00_e);
JUT_ASSERT(0x1B9, bgd != NULL);
mpBgWVines = new dBgW();