summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_e_dd.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/d/actor/d_a_e_dd.cpp')
-rw-r--r--src/d/actor/d_a_e_dd.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp
index 3cbb299229..556a1cd70e 100644
--- a/src/d/actor/d_a_e_dd.cpp
+++ b/src/d/actor/d_a_e_dd.cpp
@@ -1340,11 +1340,11 @@ static void anm_se_set(e_dd_class* i_this) {
if ((i_this->mAnm == BCK_DD_FIRE_A && i_this->mpModelMorf->getFrame() >= 44.0f) || i_this->mAnm == BCK_DD_FIRE_B) {
for (int i = 0; i < 4; i++) {
- static u16 fire_eff_name_0[4] = {
+ static u16 fire_eff_name[4] = {
0x846C, 0x846D, 0x846E, 0x846F,
};
- i_this->field_0xe68[i] = dComIfGp_particle_set(i_this->field_0xe68[i], fire_eff_name_0[i], &a_this->current.pos, NULL, NULL);
+ i_this->field_0xe68[i] = dComIfGp_particle_set(i_this->field_0xe68[i], fire_eff_name[i], &a_this->current.pos, NULL, NULL);
JPABaseEmitter* fire_emitter = dComIfGp_particle_getEmitter(i_this->field_0xe68[i]);
if (fire_emitter != NULL) {
fire_emitter->setGlobalSRTMatrix(i_this->mpModelMorf->getModel()->getAnmMtx(JNT_NECK));
@@ -1362,11 +1362,11 @@ static void anm_se_set(e_dd_class* i_this) {
if (i_this->mAnm == BCK_DD_FIRE_A) {
for (int i = 0; i < 2; i++) {
- static u16 fire_eff_name_1[2] = {
+ static u16 fire_eff_name[2] = {
0x8471, 0x8472,
};
- i_this->field_0xe7c[i] = dComIfGp_particle_set(i_this->field_0xe7c[i], fire_eff_name_1[i], &a_this->current.pos, NULL, NULL);
+ i_this->field_0xe7c[i] = dComIfGp_particle_set(i_this->field_0xe7c[i], fire_eff_name[i], &a_this->current.pos, NULL, NULL);
JPABaseEmitter* emitter_4 = dComIfGp_particle_getEmitter(i_this->field_0xe7c[i]);
if (emitter_4 != NULL) {
emitter_4->setGlobalSRTMatrix(i_this->mpModelMorf->getModel()->getAnmMtx(i + 10));
@@ -1620,15 +1620,15 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
-static int kabe_initial_pos_set(e_dd_class* i_this) {
- static s16 ya[5] = {
- -0x4000, 0x4000, 0x0000, -0x8000, 0x0000,
- };
+static s16 ya[5] = {
+ -0x4000, 0x4000, 0x0000, -0x8000, 0x0000,
+};
- static s16 xa[5] = {
- -0x4000, -0x4000, -0x4000, -0x4000, -0x8000,
- };
+static s16 xa[5] = {
+ -0x4000, -0x4000, -0x4000, -0x4000, -0x8000,
+};
+static int kabe_initial_pos_set(e_dd_class* i_this) {
fopAc_ac_c* a_this = &i_this->actor;
dBgS_LinChk lin_chk;
cXyz sp98, start, end;