diff --git a/include/MetroidPrime/CAnimData.hpp b/include/MetroidPrime/CAnimData.hpp index cf359ba0..561a7d68 100644 --- a/include/MetroidPrime/CAnimData.hpp +++ b/include/MetroidPrime/CAnimData.hpp @@ -191,14 +191,14 @@ private: int x214_passedParticleCount; int x218_passedSoundCount; int x21c_particleLightIdx; - bool x220_24_animating : 1; - bool x220_25_loop : 1; - bool x220_26_aligningPos : 1; - bool x220_27_ : 1; - bool x220_28_ : 1; - bool x220_29_animationJustStarted : 1; - bool x220_30_poseBuilt : 1; - bool x220_31_poseCached : 1; + u8 x220_24_animating : 1; + u8 x220_25_loop : 1; + u8 x220_26_aligningPos : 1; + u8 x220_27_ : 1; + u8 x220_28_ : 1; + u8 x220_29_animationJustStarted : 1; + u8 x220_30_poseBuilt : 1; + u8 x220_31_poseCached : 1; CPoseAsTransforms x224_pose; CHierarchyPoseBuilder x2fc_poseBuilder; CAnimPlaybackParms x40c_playbackParms; diff --git a/src/MetroidPrime/Weapons/GunController/CGSFreeLook.cpp b/src/MetroidPrime/Weapons/GunController/CGSFreeLook.cpp index d6dcea09..5e4bb045 100644 --- a/src/MetroidPrime/Weapons/GunController/CGSFreeLook.cpp +++ b/src/MetroidPrime/Weapons/GunController/CGSFreeLook.cpp @@ -19,7 +19,7 @@ bool CGSFreeLook::Update(CAnimData& data, float dt, CStateManager& mgr) { x0_delay = 0.f; x4_cueAnimId = -1; } - } else if (!data.IsAnimTimeRemaining(0.001f, "Whole Body")) { + } else if (!data.IsAnimTimeRemaining(0.001f, rstl::string_l("Whole Body"))) { switch (x8_loopState) { case 0: SetAnim(data, xc_gunId, x10_setId, 1, mgr, 0.f);