mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-02 11:45:55 -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_bb.cpp
+44 -44
View File
@@ -340,7 +340,7 @@ void bb_eye_tex_anm(bb_class* i_this) {
}
/* 00000C40-00000D74 .text anm_init__FP8bb_classifUcfi */
void anm_init(bb_class* i_this, int animFileIdx, float morf, unsigned char loopMode, float speed, int soundFileIdx) {
void anm_init(bb_class* i_this, int animFileIdx, f32 morf, u8 loopMode, f32 speed, int soundFileIdx) {
if (i_this->unk_2DF < 3) {
if (soundFileIdx >= 0) {
i_this->mpMorf->setAnm(
@@ -734,14 +734,14 @@ void bb_path_move(bb_class* i_this) {
frame = i_this->mpMorf->getFrame();
if (a_this->current.pos.y > i_this->unk_2F4.y && frame == (REG0_S(0) + 9)) {
i_this->unk_2F0 = 1;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, 9);
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
}
break;
case 1:
if (a_this->current.pos.y <= i_this->unk_2F4.y) {
i_this->unk_2F0 = 0;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
}
break;
@@ -923,7 +923,7 @@ void bb_path_move(bb_class* i_this) {
case 25:
r29 = 1;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
i_this->unk_2F1 = -1;
i_this->unk_310 = REG0_F(4) * 10.0f + 5000.0f;
i_this->unk_300 = 25.0f;
@@ -959,7 +959,7 @@ void bb_auto_move(bb_class* i_this) {
if ((i_this->unk_318[0] == 0) && (frame == REG0_S(0) + 9)) {
i_this->unk_2F0 = 1;
i_this->unk_318[0] = cM_rndF(200.0) + 50.0f;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, 9);
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
}
break;
@@ -967,7 +967,7 @@ void bb_auto_move(bb_class* i_this) {
if ((i_this->unk_318[0] == 0) && (i_this->actor.current.pos.y < i_this->unk_2F4.y)) {
i_this->unk_2F0 = 0;
i_this->unk_318[0] = cM_rndF(60.0) + 20.0f;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
}
break;
@@ -979,7 +979,7 @@ void bb_auto_move(bb_class* i_this) {
if (frame == 0x22) {
i_this->unk_2F0 = 0;
i_this->unk_318[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, BB_BCK_FLY01, 0.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 0.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
}
break;
}
@@ -1043,11 +1043,11 @@ void bb_auto_move(bb_class* i_this) {
if (i_this->unk_2F1 == 10) {
if (sqrt < l_bbHIO.unk_50) {
i_this->unk_2F1 = 11;
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, 10);
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03);
}
} else if (sqrt < REG0_F(9) * 10.0f + 300.0f) {
i_this->unk_2F1 = 20;
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, 15);
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01);
i_this->unk_2F0 = 10;
i_this->actor.speed.y = 0.0f;
i_this->unk_354 = 0;
@@ -1080,7 +1080,7 @@ void bb_auto_move(bb_class* i_this) {
i_this->unk_2F1 = 25;
} else if (i_this->mAcch.ChkGroundHit()) {
i_this->actor.speed.y = -0.5f;
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, 0x10);
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02);
i_this->unk_2F1 = 22;
i_this->unk_318[2] = 50;
}
@@ -1110,7 +1110,7 @@ void bb_auto_move(bb_class* i_this) {
i_this->unk_2F4.z = ac->current.pos.z;
i_this->unk_310 = 1000.0f;
i_this->unk_308 = 1.0f;
anm_init(i_this, BB_BCK_WALK, 5.0f, 2, 1.0f, 0x12);
anm_init(i_this, BB_BCK_WALK, 5.0f, 2, 1.0f, BB_BAS_WALK);
} else {
i_this->unk_2F1 = 0x19;
}
@@ -1130,7 +1130,7 @@ void bb_auto_move(bb_class* i_this) {
i_this->unk_2F1 = 21;
i_this->unk_318[2] = cM_rndF(50.0f) + 50.0f;
anm_init(i_this, BB_BCK_EAT, 5.0f, 0, 1.0f, 7);
anm_init(i_this, BB_BCK_EAT, 5.0f, 0, 1.0f, BB_BAS_EAT);
i_this->unk_2F1 = 24;
}
@@ -1154,14 +1154,14 @@ void bb_auto_move(bb_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->unk_2F1 = 21;
i_this->unk_318[2] = cM_rndF(50.0f);
anm_init(i_this, BB_BCK_WAIT, 5.0f, 2, 1.0f, 0x11);
anm_init(i_this, BB_BCK_WAIT, 5.0f, 2, 1.0f, BB_BAS_WAIT);
}
break;
}
case 25:
r29 = 1;
i_this->unk_2F1 = 0;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
i_this->unk_310 = REG0_F(4) * 10.0f + 2000.0f;
i_this->unk_300 = 25.0f;
i_this->unk_304 = 1.0f;
@@ -1205,7 +1205,7 @@ void bb_auto_move(bb_class* i_this) {
}
i_this->unk_2F0 = 0;
i_this->unk_318[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, BB_BCK_FLY01, 3.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 3.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
if (i_this->unk_2DA != 0xFF) {
i_this->unk_35D = i_this->unk_2DA + 1;
path_check(i_this);
@@ -1265,14 +1265,14 @@ void bb_kamome_attack(bb_class* i_this) {
s32 frame = i_this->mpMorf->getFrame();
if ((i_this->actor.current.pos.y > i_this->unk_2F4.y) && (frame == REG0_S(0) + 9)) {
i_this->unk_2F0 = 1;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, 9);
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
}
break;
}
case 1: {
if (i_this->actor.current.pos.y <= i_this->unk_2F4.y) {
i_this->unk_2F0 = 0;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
}
break;
}
@@ -1283,7 +1283,7 @@ void bb_kamome_attack(bb_class* i_this) {
switch (i_this->unk_2F1) {
case 0:
anm_init(i_this, BB_BCK_FLY02, 10.0f, 2, 1.0f, 9);
anm_init(i_this, BB_BCK_FLY02, 10.0f, 2, 1.0f, BB_BAS_FLY02);
i_this->unk_2F1 = 1;
case 1: {
@@ -1353,7 +1353,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_C7C = 0;
i_this->unk_318[5] = (cM_rndF(30.0f) + 20.0f) * l_bbHIO.unk_20;
anm_init(i_this, BB_BCK_FLYB01, 10.0f, 2, l_bbHIO.unk_28, 11);
anm_init(i_this, BB_BCK_FLYB01, 10.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01);
i_this->unk_308 = 0.0f;
i_this->unk_30C = 0.0f;
@@ -1379,7 +1379,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_308 = 0.0f;
i_this->unk_300 = 30.0f;
i_this->unk_304 = 1.0f;
anm_init(i_this, BB_BCK_FLY02, 10.0f, 2, 1.0f, 9);
anm_init(i_this, BB_BCK_FLY02, 10.0f, 2, 1.0f, BB_BAS_FLY02);
case 1:
case 2:
@@ -1397,7 +1397,7 @@ void bb_atack_move(bb_class* i_this) {
if (std::sqrtf(x * x + y * y + z * z) < l_bbHIO.unk_50) {
i_this->unk_2F1 = 2;
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, 10);
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03);
kuti_open(i_this, 0x15, JA_SE_CV_BB_FIND);
}
} else {
@@ -1426,7 +1426,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_308 = 0.0f;
i_this->unk_30C = 0.0f;
anm_init(i_this, BB_BCK_FLYB01, 5.0f, 2, l_bbHIO.unk_28, 11);
anm_init(i_this, BB_BCK_FLYB01, 5.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01);
kuti_open(i_this, 0x30, JA_SE_CV_BB_NORMAL);
}
break;
@@ -1472,7 +1472,7 @@ void bb_atack_move(bb_class* i_this) {
if (i_this->unk_33C > ((REG0_F(5) * 10.0f + 200.0f)) && i_this->unk_33C < (REG0_F(6) * 10.0f + 350.0f)) {
i_this->unk_2F1 = 5;
i_this->unk_318[0] = l_bbHIO.unk_32;
anm_init(i_this, BB_BCK_FLYB01, 2.0f, 2, l_bbHIO.unk_34, 0xB);
anm_init(i_this, BB_BCK_FLYB01, 2.0f, 2, l_bbHIO.unk_34, BB_BAS_FLYB01);
tex_anm_set(i_this, 0);
}
}
@@ -1494,7 +1494,7 @@ void bb_atack_move(bb_class* i_this) {
if (i_this->unk_318[0] == 0) {
i_this->unk_2F1 = 6;
anm_init(i_this, BB_BCK_ATACK01, 2.0f, 0, l_bbHIO.unk_2C, 6);
anm_init(i_this, BB_BCK_ATACK01, 2.0f, 0, l_bbHIO.unk_2C, BB_BAS_ATACK01);
i_this->unk_2F4.x = player->current.pos.x;
i_this->unk_2F4.y = player->current.pos.y + 100.0f;
@@ -1525,7 +1525,7 @@ void bb_atack_move(bb_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->unk_2F1 = 4;
anm_init(i_this, BB_BCK_FLYB01, 3.0f, 2, l_bbHIO.unk_28, 11);
anm_init(i_this, BB_BCK_FLYB01, 3.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01);
i_this->unk_318[5] = l_bbHIO.unk_20 * (cM_rndF(30.0f) + 20.0f);
i_this->unk_308 = 0.0f;
@@ -1547,7 +1547,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_2F1 = 10;
i_this->unk_318[0] = l_bbHIO.unk_30;
anm_init(i_this, BB_BCK_GUSYA01, 0.0f, 0, l_bbHIO.unk_38, 14);
anm_init(i_this, BB_BCK_GUSYA01, 0.0f, 0, l_bbHIO.unk_38, BB_BAS_GUSYA01);
i_this->unk_300 = REG0_F(7);
i_this->unk_304 = 1.0f;
a_this->speedF = -20.0f;
@@ -1569,7 +1569,7 @@ void bb_atack_move(bb_class* i_this) {
if (i_this->mpMorf->isStop() && (i_this->unk_2F1 == 10)) {
i_this->unk_2F1 = 11;
anm_init(i_this, BB_BCK_FURA01, 0.0f, 2, l_bbHIO.unk_3C, 13);
anm_init(i_this, BB_BCK_FURA01, 0.0f, 2, l_bbHIO.unk_3C, BB_BAS_FURA01);
}
if ((i_this->unk_2F1 == 11) && ((i_this->unk_318[0] & 7) == 5)) {
@@ -1580,7 +1580,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_2F1 = 4;
i_this->unk_318[5] = l_bbHIO.unk_20 * (cM_rndF(30.0f) + 20.0f);
anm_init(i_this, BB_BCK_FLYB01, 10.0f, 2, l_bbHIO.unk_28, 11);
anm_init(i_this, BB_BCK_FLYB01, 10.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01);
i_this->unk_308 = 0.0f;
i_this->unk_30C = 0.0f;
@@ -1606,14 +1606,14 @@ void bb_atack_move(bb_class* i_this) {
if ((i_this->unk_2DD == 4) || (i_this->unk_2DD == 7)) {
i_this->unk_2F1 = 10;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
} else {
i_this->unk_2F1 = 0;
i_this->unk_318[0] = 0;
i_this->unk_318[1] = 0;
i_this->unk_2F0 = 1;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, 9);
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
a_this->speedF = 0.0;
i_this->unk_2F4.y = player->current.pos.y + 500.0f;
@@ -1669,7 +1669,7 @@ void bb_wait_move(bb_class* i_this) {
i_this->unk_2F1 = 0;
case 0:
anm_init(i_this, BB_BCK_WAIT, 1.0f, 2, 1.0f, 0x11);
anm_init(i_this, BB_BCK_WAIT, 1.0f, 2, 1.0f, BB_BAS_WAIT);
i_this->unk_2F1 = 1;
i_this->unk_318[0] = 100;
@@ -1696,7 +1696,7 @@ void bb_wait_move(bb_class* i_this) {
break;
}
i_this->unk_2F1 = 3;
anm_init(i_this, BB_BCK_FLY01, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, BB_BAS_FLY01);
i_this->unk_318[0] = REG0_S(0) + 70;
case 3:
@@ -1755,11 +1755,11 @@ void bb_wait_move(bb_class* i_this) {
} else if (i_this->unk_2F1 == 11) {
if (sqrt < l_bbHIO.unk_50) {
i_this->unk_2F1 = 12;
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, 10);
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03);
}
} else if (i_this->unk_2F1 == 12 && sqrt < REG0_F(9) * 10.0f + 300.0f) {
i_this->unk_2F1 = 20;
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, 15);
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01);
i_this->unk_2F0 = 10;
i_this->actor.speed.y = 0.0f;
i_this->unk_354 = 0;
@@ -1788,7 +1788,7 @@ void bb_wait_move(bb_class* i_this) {
i_this->actor.current.pos.y = i_this->actor.home.pos.y;
i_this->actor.speed.y = -0.5;
if (old_354 > l_bbHIO.unk_40) {
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, 0x10);
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02);
i_this->unk_2F1 = -1;
}
}
@@ -1830,7 +1830,7 @@ void bb_su_wait_move(bb_class* i_this) {
i_this->unk_2F1 = 0;
case 0:
anm_init(i_this, BB_BCK_WAIT, 1.0f, 2, 1.0f, 0x11);
anm_init(i_this, BB_BCK_WAIT, 1.0f, 2, 1.0f, BB_BAS_WAIT);
i_this->unk_2F1 = 1;
i_this->unk_318[0] = 100;
@@ -1857,7 +1857,7 @@ void bb_su_wait_move(bb_class* i_this) {
break;
}
i_this->unk_2F1 = 3;
anm_init(i_this, BB_BCK_FLY01, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, BB_BAS_FLY01);
i_this->unk_318[0] = REG0_S(0) + 70;
case 3:
@@ -1916,11 +1916,11 @@ void bb_su_wait_move(bb_class* i_this) {
} else if (i_this->unk_2F1 == 11) {
if (sqrt < l_bbHIO.unk_50) {
i_this->unk_2F1 = 12;
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, 10);
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03);
}
} else if (i_this->unk_2F1 == 12 && sqrt < REG0_F(9) * 10.0f + 300.0f) {
i_this->unk_2F1 = 20;
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, 15);
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01);
i_this->unk_2F0 = 10;
i_this->actor.speed.y = 0.0f;
i_this->unk_354 = 0;
@@ -1950,7 +1950,7 @@ void bb_su_wait_move(bb_class* i_this) {
i_this->actor.current.pos.y = i_this->actor.home.pos.y;
i_this->actor.speed.y = -0.5;
if (old_354 > l_bbHIO.unk_40) {
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, 0x10);
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02);
i_this->unk_2F1 = -1;
}
}
@@ -1984,7 +1984,7 @@ void bb_key_move(bb_class* i_this) {
if (!CPad_CHECK_HOLD_B(0) && frame == REG0_S(0) + 9) {
i_this->unk_2F0 = 1;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, 9);
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
}
break;
}
@@ -1999,7 +1999,7 @@ void bb_key_move(bb_class* i_this) {
if (CPad_CHECK_HOLD_B(0)) {
i_this->unk_2F0 = 0;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, 8);
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
fopAcM_monsSeStart(&i_this->actor, JA_SE_CV_BB_NORMAL, 0);
}
break;
@@ -2336,7 +2336,7 @@ static BOOL daBb_Execute(bb_class* i_this) {
if (i_this->unk_2DF != 0) {
switch (i_this->unk_2DF) {
case 1:
anm_init(i_this, BB_BCK_FLYC, 1.0f, 2, l_bbHIO.unk_4C, 0xC);
anm_init(i_this, BB_BCK_FLYC, 1.0f, 2, l_bbHIO.unk_4C, BB_BAS_FLYC);
i_this->unk_2DF = 2;
break;
@@ -2375,7 +2375,7 @@ static BOOL daBb_Execute(bb_class* i_this) {
if (i_this->unk_2E0 != 0) {
i_this->unk_2DF = 0;
anm_init(i_this, BB_BCK_FLY02, 12.0f, 2, 1.0f, 9);
anm_init(i_this, BB_BCK_FLY02, 12.0f, 2, 1.0f, BB_BAS_FLY02);
dr->mAction = 31;
ac->speedF = 40.0f;
}
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;
src/d/actor/d_a_kamome.cpp
+2 -2
View File
@@ -1054,7 +1054,7 @@ void kamome_imouto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 8);
anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
}
break;
@@ -1065,7 +1065,7 @@ void kamome_imouto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 0;
i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 9);
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2);
}
break;
case 20:
src/d/actor/d_a_kamome2.cpp
+2 -2
View File
@@ -88,7 +88,7 @@ static void key_move(kamome2_class* i_this) {
i_this->m2C0 = unused_4207[0];
if (!CPad_CHECK_HOLD_A(0) && iVar1 == REG0_S(0) + 9) {
i_this->m2AC = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, 2, 1.0f, 8);
anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, 2, 1.0f, KAMOME_BAS_KA_WAIT1);
}
break;
@@ -103,7 +103,7 @@ static void key_move(kamome2_class* i_this) {
if (CPad_CHECK_HOLD_A(0)) {
i_this->m2AC = 0;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, 2, 1.0f, 9);
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, 2, 1.0f, KAMOME_BAS_KA_WAIT2);
fopAcM_seStart(&i_this->actor, JA_SE_CV_KAMOME, 0);
}
break;