mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-17 21:03:35 -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_bgn2.cpp
+22 -22
View File
@@ -10,7 +10,7 @@
#include "d/actor/d_a_player.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/res/res_bgn.h"
#include "res/Object/Bgn.h"
class daBgn2_HIO_c : public JORReflexible {
public:
@@ -287,13 +287,13 @@ static s32 pos_move(bgn2_class* i_this) {
static void start(bgn2_class* i_this) {
switch (i_this->m0314) {
case 0:
anm_init(i_this, BGN_BCK_DERU1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_DERU1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
// fallthrough
case 1:
if (i_this->mpBodyMorf->isStop()) {
i_this->m0312 = 1;
anm_init(i_this, BGN_BCK_RAKKA1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
}
break;
@@ -325,7 +325,7 @@ static void plesattack(bgn2_class* i_this) {
break;
}
i_this->m2E82 = 0;
anm_init(i_this, BGN_BCK_RAKKA1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
if (actor->health == 3) {
i_this->m0330[0] = l_HIO.m1E;
@@ -337,7 +337,7 @@ static void plesattack(bgn2_class* i_this) {
}
case 1:
if (i_this->mpBodyMorf->isStop()) {
anm_init(i_this, BGN_BCK_RAKKA2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 2;
}
// fallthrough
@@ -349,7 +349,7 @@ static void plesattack(bgn2_class* i_this) {
i_this->m2E79 = 1;
if (checkGround(i_this)) {
ki_set(i_this);
anm_init(i_this, BGN_BCK_SETTI1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_SETTI1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 3;
dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
sVar6 = actor->health;
@@ -401,7 +401,7 @@ static void jumpattack(bgn2_class* i_this) {
pBrk = i_this->mpBodyMorf->getModel();
switch (i_this->m0314) {
case 0:
anm_init(i_this, BGN_BCK_JUMP1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_JUMP1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
// fallthrough
case 1:
@@ -494,7 +494,7 @@ static void damage(bgn2_class* i_this) {
i_this->mpHeadMorf->play(&actor->current.pos, 0, 0);
switch (i_this->m0314) {
case 0:
anm_init(i_this, BGN_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
// fallthrough
case 1:
@@ -530,7 +530,7 @@ static void hensin(bgn2_class* i_this) {
switch (i_this->m0314) {
#if VERSION == VERSION_DEMO
case 0:
anm_init(i_this, BGN_BCK_WAIT2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_WAIT2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m0314 = 1;
i_this->m0330[0] = 0x96;
bgn->mCSMode = 10;
@@ -538,7 +538,7 @@ static void hensin(bgn2_class* i_this) {
case 1:
#else
case 0:
anm_init(i_this, BGN_BCK_SETTI1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_SETTI1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
bgn->mCSMode = 10;
actor->speed.y = REG8_F(0xc) + 50.0f;
@@ -547,7 +547,7 @@ static void hensin(bgn2_class* i_this) {
case 1:
if (i_this->m0330[0] == 0) {
i_this->m0314 = 2;
anm_init(i_this, BGN_BCK_WAIT2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_WAIT2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m0330[0] = REG8_S(5) + 0x5a;
actor->speed.y = 0.0f;
}
@@ -560,7 +560,7 @@ static void hensin(bgn2_class* i_this) {
if (i_this->m0330[0] == 0) {
i_this->m0314 = 5;
i_this->m0330[0] = 0x46;
anm_init(i_this, BGN_BCK_MODORU1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_MODORU1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_BGN_T_TO_M_1, 0);
}
break;
@@ -1079,10 +1079,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
bgn2_class* i_this = (bgn2_class*)a_this;
i_this->mpHeadMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_HEAD1),
(J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_HEAD1_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_BGN_HEAD1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_BGN_HEAD1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1096,10 +1096,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
i_this->mpBodyMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_KUMO1),
(J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_KUMO1_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_WAIT1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_WAIT1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1112,12 +1112,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if ((i_this->mpBodyMorf == NULL) || (i_this->mpBodyMorf->getModel() == NULL)) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENA, BGN_BDL_BGN_JYAKUTENA2));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENA_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENA2_e));
i_this->mpJyakutenModel[2] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenModel[2] == NULL) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENB, BGN_BDL_BGN_JYAKUTENB2));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENB_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENB2_e));
i_this->mpJyakutenModel[1] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenModel[1] == NULL) {
return FALSE;
@@ -1128,11 +1128,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENB2));
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENB2_e));
if (!i_this->mJyakutenBBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENC, BGN_BDL_BGN_JYAKUTENC2));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENC_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENC2_e));
i_this->mpJyakutenModel[0] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenModel[0] == NULL) {
return FALSE;
@@ -1143,11 +1143,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENC2));
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENC2_e));
if (!i_this->mJyakutenCBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1);
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e);
if (!i_this->mRedRopeMat.init(1, 0x3C, pBti, 1)) {
return FALSE;
}