mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 05:08:57 -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_bwds.cpp
+32 -32
View File
@@ -10,8 +10,8 @@
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_mtx.h"
#include "d/res/res_bwds.h"
#include "d/res/res_bwd.h"
#include "res/Object/Bwds.h"
#include "res/Object/Bwd.h"
#include "d/actor/d_a_player.h"
enum ActionStatus {
@@ -231,7 +231,7 @@ static void ug_move(bwds_class* i_this) {
s16 sVar5 = 0;
switch (i_this->m02F8) {
case -10:
anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1);
i_this->m02F8 = 3;
i_this->m030C = REG0_F(3) + 3000.0f;
actor->speedF = l_HIO.m010;
@@ -253,7 +253,7 @@ static void ug_move(bwds_class* i_this) {
fopAcM_seStart(actor, JA_SE_CV_BWD_C_ATTACK, 0);
break;
case 0:
anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 2.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 2.0f, 0, 1.0f, -1);
actor->current.pos.y = i_this->m0504;
i_this->m02F8++;
actor->shape_angle.z = 0;
@@ -276,7 +276,7 @@ static void ug_move(bwds_class* i_this) {
sVar5 = fVar1 * cM_ssin(i_this->m02F4 * (REG0_S(3) + 0x514));
if (fVar8 < 600.0f + REG0_F(12)) {
anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1);
i_this->m02F8++;
actor->speedF = l_HIO.m010;
actor->speed.y = REG0_F(13) + 50.0f;
@@ -375,7 +375,7 @@ static void hook_on(bwds_class* i_this) {
i_this->m031E = 3;
switch (i_this->m02F8) {
case 0:
anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 2.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 2.0f, 0, 1.0f, -1);
i_this->m02F8++;
local_34 = player->eyePos - actor->eyePos;
@@ -398,7 +398,7 @@ static void hook_chance(bwds_class* i_this) {
i_this->m0670[0].OnCoSetBit();
switch (i_this->m02F8) {
case 0:
anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1);
i_this->m02F8++;
i_this->m0314[0] = l_HIO.m014;
// FALL-THROUGH
@@ -419,9 +419,9 @@ static void hook_chance(bwds_class* i_this) {
i_this->m0502 = cM_rndFX(REG0_F(5) + 2500.0f);
if (cM_rndF(1.0f) < 0.5f) {
if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 5.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 5.0f, 0, 1.0f, -1);
} else {
anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 5.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 5.0f, 2, 1.0f, -1);
}
}
}
@@ -832,48 +832,48 @@ static BOOL daBwds_Delete(bwds_class* i_this) {
return TRUE;
}
static u16 body_bdl[] = {
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_SHIPPO,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_SHIPPO_e,
};
/* 00003278-00003634 .text useHeapInit__FP10fopAc_ac_c */
static BOOL useHeapInit(fopAc_ac_c* i_actor) {
static u32 s_bdl[] = {
BWD_BDL_GSP00,
BWD_BDL_GSP01,
dRes_INDEX_BWD_BDL_GSP00_e,
dRes_INDEX_BWD_BDL_GSP01_e,
};
static u32 s_btk[] = {
BWD_BTK_GSP00,
BWD_BTK_GSP01,
dRes_INDEX_BWD_BTK_GSP00_e,
dRes_INDEX_BWD_BTK_GSP01_e,
};
static u32 s_brk[] = {
BWD_BRK_GSP00,
BWD_BRK_GSP01,
dRes_INDEX_BWD_BRK_GSP00_e,
dRes_INDEX_BWD_BRK_GSP01_e,
};
static u32 s_bck[] = {
BWD_BCK_GSP00,
BWD_BCK_GSP01,
dRes_INDEX_BWD_BCK_GSP00_e,
dRes_INDEX_BWD_BCK_GSP01_e,
};
J3DModelData* modelData;
J3DModel* model;
bwds_class* i_this = (bwds_class*)i_actor;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bwds", BWDS_BDL_KOBOSS_HEAD),
(J3DModelData*)dComIfG_getObjectRes("Bwds", dRes_INDEX_BWDS_BDL_KOBOSS_HEAD_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bwds", BWDS_BCK_KOBOSS_CLOSE),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bwds", dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e),
J3DFrameCtrl::EMode_NONE,
1.0f,
0,