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

Use res enums in more places

Browse Source
This commit is contained in:
LagoLunatic
2026-04-01 23:19:12 -04:00
parent d726a3bfa2
commit be11af87c5
4 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_bst.cpp
+7 -7
View File
@@ -111,13 +111,13 @@ static void set_hand_CO(bst_class* i_this, u8 param_2) {
}
/* 000002C0-000003E8 .text anm_init__FP9bst_classifUcfi */
static void anm_init(bst_class* i_this, int param_2, float morf, u8 loop_mode, float play_speed, int sound_idx) {
if (sound_idx >= 0) {
static void anm_init(bst_class* i_this, int animFileIdx, f32 morf, u8 loopMode, f32 speed, int soundFileIdx) {
if (soundFileIdx >= 0) {
i_this->m02B8->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bst", param_2), loop_mode, morf, play_speed, 0.0f, -1.0f, dComIfG_getObjectRes("Bst", sound_idx)
(J3DAnmTransform*)dComIfG_getObjectRes("Bst", animFileIdx), loopMode, morf, speed, 0.0f, -1.0f, dComIfG_getObjectRes("Bst", soundFileIdx)
);
} else {
i_this->m02B8->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bst", param_2), loop_mode, morf, play_speed, 0.0f, -1.0f, NULL);
i_this->m02B8->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bst", animFileIdx), loopMode, morf, speed, 0.0f, -1.0f, NULL);
}
}
@@ -953,13 +953,13 @@ static void beam_attack(bst_class* i_this) {
switch (i_this->mDamage) {
case 0:
i_this->mDamage++;
anm_init(i_this, 7, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, BST_BCK_BEAM_MAE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_OPEN, 0);
break;
case 1:
if (i_this->m02B8->isStop()) {
i_this->mDamage++;
anm_init(i_this, 8, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, BST_BCK_BEAM_TAME, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m10FC[0] = 0x2d;
for (s32 i = 0; i < 2; i++) {
i_this->m2ED8[i] = dComIfGp_particle_set(charge_e_name[i], &actor->current.pos);
@@ -977,7 +977,7 @@ static void beam_attack(bst_class* i_this) {
}
}
i_this->mDamage++;
anm_init(i_this, 6, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, BST_BCK_BEAM, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m10FC[0] = REG0_S(4) + 0x32;
}
break;