From 99f0efe97501b8dc17343fdf9ff1e46f835a766d Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 9 Jan 2024 06:10:40 -0800 Subject: d_meter2_draw done (#2028) * d_meter2_draw done * some meter_draw doc * remove asm * d_file_sel_info fixed --- src/d/meter/d_meter_string.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/d/meter/d_meter_string.cpp') diff --git a/src/d/meter/d_meter_string.cpp b/src/d/meter/d_meter_string.cpp index 5da94a0b02..004a3f559f 100644 --- a/src/d/meter/d_meter_string.cpp +++ b/src/d/meter/d_meter_string.cpp @@ -131,9 +131,9 @@ void dMeterString_c::draw() { if (mPikariAnimFrame > 0.0f) { drawPikari(); } else if (mPikariAnimFrame == -1.0f && - mAnimFrame > g_drawHIO.mMiniGame.mReadyFightHighlightAppearFrames) + mAnimFrame > g_drawHIO.mMiniGame.mReadyFightPikariAppearFrames) { - mPikariAnimFrame = 18.0f - g_drawHIO.mMiniGame.mReadyFightHighlightAnimSpeed; + mPikariAnimFrame = 18.0f - g_drawHIO.mMiniGame.mReadyFightPikariAnimSpeed; } if (mAnimFrame >= var_f31) { @@ -247,12 +247,12 @@ void dMeterString_c::drawPikari() { if (c != 0x20 && c != 0x8140) { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( (temp_f24 / 2) + (var_f25 + var_f29), center.y, &frame, - g_drawHIO.mMiniGame.mReadyFightHighlightScale, - g_drawHIO.mMiniGame.mReadyFightHighlightFrontOuter, - g_drawHIO.mMiniGame.mReadyFightHighlightFrontInner, - g_drawHIO.mMiniGame.mReadyFightHighlightBackOuter, - g_drawHIO.mMiniGame.mReadyFightHighlightBackInner, - g_drawHIO.mMiniGame.mReadyFightHighlightAnimSpeed, 0); + g_drawHIO.mMiniGame.mReadyFightPikariScale, + g_drawHIO.mMiniGame.mReadyFightPikariFrontOuter, + g_drawHIO.mMiniGame.mReadyFightPikariFrontInner, + g_drawHIO.mMiniGame.mReadyFightPikariBackOuter, + g_drawHIO.mMiniGame.mReadyFightPikariBackInner, + g_drawHIO.mMiniGame.mReadyFightPikariAnimSpeed, 0); } var_f29 += temp_f24; -- cgit v1.2.3