4 files changed, 18 insertions, 18 deletions
diff --git a/src/REL/d/a/b/d_a_b_girahimu.cpp b/src/REL/d/a/b/d_a_b_girahimu.cpp
index ff124e86..39e87ec0 100644
--- a/src/REL/d/a/b/d_a_b_girahimu.cpp
+++ b/src/REL/d/a/b/d_a_b_girahimu.cpp
@@ -883,7 +883,7 @@ int dAcGirahimu_c::actorExecute() {
     if (mbOnGround) {
         calcVelocity();
     } else {
-        mVelocity.y += mAcceleration;
+        mVelocity.y += mGravity;
     }
 
     mPosition += mTeleportDodgeAmount;
diff --git a/src/REL/d/a/b/d_a_b_girahimu2.cpp b/src/REL/d/a/b/d_a_b_girahimu2.cpp
index bb062f23..084c1adf 100644
--- a/src/REL/d/a/b/d_a_b_girahimu2.cpp
+++ b/src/REL/d/a/b/d_a_b_girahimu2.cpp
@@ -757,7 +757,7 @@ void dAcGirahimu2_c::initializeState_UpAttack() {
     mCallback.field_0x04E = false;
     mCallback.field_0x088 = false;
     mSubstateTimer = 2;
-    mAcceleration = -8.0f;
+    mGravity = -8.0f;
     mSpeed = 0.0f;
     mSpeedTarget = 0.0f;
     mMdlSwordA.fn_8006B7A0(0x210000);
@@ -815,7 +815,7 @@ void dAcGirahimu2_c::executeState_UpAttack() {
 void dAcGirahimu2_c::finalizeState_UpAttack() {
     mMdlSwordA.disable();
     mMdlSwordB.disable();
-    mAcceleration = -6.0f;
+    mGravity = -6.0f;
     mSubstate = 0;
     mSpeed = 0.0f;
     mSpeedTarget = 0.0f;
@@ -1953,7 +1953,7 @@ int dAcGirahimu2_c::actorExecute() {
     if (mbOnGround) {
         calcVelocity();
     } else {
-        mVelocity.y += mAcceleration;
+        mVelocity.y += mGravity;
     }
 
     mPosition += mTeleportDodgeAmount;
diff --git a/src/REL/d/a/b/d_a_b_girahimu_base.cpp b/src/REL/d/a/b/d_a_b_girahimu_base.cpp
index 4181ed5e..fa396498 100644
--- a/src/REL/d/a/b/d_a_b_girahimu_base.cpp
+++ b/src/REL/d/a/b/d_a_b_girahimu_base.cpp
@@ -1518,7 +1518,7 @@ void dAcGirahimuBase_c::executeState_BackStep() {
         case 2: {
             mbOnGround = false;
             if (mVelocity.y <= 0.0f && mAcch.ChkGndHit() && mPosition.y <= mStartingPos.y + 100.0f) {
-                dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 0, 1.0f, field_0x1B0);
+                dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 0, 1.0f, field_0x1B0);
                 mAngle.y = mVelocity.atan2sX_Z();
                 mSpeedTarget = 0.0f;
                 mSpeed = mVelocity.absXZ();
@@ -2194,8 +2194,8 @@ void dAcGirahimuBase_c::createCollision() {
     mBoundingBox.Set(mVec3_c(-100.0f, -500.0f, -100.0f), mVec3_c(100.0f, 1000.0f, 100.0f));
 
     mAnmIDBody = ANM_NONE;
-    mAcceleration = -6.0f;
-    mMaxSpeed = -80.0f;
+    mGravity = -6.0f;
+    mMaxFallSpeed = -80.0f;
     mSpeedChangeFactor = 0.5f;
     field_0xD7C = true;
     mWarpScale.set(1.05f, 1.05f, 1.05f);
@@ -2895,10 +2895,10 @@ void dAcGirahimuBase_c::calcJumpMovement(f32 f0, f32 f1) {
     mVec3_c v0(0.0f, 0.0f, f0);
     v0.rotY(mAngle.y);
     v0 += mPosition;
-    { mAcceleration = 5.0f; } // used to force rodata pool in preamble
-    mAcceleration = _weird_zero + 6.0f;
+    { mGravity = 5.0f; } // used to force rodata pool in preamble
+    mGravity = _weird_zero + 6.0f;
     calcVelocity(v0, f1);
-    mAcceleration = -mAcceleration;
+    mGravity = -mGravity;
 }
 
 int dAcGirahimuBase_c::draw() {
@@ -2906,12 +2906,12 @@ int dAcGirahimuBase_c::draw() {
         return SUCCEEDED;
     }
 
-    drawModelType1(&mMdlBody);
-    drawModelType1(&mMdlPias);
+    drawModel(&mMdlBody);
+    drawModel(&mMdlPias);
     static mSphere_c bodySph(mVec3_c(0.0f, 100.0f, 0.0f), 300.0f);
     static mSphere_c swordSph(mVec3_c(0.0f, 0.0f, 0.0f), 0.0f);
 
-    fn_8002edb0(mShadow, mMdlBody, &bodySph, -1, -1, 0.0f);
+    drawShadow(mShadow, mMdlBody, bodySph, -1, -1, 0.0f);
     if (mbHoldingSwordA) {
         mMdlSwordA.entry(this, nullptr, nullptr);
         m3d::mShadow_c::GetInstance()->addMdlToCircle(&mShadow, mMdlSwordA.mMdl, swordSph);
diff --git a/src/REL/d/a/b/d_a_b_lastboss.cpp b/src/REL/d/a/b/d_a_b_lastboss.cpp
index 4bd6964f..49a91271 100644
--- a/src/REL/d/a/b/d_a_b_lastboss.cpp
+++ b/src/REL/d/a/b/d_a_b_lastboss.cpp
@@ -203,8 +203,8 @@ int dAcBlastboss_c::create() {
     mLightningCc.SetTgShieldType(~AT_TYPE_NONE);
     mLightningCc.SetStts(mStts);
 
-    mAcceleration = -5.0f;
-    mMaxSpeed = -80.0f;
+    mGravity = -5.0f;
+    mMaxFallSpeed = -80.0f;
 
     mBoundingBox.Set(mVec3_c(-200.0f, -300.0f, -200.0f), mVec3_c(200.0f, 300.0f, 200.0f));
     changeState(StateID_Fight);
@@ -1727,7 +1727,7 @@ void dAcBlastboss_c::initializeState_Down() {
     setAnm("DownBStart", 5.0f);
     mSubState = SUB_STATE_0;
     mSpeed = -20.0f;
-    mAcceleration = -5.0f;
+    mGravity = -5.0f;
     mVelocity.y = 60.0f;
     mIsSwordEmpowered = false;
     mCc1.ClrTg_0x8000000();
@@ -2345,10 +2345,10 @@ void dAcBlastboss_c::setAnmRate(f32 rate) {
 }
 
 int dAcBlastboss_c::draw() {
-    drawModelType1(&mMdl.getModel());
+    drawModel(&mMdl.getModel());
     mSwordMdl.entry(this, nullptr, nullptr);
     if (field_0x114C) {
-        drawModelType1(&mThunderMdl);
+        drawModel(&mThunderMdl);
     }
     return SUCCEEDED;
 }