diff --git a/configure.py b/configure.py index eea58492a..7c1487618 100755 --- a/configure.py +++ b/configure.py @@ -1594,7 +1594,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_fallrock_tag"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_fan"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_fganon"), - ActorRel(MatchingFor("GZLE01"), "d_a_fgmahou"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_fgmahou"), ActorRel(Matching, "d_a_fire"), ActorRel(Matching, "d_a_fm"), ActorRel(NonMatching, "d_a_gm"), diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp index b718cf857..94c5a0a4b 100644 --- a/src/d/actor/d_a_fgmahou.cpp +++ b/src/d/actor/d_a_fgmahou.cpp @@ -34,7 +34,7 @@ static void* boss_s_sub(void* param_1, void*) { /* 00000130-00000C14 .text move__FP13fgmahou_class */ static void move(fgmahou_class* i_this) { - static float spdd[] = { + static f32 spdd[] = { 0.65f, 0.3f, 0.1f, @@ -119,9 +119,9 @@ static void move(fgmahou_class* i_this) { } dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGSMASHDARKSHOT00, &i_this->current.pos, &i_this->home.angle); - #if VERSION > VERSION_DEMO +#if VERSION == VERSION_USA fopAcM_seStartCurrent(i_this, JA_SE_LK_PG_BOMB_STRIKE, 0); - #endif +#endif i_this->mState = 5; case 5: