diff --git a/Source/Contents/Sound/SoundMaker.cpp b/Source/Contents/Sound/SoundMaker.cpp index c305a881..7fc21637 100644 --- a/Source/Contents/Sound/SoundMaker.cpp +++ b/Source/Contents/Sound/SoundMaker.cpp @@ -968,35 +968,35 @@ void CNpc::Slot21(int job) { // OFFSET: 0x00DA31B0 // FUNCTION: fn_22400 bool CHalluNPC::OnProcess() { - const unsigned count = ++this->unknown_0454; - if (this->render.color < static_cast(this->unknown_0444)) { - return false; + ++this->unknown_0454; + if (this->render.color >= static_cast(this->unknown_0444)) { + if (this->unknown_0454 == 110) { + static_cast(static_cast(this))->LaunchEffect(793, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); + } + if (static_cast(this->unknown_0454) > 105 && (this->unknown_0454 & 3) == 0) { + this->render.color -= this->unknown_0444; + } + return true; } - if (count == 110) { - static_cast(static_cast(this))->LaunchEffect(793, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); - } - if (count > 105 && (count & 3) == 0) { - this->render.color -= this->unknown_0444; - } - return true; + return false; } // OFFSET: 0x00DA32B0 // FUNCTION: fn_22402 bool CHalluPC::OnProcess() { - const unsigned count = ++this->unknown_050C; - if (this->render.color < static_cast(this->unknown_04FC)) { - return false; + ++this->unknown_050C; + if (this->render.color >= static_cast(this->unknown_04FC)) { + if (this->unknown_050C == 110) { + static_cast(static_cast(this))->LaunchEffect(793, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); + } + if (static_cast(this->unknown_050C) > 105 && (this->unknown_050C & 3) == 0) { + this->render.color -= this->unknown_04FC; + } + return true; } - if (count == 110) { - static_cast(static_cast(this))->LaunchEffect(793, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); - } - if (count > 105 && (count & 3) == 0) { - this->render.color -= this->unknown_04FC; - } - return true; + return false; } // OFFSET: 0x00DA3010