d_a_obj_base - Mostly done

104 files changed, 201 insertions, 222 deletions

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..744988db 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();
@@ -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..1aef799a 100644
--- a/src/REL/d/a/b/d_a_b_lastboss.cpp
+++ b/src/REL/d/a/b/d_a_b_lastboss.cpp
@@ -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;
 }
diff --git a/src/REL/d/a/d_a_bombf.cpp b/src/REL/d/a/d_a_bombf.cpp
index d1cfd327..6fcfec6f 100644
--- a/src/REL/d/a/d_a_bombf.cpp
+++ b/src/REL/d/a/d_a_bombf.cpp
@@ -143,7 +143,7 @@ int dAcBombf_c::draw() {
     if (mIsUnderground != 0 && !dAcPy_c::LINK->checkActionFlagsCont(0x400000)) {
         return SUCCEEDED;
     }
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/d_a_girahimu_sword_beam.cpp b/src/REL/d/a/d_a_girahimu_sword_beam.cpp
index 188f11a1..b3bb2dad 100644
--- a/src/REL/d/a/d_a_girahimu_sword_beam.cpp
+++ b/src/REL/d/a/d_a_girahimu_sword_beam.cpp
@@ -220,7 +220,7 @@ int dAcGirahimuSwordBeam_c::actorExecute() {
 
 int dAcGirahimuSwordBeam_c::draw() {
     mSphere_c sph(mVec3_c(0.0f, 0.0f, 0.0f), field_0xB0C);
-    drawShadow(mShadow, nullptr, mWorldMtx, &sph, -1, field_0xB10, -1, -1, -1, mPosition.y - mAcch.GetGroundH());
+    drawShadow(mShadow, nullptr, mWorldMtx, sph, -1, field_0xB10, -1, -1, -1, mPosition.y - mAcch.GetGroundH());
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/e/d_a_e_hb_leaf.cpp b/src/REL/d/a/e/d_a_e_hb_leaf.cpp
index 92047ba0..7c7e7003 100644
--- a/src/REL/d/a/e/d_a_e_hb_leaf.cpp
+++ b/src/REL/d/a/e/d_a_e_hb_leaf.cpp
@@ -87,7 +87,7 @@ int dAcEhb_leaf_c::actorExecute() {
 
 int dAcEhb_leaf_c::draw() {
     if (!isHidden()) {
-        drawModelType1(&mModel.getModel());
+        drawModel(&mModel.getModel());
     }
 
     return SUCCEEDED;
diff --git a/src/REL/d/a/e/d_a_e_ks.cpp b/src/REL/d/a/e/d_a_e_ks.cpp
index ef18a9dc..adbf4e12 100644
--- a/src/REL/d/a/e/d_a_e_ks.cpp
+++ b/src/REL/d/a/e/d_a_e_ks.cpp
@@ -1747,7 +1747,7 @@ int dAcEKs_c::draw() {
         }
     }
 
-    drawModelType1(&mMdl.getModel());
+    drawModel(&mMdl.getModel());
 
     if (!isState(StateID_Wait)) {
         field_0xD18 = mPosition.y - mAcch.GetGroundH();
@@ -1757,7 +1757,7 @@ int dAcEKs_c::draw() {
             50.f + dAcEKs_HIO_c::sInstance.getZero1()
         );
         field_0xAE4.transS(mPosition);
-        drawShadow(mShadow, nullptr, field_0xAE4, &sph, -1, -1, -1, -1, -1, field_0xD18);
+        drawShadow(mShadow, nullptr, field_0xAE4, sph, -1, -1, -1, -1, -1, field_0xD18);
     }
 
     return SUCCEEDED;
@@ -2635,7 +2635,7 @@ void dAcEKs_c::executeState_Damage() {
         }
 
         if (mAcch.ChkGroundLanding() && field_0xDB5 != 0) {
-            dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, 1, field_0x1B0);
+            dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 1, 1, field_0x1B0);
             field_0xDB5 = 0;
         }
 
@@ -2729,17 +2729,13 @@ void dAcEKs_c::executeState_Stun() {
             }
             if (mAcch.ChkGndHit()) {
                 if (field_0xDB5 != 0) {
-                    dJEffManager_c::spawnGroundEffect(
-                        mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, 1, field_0x1B0
-                    );
+                    dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 1, 1, field_0x1B0);
                     field_0xDB5 = 0;
                 }
                 field_0xD5C = 0;
                 field_0xDA9 = 1;
                 if (dBgS::GetInstance()->GetSpecialCode(mAcch.GetGnd()) == POLY_ATTR_LAVA) {
-                    dJEffManager_c::spawnGroundEffect(
-                        mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, 1, field_0x1B0
-                    );
+                    dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 1, 1, field_0x1B0);
                     resetInteractionFlags(0x1);
                     startSound(SE_EKs_V_DEATH2);
                     unsetActorProperty(AC_PROP_0x1);
@@ -2869,7 +2865,7 @@ void dAcEKs_c::executeState_WindBlow() {
     }
 
     if (mAcch.ChkGroundLanding() && dBgS::GetInstance()->GetSpecialCode(mAcch.GetGnd()) == POLY_ATTR_LAVA) {
-        dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, 1, field_0x1B0);
+        dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 1, 1, field_0x1B0);
         startSound(SE_EKs_V_DEATH2);
         unsetActorProperty(AC_PROP_0x1);
         kill(false);
diff --git a/src/REL/d/a/e/d_a_e_remly.cpp b/src/REL/d/a/e/d_a_e_remly.cpp
index 7ce91edf..645edea8 100644
--- a/src/REL/d/a/e/d_a_e_remly.cpp
+++ b/src/REL/d/a/e/d_a_e_remly.cpp
@@ -575,10 +575,10 @@ int dAcEremly_c::draw() {
     }
 
     m3d::smdl_c &mdl = mMdl.getModel();
-    drawModelType1(&mdl);
+    drawModel(&mdl);
 
     static mSphere_c sph(mVec3_c(0.f, getValue0(), 0.f), _weird_zero + 290.f);
-    fn_8002edb0(mShadow, mdl, &sph, -1, -1, mPosition.y - mAcch.GetGroundH());
+    drawShadow(mShadow, mdl, sph, -1, -1, mPosition.y - mAcch.GetGroundH());
 
     return SUCCEEDED;
 }
@@ -2482,7 +2482,7 @@ void dAcEremly_c::spawnGroundEffect() {
     m.multVec(in, out);
     out += mPosition;
 
-    dJEffManager_c::spawnGroundEffect(out, mPolyAttr0, mPolyAttr1, field_0x1B4, 1, mScale.x * 0.7f, field_0x1B0);
+    dJEffManager_c::spawnGroundEffect(out, mPolyAttr0, mPolyAttr1, mGndNormal, 1, mScale.x * 0.7f, field_0x1B0);
 }
 
 bool dAcEremly_c::fn_177_86C0() {
diff --git a/src/REL/d/a/e/d_a_e_skytail.cpp b/src/REL/d/a/e/d_a_e_skytail.cpp
index c10fb31d..cd92abff 100644
--- a/src/REL/d/a/e/d_a_e_skytail.cpp
+++ b/src/REL/d/a/e/d_a_e_skytail.cpp
@@ -524,9 +524,9 @@ int dAcESkytail_c::actorExecute() {
 }
 
 int dAcESkytail_c::draw() {
-    drawModelType1(&mBodyMdl.getModel());
+    drawModel(&mBodyMdl.getModel());
     for (int i = 0; i < (s32)ARRAY_LENGTH(mAntennaMdl); ++i) {
-        drawModelType1(&mAntennaMdl[i].getModel());
+        drawModel(&mAntennaMdl[i].getModel());
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/e/d_a_e_sm.cpp b/src/REL/d/a/e/d_a_e_sm.cpp
index 2ae4bdc2..223c9a3c 100644
--- a/src/REL/d/a/e/d_a_e_sm.cpp
+++ b/src/REL/d/a/e/d_a_e_sm.cpp
@@ -718,7 +718,7 @@ int dAcEsm_c::draw() {
         return SUCCEEDED;
     }
 
-    drawModelType1(&mMdl.getModel());
+    drawModel(&mMdl.getModel());
 
     if (mHealth == 0) {
         return SUCCEEDED;
@@ -726,7 +726,7 @@ int dAcEsm_c::draw() {
 
     s8 var = 0;
     mSphere_c sph(mVec3_c(0.f, 50.f, 0.f), mScale.x * (var + 240.f));
-    drawShadow(mShadowCircle, nullptr, mWorldMtx, &sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
+    drawShadow(mShadowCircle, nullptr, mWorldMtx, sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/npc/d_a_npc_honeycomb.cpp b/src/REL/d/a/npc/d_a_npc_honeycomb.cpp
index c0896360..44f90fd4 100644
--- a/src/REL/d/a/npc/d_a_npc_honeycomb.cpp
+++ b/src/REL/d/a/npc/d_a_npc_honeycomb.cpp
@@ -268,7 +268,7 @@ int dAcNpcHc_c::actorExecute() {
 
 int dAcNpcHc_c::draw() {
     if (mDeathTimer == 0) {
-        drawModelType1(&mModel);
+        drawModel(&mModel);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/npc/d_a_npc_rival_lod.cpp b/src/REL/d/a/npc/d_a_npc_rival_lod.cpp
index 5b727b57..703908a1 100644
--- a/src/REL/d/a/npc/d_a_npc_rival_lod.cpp
+++ b/src/REL/d/a/npc/d_a_npc_rival_lod.cpp
@@ -35,7 +35,7 @@ int dAcNpcRivalLOD_c::actorExecute() {
 }
 
 int dAcNpcRivalLOD_c::draw() {
-    drawModelType1(&mMdl.getModel());
+    drawModel(&mMdl.getModel());
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_F302_light.cpp b/src/REL/d/a/obj/d_a_obj_F302_light.cpp
index 308a1f76..a49ba145 100644
--- a/src/REL/d/a/obj/d_a_obj_F302_light.cpp
+++ b/src/REL/d/a/obj/d_a_obj_F302_light.cpp
@@ -92,7 +92,7 @@ int dAcOF302Light_c::actorExecuteInEvent() {
 }
 
 int dAcOF302Light_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_F400_gate_leaf.cpp b/src/REL/d/a/obj/d_a_obj_F400_gate_leaf.cpp
index 1b7e4d97..2bfa22bc 100644
--- a/src/REL/d/a/obj/d_a_obj_F400_gate_leaf.cpp
+++ b/src/REL/d/a/obj/d_a_obj_F400_gate_leaf.cpp
@@ -47,7 +47,7 @@ int dAcOF400GateLeaf_c::draw() {
     StoryflagManager *storyFlagManager = StoryflagManager::sInstance;
     u32 counterIdx = getStoryflag();
     if (!storyFlagManager->getCounterOrFlag(counterIdx)) {
-        dAcObjBase_c::drawModelType1(&mMdl);
+        dAcObjBase_c::drawModel(&mMdl);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp b/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp
index e3834de2..f66b1678 100644
--- a/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp
+++ b/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp
@@ -110,6 +110,6 @@ int dAcOF400GateSeal_c::actorExecute() {
 }
 
 int dAcOF400GateSeal_c::draw() {
-    dAcObjBase_c::drawModelType1(&mMdl);
+    dAcObjBase_c::drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_amber.cpp b/src/REL/d/a/obj/d_a_obj_amber.cpp
index 33ff845a..c188e289 100644
--- a/src/REL/d/a/obj/d_a_obj_amber.cpp
+++ b/src/REL/d/a/obj/d_a_obj_amber.cpp
@@ -59,9 +59,9 @@ int dAcOAmber_c::actorPostCreate() {
 }
 
 int dAcOAmber_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     if (field_0x37c != 1.0e+9f) {
-        drawShadow(mShadowCircle, nullptr, mWorldMtx, &mShadowSph, -1, -1, -1, -1, -1, field_0x37c);
+        drawShadow(mShadowCircle, nullptr, mWorldMtx, mShadowSph, -1, -1, -1, -1, -1, field_0x37c);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_appear_bridge.cpp b/src/REL/d/a/obj/d_a_obj_appear_bridge.cpp
index 6b79487d..d9247fc7 100644
--- a/src/REL/d/a/obj/d_a_obj_appear_bridge.cpp
+++ b/src/REL/d/a/obj/d_a_obj_appear_bridge.cpp
@@ -65,7 +65,7 @@ int dAcOappearBridge_c::actorExecute() {
 }
 
 int dAcOappearBridge_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_bamboo_island.cpp b/src/REL/d/a/obj/d_a_obj_bamboo_island.cpp
index b8425c7e..778fcc16 100644
--- a/src/REL/d/a/obj/d_a_obj_bamboo_island.cpp
+++ b/src/REL/d/a/obj/d_a_obj_bamboo_island.cpp
@@ -63,7 +63,7 @@ int dAcObambooIsland_c::actorExecute() {
 
 int dAcObambooIsland_c::draw() {
     for (int i = 0; i < 2; i++) {
-        drawModelType1(&mModels[i]);
+        drawModel(&mModels[i]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_barrel.cpp b/src/REL/d/a/obj/d_a_obj_barrel.cpp
index dfcb3ee6..ee687108 100644
--- a/src/REL/d/a/obj/d_a_obj_barrel.cpp
+++ b/src/REL/d/a/obj/d_a_obj_barrel.cpp
@@ -176,7 +176,7 @@ int dAcOBarrel_c::actorCreate() {
     CREATE_ALLOCATOR(dAcOBarrel_c);
 
     if (!field_0xE08 && !isType_0()) {
-        fn_8002EA30(-100.f, 0.f, 2.f, 1.f, 4.f, &mObjAcch);
+        setSinkDepths(-100.f, 0.f, 2.f, 1.f, 4.f, &mObjAcch);
     }
 
     mObjAcch.Set(this, 1, &mAcchCir);
@@ -390,12 +390,12 @@ void dAcOBarrel_c::doInteraction(s32 i) {
 }
 
 int dAcOBarrel_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
 
     static mSphere_c sph(mVec3_c(0.f, 50.f, 0.f), 80.f);
 
     if (mYOffset >= 0.f) {
-        drawShadow(mShadow, nullptr, mWorldMtx, &sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
+        drawShadow(mShadow, nullptr, mWorldMtx, sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
     }
 
     return SUCCEEDED;
@@ -415,7 +415,7 @@ void dAcOBarrel_c::executeState_Wait() {
     if (mObjAcch.ChkGroundLanding() && !field_0xE0E) {
         fn_293_37B0();
         if (mVelocity.y > 0.f) {
-            dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 0, 1.f, field_0x1B0);
+            dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 0, 1.f, field_0x1B0);
         }
 
         if (field_0xE0A) {
@@ -445,7 +445,7 @@ void dAcOBarrel_c::executeState_Wait() {
             fn_293_5910();
         }
 
-        if (!field_0xE08 && !isType_0() && checkYOffsetField_0x100()) {
+        if (!field_0xE08 && !isType_0() && checkAtDeepSinkDepth()) {
             killNoItemDrop();
             return;
         }
@@ -637,7 +637,7 @@ void dAcOBarrel_c::initializeState_Slope() {
 void dAcOBarrel_c::executeState_Slope() {
     if (mObjAcch.ChkGroundLanding() && !field_0xE0E) {
         fn_293_37B0();
-        dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 0, 1.f, field_0x1B0);
+        dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 0, 1.f, field_0x1B0);
         startSound(SE_Barrel_ROLL_GROUND);
     } else if (mObjAcch.ChkGndHit()) {
         field_0xDDC = 0.f;
@@ -679,7 +679,7 @@ void dAcOBarrel_c::executeState_Slope() {
             mCyl.ClrAtSet();
         }
 
-        if (!field_0xE08 && !isType_0() && checkYOffsetField_0x100()) {
+        if (!field_0xE08 && !isType_0() && checkAtDeepSinkDepth()) {
             killNoItemDrop();
             return;
         }
@@ -798,7 +798,7 @@ void dAcOBarrel_c::initializeState_KrakenBorn() {
 void dAcOBarrel_c::executeState_KrakenBorn() {
     if (mObjAcch.ChkGroundLanding()) {
         fn_293_37B0();
-        dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 0, 1.f, field_0x1B0);
+        dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 0, 1.f, field_0x1B0);
         startSound(SE_Barrel_ROLL_GROUND);
     } else if (mObjAcch.ChkGndHit()) {
         field_0xDDC = 0.f;
diff --git a/src/REL/d/a/obj/d_a_obj_bird_statue.cpp b/src/REL/d/a/obj/d_a_obj_bird_statue.cpp
index c44b90af..a89650a8 100644
--- a/src/REL/d/a/obj/d_a_obj_bird_statue.cpp
+++ b/src/REL/d/a/obj/d_a_obj_bird_statue.cpp
@@ -34,6 +34,6 @@ int dAcOBirdStatue_c::create() {
 }
 
 int dAcOBirdStatue_c::draw() {
-    dAcObjBase_c::drawModelType1(&mMdl);
+    dAcObjBase_c::drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_blade.cpp b/src/REL/d/a/obj/d_a_obj_blade.cpp
index fe3102f7..5b904ea1 100644
--- a/src/REL/d/a/obj/d_a_obj_blade.cpp
+++ b/src/REL/d/a/obj/d_a_obj_blade.cpp
@@ -37,6 +37,6 @@ int dAcOblade_c::actorExecute() {
 }
 
 int dAcOblade_c::draw() {
-    drawModelType1(&mMdl.getModel());
+    drawModel(&mMdl.getModel());
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_block_underground.cpp b/src/REL/d/a/obj/d_a_obj_block_underground.cpp
index 04e639de..821b214c 100644
--- a/src/REL/d/a/obj/d_a_obj_block_underground.cpp
+++ b/src/REL/d/a/obj/d_a_obj_block_underground.cpp
@@ -203,7 +203,7 @@ int dAcOBlockUnderground::actorExecute() {
 
 int dAcOBlockUnderground::draw() {
     if (dAcPy_c::GetLink()->checkActionFlagsCont(0x400000)) {
-        drawModelType1(&mMdl);
+        drawModel(&mMdl);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_bstone.cpp b/src/REL/d/a/obj/d_a_obj_bstone.cpp
index f8019267..99dbaaac 100644
--- a/src/REL/d/a/obj/d_a_obj_bstone.cpp
+++ b/src/REL/d/a/obj/d_a_obj_bstone.cpp
@@ -76,7 +76,7 @@ int dAcObstonec::actorExecute() {
 
 int dAcObstonec::draw() {
     if (mVariant != 1 || mBg.ChkUsed()) {
-        drawModelType1(&mMdl);
+        drawModel(&mMdl);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_chair.cpp b/src/REL/d/a/obj/d_a_obj_chair.cpp
index a5dd695c..d9270e64 100644
--- a/src/REL/d/a/obj/d_a_obj_chair.cpp
+++ b/src/REL/d/a/obj/d_a_obj_chair.cpp
@@ -187,9 +187,9 @@ int dAcOChair_c::actorExecute() {
 
 int dAcOChair_c::draw() {
     if (!isBench()) {
-        drawModelType1(&mMdl);
+        drawModel(&mMdl);
         static mSphere_c sph(mVec3_c(0.f, 40.f, 0.f), 80.f);
-        drawShadow(mShadow, nullptr, mWorldMtx, &sph, -1, -1, -1, -1, -1, 0.f);
+        drawShadow(mShadow, nullptr, mWorldMtx, sph, -1, -1, -1, -1, -1, 0.f);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_chest.cpp b/src/REL/d/a/obj/d_a_obj_chest.cpp
index 81135a64..fc43e9a9 100644
--- a/src/REL/d/a/obj/d_a_obj_chest.cpp
+++ b/src/REL/d/a/obj/d_a_obj_chest.cpp
@@ -161,9 +161,9 @@ int dAcOChest_c::actorExecute() {
 }
 
 int dAcOChest_c::draw() {
-    drawModelType1(&mAnmMdl.getModel());
+    drawModel(&mAnmMdl.getModel());
     if (hasInsideModel()) {
-        drawModelType1(&mInsideMdl);
+        drawModel(&mInsideMdl);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_decoB.cpp b/src/REL/d/a/obj/d_a_obj_decoB.cpp
index ba3fc3fb..f23c08fa 100644
--- a/src/REL/d/a/obj/d_a_obj_decoB.cpp
+++ b/src/REL/d/a/obj/d_a_obj_decoB.cpp
@@ -42,7 +42,7 @@ int dAcODecoB_c::actorExecute() {
 }
 
 int dAcODecoB_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_desert_debris.cpp b/src/REL/d/a/obj/d_a_obj_desert_debris.cpp
index eff17424..6517b718 100644
--- a/src/REL/d/a/obj/d_a_obj_desert_debris.cpp
+++ b/src/REL/d/a/obj/d_a_obj_desert_debris.cpp
@@ -55,7 +55,7 @@ int dAcOdesertDebris_c::actorExecute() {
 }
 
 int dAcOdesertDebris_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_display_only_nbs.cpp b/src/REL/d/a/obj/d_a_obj_display_only_nbs.cpp
index 7f645e1e..778a2ef4 100644
--- a/src/REL/d/a/obj/d_a_obj_display_only_nbs.cpp
+++ b/src/REL/d/a/obj/d_a_obj_display_only_nbs.cpp
@@ -36,6 +36,6 @@ int dAcOdisplayOnlyNbs_c::actorExecute() {
 }
 
 int dAcOdisplayOnlyNbs_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp
index 804b3114..ad329955 100644
--- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp
+++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp
@@ -44,7 +44,7 @@ int dAcOdistantShip_c::actorExecute() {
 
 int dAcOdistantShip_c::draw() {
     if (mIsVisible) {
-        drawModelType1(&mModel);
+        drawModel(&mModel);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_door.cpp b/src/REL/d/a/obj/d_a_obj_door.cpp
index a0a442b0..b4552e18 100644
--- a/src/REL/d/a/obj/d_a_obj_door.cpp
+++ b/src/REL/d/a/obj/d_a_obj_door.cpp
@@ -307,7 +307,7 @@ int dAcOdoor_c::actorCreate() {
         if (mSceneflag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag)) {
             mLock.link(
                 static_cast<dAcOLock_c *>(
-                    create(this, fProfile::OBJ_SHUTTER_LOCK, 0, nullptr, nullptr, nullptr, 0, 0x3F)
+                    createChildAttached(fProfile::OBJ_SHUTTER_LOCK, 0, nullptr, nullptr, nullptr, 0, 0x3F)
                 )
             );
         }
@@ -1270,16 +1270,16 @@ int dAcOdoor_c::actorExecute() {
 int dAcOdoor_c::draw() {
     if (isTimeEffected()) {
         if (!mTimeBits.field_0x00) {
-            drawModelType1(&mMdl1);
+            drawModel(&mMdl1);
         }
         if (!mTimeBits.field_0x01) {
-            drawModelType1(&mMdl0);
+            drawModel(&mMdl0);
         }
     } else {
         if (getType() == DOOR_TEMPLE_MAIN) {
-            drawModelType1(&mAnmChr.getModel());
+            drawModel(&mAnmChr.getModel());
         } else {
-            drawModelType1(&mMdl0);
+            drawModel(&mMdl0);
         }
     }
     return SUCCEEDED;
diff --git a/src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp b/src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp
index d5f7196a..b86a4ae2 100644
--- a/src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp
+++ b/src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp
@@ -209,7 +209,7 @@ int dAcODungeonShip_c::actorExecute() {
 int dAcODungeonShip_c::draw() {
     mMdl.mProc.mCallback.field_0x08 = field_0x862;
     mMdl.mProc.mCallback.field_0x09 = 1;
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_fence_boko.cpp b/src/REL/d/a/obj/d_a_obj_fence_boko.cpp
index baea4b9c..9ce82fcd 100644
--- a/src/REL/d/a/obj/d_a_obj_fence_boko.cpp
+++ b/src/REL/d/a/obj/d_a_obj_fence_boko.cpp
@@ -49,6 +49,6 @@ int dAcOfenceBoko_c::actorExecute() {
 }
 
 int dAcOfenceBoko_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp b/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp
index b0a57119..71918332 100644
--- a/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp
+++ b/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp
@@ -37,6 +37,6 @@ int dAcOfenceBoko2_c::actorExecute() {
 }
 
 int dAcOfenceBoko2_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_fence_konsai.cpp b/src/REL/d/a/obj/d_a_obj_fence_konsai.cpp
index 2fd78177..3131d001 100644
--- a/src/REL/d/a/obj/d_a_obj_fence_konsai.cpp
+++ b/src/REL/d/a/obj/d_a_obj_fence_konsai.cpp
@@ -34,6 +34,6 @@ int dAcOfenceKonsai_c::actorExecute() {
 }
 
 int dAcOfenceKonsai_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_flag.cpp b/src/REL/d/a/obj/d_a_obj_flag.cpp
index c9075989..b810ad0a 100644
--- a/src/REL/d/a/obj/d_a_obj_flag.cpp
+++ b/src/REL/d/a/obj/d_a_obj_flag.cpp
@@ -210,7 +210,7 @@ int dAcOFlag_c::actorExecute() {
 }
 
 int dAcOFlag_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp b/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp
index 4c8e59d4..815feb3a 100644
--- a/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp
+++ b/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp
@@ -162,7 +162,7 @@ int dAcOFlyingClawshotTarget_c::actorExecute() {
 }
 
 int dAcOFlyingClawshotTarget_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
 
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp b/src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp
index c42791d2..64f5a6ee 100644
--- a/src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp
+++ b/src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp
@@ -90,7 +90,7 @@ int dAcOFruitGutsLeaf_c::actorExecute() {
 }
 
 int dAcOFruitGutsLeaf_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp b/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp
index b0023024..9bc715d1 100644
--- a/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp
+++ b/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp
@@ -50,9 +50,9 @@ int dAcOgirahimFoot_c::doDelete() {
 
 int dAcOgirahimFoot_c::draw() {
     if (*mStateMgr.getStateID() == StateID_Appear) {
-        drawModelType1(&mMdl);
+        drawModel(&mMdl);
         static mSphere_c sph(mVec3_c(0.0f, 25.0f, 0.0f), 200.0f);
-        fn_8002edb0(mShadow, mMdl, &sph, -1, -1, 0.0f);
+        drawShadow(mShadow, mMdl, sph, -1, -1, 0.0f);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_girahimu_floor.cpp b/src/REL/d/a/obj/d_a_obj_girahimu_floor.cpp
index 1b5f8ebf..f04c4331 100644
--- a/src/REL/d/a/obj/d_a_obj_girahimu_floor.cpp
+++ b/src/REL/d/a/obj/d_a_obj_girahimu_floor.cpp
@@ -220,7 +220,7 @@ int dAcOGirahimuFloor_c::actorExecute() {
 }
 
 int dAcOGirahimuFloor_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_girahimu_knife.cpp b/src/REL/d/a/obj/d_a_obj_girahimu_knife.cpp
index 90a9fe82..8dec84d3 100644
--- a/src/REL/d/a/obj/d_a_obj_girahimu_knife.cpp
+++ b/src/REL/d/a/obj/d_a_obj_girahimu_knife.cpp
@@ -131,8 +131,8 @@ int dAcObjGirahimuKnife_c::actorExecute() {
 int dAcObjGirahimuKnife_c::draw() {
     static mSphere_c sph(mVec3_c(0.0f, 60.0f, 0.0f), 100.0f);
     f32 f = mPosition.y;
-    drawModelType1(&mMdl);
-    fn_8002edb0(mShadow, mMdl, &sph, -1, -1, f);
+    drawModel(&mMdl);
+    drawShadow(mShadow, mMdl, sph, -1, -1, f);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_girahimu_sword_link.cpp b/src/REL/d/a/obj/d_a_obj_girahimu_sword_link.cpp
index e5f33f5a..dd6470dc 100644
--- a/src/REL/d/a/obj/d_a_obj_girahimu_sword_link.cpp
+++ b/src/REL/d/a/obj/d_a_obj_girahimu_sword_link.cpp
@@ -80,7 +80,7 @@ int dAcObjGirahimuSwordLink_c::draw() {
 
     mMdl.entry(this, nullptr, nullptr);
     static mSphere_c sph(mVec3_c(0.0f, 100.0f, 0.0f), 200.0f);
-    fn_8002edb0(mShadow, mMdl.mMdl, &sph, -1, -1, 0.0f);
+    drawShadow(mShadow, mMdl.mMdl, sph, -1, -1, 0.0f);
     return true;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp
index 78ea0801..ad52a0f9 100644
--- a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp
+++ b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp
@@ -144,7 +144,7 @@ const float dAcOgrassCoil_c::sSqDistThreshold = 1000000.f;
 const u32 dAcOgrassCoil_c::lbl_268_rodata_4C = 2;
 
 int dAcOgrassCoil_c::draw() {
-    drawModelType1(&mMdl[mCut]);
+    drawModel(&mMdl[mCut]);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_grave.cpp b/src/REL/d/a/obj/d_a_obj_grave.cpp
index 2efe3048..470cae71 100644
--- a/src/REL/d/a/obj/d_a_obj_grave.cpp
+++ b/src/REL/d/a/obj/d_a_obj_grave.cpp
@@ -146,9 +146,9 @@ int dAcOGrave_c::actorExecute() {
 }
 
 int dAcOGrave_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     static mSphere_c sph(mVec3_c(0.f, 50.f, 0.f), 50.f);
-    drawShadow(mShadow, nullptr, mWorldMtx, &sph, -1, -1, -1, -1, -1, 0.f);
+    drawShadow(mShadow, nullptr, mWorldMtx, sph, -1, -1, -1, -1, -1, 0.f);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_hole.cpp b/src/REL/d/a/obj/d_a_obj_hole.cpp
index 524feaba..4f6e98a4 100644
--- a/src/REL/d/a/obj/d_a_obj_hole.cpp
+++ b/src/REL/d/a/obj/d_a_obj_hole.cpp
@@ -54,7 +54,7 @@ int dAcOhole_c::actorExecute() {
 }
 
 int dAcOhole_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_impa_door.cpp b/src/REL/d/a/obj/d_a_obj_impa_door.cpp
index 487836b5..72f3b3e4 100644
--- a/src/REL/d/a/obj/d_a_obj_impa_door.cpp
+++ b/src/REL/d/a/obj/d_a_obj_impa_door.cpp
@@ -39,7 +39,7 @@ int dAcOimpaDoor_c::actorExecute() {
 }
 
 int dAcOimpaDoor_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_insect_island.cpp b/src/REL/d/a/obj/d_a_obj_insect_island.cpp
index 5625bdcc..844dcd8e 100644
--- a/src/REL/d/a/obj/d_a_obj_insect_island.cpp
+++ b/src/REL/d/a/obj/d_a_obj_insect_island.cpp
@@ -100,8 +100,8 @@ int dAcOinsectIsland_c::actorExecute() {
 }
 
 int dAcOinsectIsland_c::draw() {
-    drawModelType1(&mMainMdl);
-    drawModelType1(&mWtrMdl0);
-    drawModelType1(&mWtrMdl1);
+    drawModel(&mMainMdl);
+    drawModel(&mWtrMdl0);
+    drawModel(&mWtrMdl1);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp
index 3f8cf682..cae28246 100644
--- a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp
+++ b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp
@@ -36,6 +36,6 @@ int dAcOironStage_c::actorExecute() {
 }
 
 int dAcOironStage_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_island_LOD.cpp b/src/REL/d/a/obj/d_a_obj_island_LOD.cpp
index 80921158..67608619 100644
--- a/src/REL/d/a/obj/d_a_obj_island_LOD.cpp
+++ b/src/REL/d/a/obj/d_a_obj_island_LOD.cpp
@@ -50,6 +50,6 @@ int dAcOislandLOD_c::draw() {
     if (blurAndPaletteManager.fn_80024770(7) && !blurAndPaletteManager.fn_800247A0(7)) {
         return SUCCEEDED;
     }
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_island_nusi.cpp b/src/REL/d/a/obj/d_a_obj_island_nusi.cpp
index 14d613e0..8f6baa86 100644
--- a/src/REL/d/a/obj/d_a_obj_island_nusi.cpp
+++ b/src/REL/d/a/obj/d_a_obj_island_nusi.cpp
@@ -77,7 +77,7 @@ int dAcOislandNusi_c::actorExecute() {
 
 int dAcOislandNusi_c::draw() {
     for (int i = 0; i < 2; i++) {
-        drawModelType1(&mMdls[i]);
+        drawModel(&mMdls[i]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp b/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
index df8cd5a3..4af6875a 100644
--- a/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
+++ b/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
@@ -930,12 +930,12 @@ void dAcOivyRope_c::fn_256_D850() {
                 }
                 mMtx_c m;
                 m.transS(field_0xF68);
-                drawShadow(mShadow, nullptr, m, &sph, -1, idk, -1, -1, -1, val);
+                drawShadow(mShadow, nullptr, m, sph, -1, idk, -1, -1, -1, val);
             }
         } else {
             mMtx_c m;
             m.transS(fn_256_D730(mSegmentCount - 1));
-            drawShadow(mShadow, nullptr, m, &sph, -1, -1, -1, -1, -1, 175.f);
+            drawShadow(mShadow, nullptr, m, sph, -1, -1, -1, -1, -1, 175.f);
         }
     }
 }
diff --git a/src/REL/d/a/obj/d_a_obj_junk_repairing.cpp b/src/REL/d/a/obj/d_a_obj_junk_repairing.cpp
index 72762c8f..0e560bbb 100644
--- a/src/REL/d/a/obj/d_a_obj_junk_repairing.cpp
+++ b/src/REL/d/a/obj/d_a_obj_junk_repairing.cpp
@@ -58,9 +58,9 @@ int dAcOJunkRep_c::actorExecute() {
 }
 
 int dAcOJunkRep_c::draw() {
-    drawModelType1(mpModelToUse);
+    drawModel(mpModelToUse);
     static mSphere_c sph(mVec3_c(0.0f, 37.5f, 0.0f), 75.0f);
-    fn_8002edb0(mShadow, *mpModelToUse, &sph, -1, -1, sSomeFloat);
+    drawShadow(mShadow, *mpModelToUse, sph, -1, -1, sSomeFloat);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_lava_F200.cpp b/src/REL/d/a/obj/d_a_obj_lava_F200.cpp
index af4961b2..e81a35d9 100644
--- a/src/REL/d/a/obj/d_a_obj_lava_F200.cpp
+++ b/src/REL/d/a/obj/d_a_obj_lava_F200.cpp
@@ -60,7 +60,7 @@ int dAcOlavaF200_c::actorExecute() {
 
 int dAcOlavaF200_c::draw() {
     for (int i = 0; i < 2; i++) {
-        drawModelType1(&mModels[i]);
+        drawModel(&mModels[i]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_megami_island.cpp b/src/REL/d/a/obj/d_a_obj_megami_island.cpp
index 5ace732f..ef23ce5e 100644
--- a/src/REL/d/a/obj/d_a_obj_megami_island.cpp
+++ b/src/REL/d/a/obj/d_a_obj_megami_island.cpp
@@ -108,7 +108,7 @@ int dAcOmegamiIsland_c::actorExecute() {
 
 int dAcOmegamiIsland_c::draw() {
     for (int i = 0; i < 2; i++) {
-        drawModelType1(&mMdls[i]);
+        drawModel(&mMdls[i]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_mole_cover.cpp b/src/REL/d/a/obj/d_a_obj_mole_cover.cpp
index 9c77bf99..5a23594c 100644
--- a/src/REL/d/a/obj/d_a_obj_mole_cover.cpp
+++ b/src/REL/d/a/obj/d_a_obj_mole_cover.cpp
@@ -46,6 +46,6 @@ int dAcOmoleCover_c::actorExecute() {
 }
 
 int dAcOmoleCover_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_mole_soil.cpp b/src/REL/d/a/obj/d_a_obj_mole_soil.cpp
index 87599226..fe11605d 100644
--- a/src/REL/d/a/obj/d_a_obj_mole_soil.cpp
+++ b/src/REL/d/a/obj/d_a_obj_mole_soil.cpp
@@ -64,7 +64,7 @@ int dAcOmoleSoil_c::actorExecute() {
 
 int dAcOmoleSoil_c::draw() {
     if (field_0x391) {
-        drawModelType1(&mModel);
+        drawModel(&mModel);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_move_elec.cpp b/src/REL/d/a/obj/d_a_obj_move_elec.cpp
index b965fca0..a2f5bcea 100644
--- a/src/REL/d/a/obj/d_a_obj_move_elec.cpp
+++ b/src/REL/d/a/obj/d_a_obj_move_elec.cpp
@@ -125,7 +125,7 @@ int dAcOMoveElec_c::actorExecute() {
 }
 
 int dAcOMoveElec_c::draw() {
-    drawModelType1(&mMdl.getModel());
+    drawModel(&mMdl.getModel());
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_mushroom.cpp b/src/REL/d/a/obj/d_a_obj_mushroom.cpp
index 01ff5ba3..ccd46289 100644
--- a/src/REL/d/a/obj/d_a_obj_mushroom.cpp
+++ b/src/REL/d/a/obj/d_a_obj_mushroom.cpp
@@ -87,8 +87,8 @@ const dAcOMushRoom_HIO_c dAcOMushRoom_HIO_c::sInstance = {
 };
 
 static const Vec sRadius[4] = {
-    {105.0f, 90.0f, 210.0f},
-    {105.0f, 90.0f, 205.0f},
+    {105.0f,  90.0f, 210.0f},
+    {105.0f,  90.0f, 205.0f},
     {105.0f, 135.0f, 312.0f},
     {105.0f, 135.0f, 312.0f},
 };
@@ -308,12 +308,12 @@ int dAcOMushRoom_c::actorExecute() {
 }
 
 int dAcOMushRoom_c::draw() {
-    drawModelType1(mMdl.getMdl());
+    drawModel(mMdl.getMdl());
     mSphere_c sph(mVec3_c(0.0f, getShadowOffsetY(), 0.0f), getRadiusX() * 2.0f);
     if (getType() == TYPE_MushroomD) {
-        drawShadow(mShadow, nullptr, mWorldMtx, &sph, -1, 0xC8, 0xB4, 0xE6, 0xFF, 0.0f);
+        drawShadow(mShadow, nullptr, mWorldMtx, sph, -1, 0xC8, 0xB4, 0xE6, 0xFF, 0.0f);
     } else {
-        drawShadow(mShadow, nullptr, mWorldMtx, &sph, -1, -1, -1, -1, -1, 0.0f);
+        drawShadow(mShadow, nullptr, mWorldMtx, sph, -1, -1, -1, -1, -1, 0.0f);
     }
 
     if (mCameraIdx >= 0) {
@@ -450,7 +450,7 @@ void dAcOMushRoom_c::executeState_Wait() {
                 s32 type = getType();
                 mVec3_c pos = mPosition + sOffsets[type] * mScale.y;
 
-                if (dAcObjBase_c::create(this, fProfile::OBJ_SPORE, p1, &pos, nullptr, nullptr, 0, 0x3F)) {
+                if (dAcObjBase_c::createChildAttached(fProfile::OBJ_SPORE, p1, &pos, nullptr, nullptr, 0, 0x3F)) {
                     field_0x892 = false;
                 }
                 startCloudEmitter();
diff --git a/src/REL/d/a/obj/d_a_obj_oct_grass.cpp b/src/REL/d/a/obj/d_a_obj_oct_grass.cpp
index 933d38d5..bcf071a5 100644
--- a/src/REL/d/a/obj/d_a_obj_oct_grass.cpp
+++ b/src/REL/d/a/obj/d_a_obj_oct_grass.cpp
@@ -66,7 +66,7 @@ int dAcOOctGrass_c::actorExecute() {
 }
 
 int dAcOOctGrass_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_paint.cpp b/src/REL/d/a/obj/d_a_obj_paint.cpp
index 4efdfd47..598ae62e 100644
--- a/src/REL/d/a/obj/d_a_obj_paint.cpp
+++ b/src/REL/d/a/obj/d_a_obj_paint.cpp
@@ -60,9 +60,9 @@ int dAcOpaint_c::actorExecute() {
 }
 
 int dAcOpaint_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     static mSphere_c sph(mVec3_c(0.0f, 0.0f, 0.0f), 100.0f);
-    fn_8002edb0(mShadow, mMdl, &sph, -1, -1, 0.0f);
+    drawShadow(mShadow, mMdl, sph, -1, -1, 0.0f);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_pinwheel.cpp b/src/REL/d/a/obj/d_a_obj_pinwheel.cpp
index 31144cdf..92a17d34 100644
--- a/src/REL/d/a/obj/d_a_obj_pinwheel.cpp
+++ b/src/REL/d/a/obj/d_a_obj_pinwheel.cpp
@@ -75,7 +75,7 @@ int dAcOpinwheel_c::actorExecute() {
 }
 
 int dAcOpinwheel_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_pool_cock.cpp b/src/REL/d/a/obj/d_a_obj_pool_cock.cpp
index 0c0a2d73..c7ec8c71 100644
--- a/src/REL/d/a/obj/d_a_obj_pool_cock.cpp
+++ b/src/REL/d/a/obj/d_a_obj_pool_cock.cpp
@@ -76,8 +76,8 @@ int dAcOPoolCock_c::actorExecute() {
 
 int dAcOPoolCock_c::draw() {
     if (mOpenProgress < 400.0f) {
-        drawModelType1(&mModels[0]);
-        drawModelType1(&mModels[1]);
+        drawModel(&mModels[0]);
+        drawModel(&mModels[1]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp b/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp
index bc1af437..ae850e3d 100644
--- a/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp
+++ b/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp
@@ -61,7 +61,7 @@ int dAcOpumpkinBar_c::actorExecute() {
 }
 
 int dAcOpumpkinBar_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_pumpkin_leaf.cpp b/src/REL/d/a/obj/d_a_obj_pumpkin_leaf.cpp
index 970858dc..f850d732 100644
--- a/src/REL/d/a/obj/d_a_obj_pumpkin_leaf.cpp
+++ b/src/REL/d/a/obj/d_a_obj_pumpkin_leaf.cpp
@@ -39,7 +39,7 @@ int dAcOPumpkinLeaf_c::actorExecute() {
 }
 
 int dAcOPumpkinLeaf_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_puzzle_island.cpp b/src/REL/d/a/obj/d_a_obj_puzzle_island.cpp
index d42f4be0..eb30dcbf 100644
--- a/src/REL/d/a/obj/d_a_obj_puzzle_island.cpp
+++ b/src/REL/d/a/obj/d_a_obj_puzzle_island.cpp
@@ -59,6 +59,6 @@ int dAcOpuzzleIsland_c::actorExecute() {
 }
 
 int dAcOpuzzleIsland_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_ring.cpp b/src/REL/d/a/obj/d_a_obj_ring.cpp
index 55cd6c33..de7a6bf7 100644
--- a/src/REL/d/a/obj/d_a_obj_ring.cpp
+++ b/src/REL/d/a/obj/d_a_obj_ring.cpp
@@ -47,7 +47,7 @@ int dAcOring_c::actorExecute() {
 }
 
 int dAcOring_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_rope_base.cpp b/src/REL/d/a/obj/d_a_obj_rope_base.cpp
index 3ca31e8d..5366bbb7 100644
--- a/src/REL/d/a/obj/d_a_obj_rope_base.cpp
+++ b/src/REL/d/a/obj/d_a_obj_rope_base.cpp
@@ -44,6 +44,6 @@ int dAcOropeBase_c::actorExecute() {
 }
 
 int dAcOropeBase_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_rope_igaiga.cpp b/src/REL/d/a/obj/d_a_obj_rope_igaiga.cpp
index 77774cb1..bb24673f 100644
--- a/src/REL/d/a/obj/d_a_obj_rope_igaiga.cpp
+++ b/src/REL/d/a/obj/d_a_obj_rope_igaiga.cpp
@@ -142,7 +142,7 @@ int dAcOropeIgaiga_c::actorExecute() {
 }
 
 int dAcOropeIgaiga_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_roulette_island_c.cpp b/src/REL/d/a/obj/d_a_obj_roulette_island_c.cpp
index 7b089cde..61fc5552 100644
--- a/src/REL/d/a/obj/d_a_obj_roulette_island_c.cpp
+++ b/src/REL/d/a/obj/d_a_obj_roulette_island_c.cpp
@@ -85,8 +85,8 @@ int dAcOrouletteIslandC_c::actorExecute() {
 }
 
 int dAcOrouletteIslandC_c::draw() {
-    drawModelType1(&mMdl);
-    drawModelType1(&mMdl_s);
+    drawModel(&mMdl);
+    drawModel(&mMdl_s);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_roulette_island_r.cpp b/src/REL/d/a/obj/d_a_obj_roulette_island_r.cpp
index b85c6196..1da0a91c 100644
--- a/src/REL/d/a/obj/d_a_obj_roulette_island_r.cpp
+++ b/src/REL/d/a/obj/d_a_obj_roulette_island_r.cpp
@@ -104,8 +104,8 @@ int dAcOrouletteIslandR_c::actorExecute() {
 }
 
 int dAcOrouletteIslandR_c::draw() {
-    drawModelType1(&mMdl);
-    drawModelType1(&mMdl_s);
+    drawModel(&mMdl);
+    drawModel(&mMdl_s);
     return SUCCEEDED;
 }
 void dAcOrouletteIslandR_c::initializeState_Wait() {
diff --git a/src/REL/d/a/obj/d_a_obj_ruined_save.cpp b/src/REL/d/a/obj/d_a_obj_ruined_save.cpp
index 95f9caf7..3011e7da 100644
--- a/src/REL/d/a/obj/d_a_obj_ruined_save.cpp
+++ b/src/REL/d/a/obj/d_a_obj_ruined_save.cpp
@@ -55,7 +55,7 @@ int dAcOruinedSave_c::actorExecuteInEvent() {
 }
 
 int dAcOruinedSave_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_seat_sword.cpp b/src/REL/d/a/obj/d_a_obj_seat_sword.cpp
index a7503ae0..b029e5de 100644
--- a/src/REL/d/a/obj/d_a_obj_seat_sword.cpp
+++ b/src/REL/d/a/obj/d_a_obj_seat_sword.cpp
@@ -179,12 +179,12 @@ void dAcOSeatSword_c::registerInEvent() {
 
 int dAcOSeatSword_c::draw() {
     if (!mStateMgr.isState(StateID_Get)) {
-        drawModelType1(&mSwordMdl);
+        drawModel(&mSwordMdl);
     }
 
-    drawModelType1(&mPedestalMdl);
+    drawModel(&mPedestalMdl);
     if (mSubtype == 1) {
-        drawModelType1(&mPedestalMdl_s);
+        drawModel(&mPedestalMdl_s);
     }
 
     return SUCCEEDED;
diff --git a/src/REL/d/a/obj/d_a_obj_shed.cpp b/src/REL/d/a/obj/d_a_obj_shed.cpp
index cb6df749..1ac87ce2 100644
--- a/src/REL/d/a/obj/d_a_obj_shed.cpp
+++ b/src/REL/d/a/obj/d_a_obj_shed.cpp
@@ -70,7 +70,7 @@ int dAcOShed_c::actorExecute() {
 }
 
 int dAcOShed_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_ship_window.cpp b/src/REL/d/a/obj/d_a_obj_ship_window.cpp
index f4d8c9ed..a175cacc 100644
--- a/src/REL/d/a/obj/d_a_obj_ship_window.cpp
+++ b/src/REL/d/a/obj/d_a_obj_ship_window.cpp
@@ -103,10 +103,10 @@ int dAcOshipWindow_c::actorExecuteInEvent() {
 int dAcOshipWindow_c::draw() {
     if (mPastState <= 0.0f ||
         (dTimeAreaMgr_c::GetInstance()->isField0x7A() && !dTimeAreaMgr_c::GetInstance()->isField0x78())) {
-        drawModelType1(&mMdls[0]);
+        drawModel(&mMdls[0]);
     }
     if (mPastState > 0.0f) {
-        drawModelType1(&mMdls[1]);
+        drawModel(&mMdls[1]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_shrine_after.cpp b/src/REL/d/a/obj/d_a_obj_shrine_after.cpp
index a44c866d..bec03814 100644
--- a/src/REL/d/a/obj/d_a_obj_shrine_after.cpp
+++ b/src/REL/d/a/obj/d_a_obj_shrine_after.cpp
@@ -28,6 +28,6 @@ int dAcOshrineAfter_c::actorExecute() {
 }
 
 int dAcOshrineAfter_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_shrine_bef_inside.cpp b/src/REL/d/a/obj/d_a_obj_shrine_bef_inside.cpp
index 05f1d359..4b3c80fd 100644
--- a/src/REL/d/a/obj/d_a_obj_shrine_bef_inside.cpp
+++ b/src/REL/d/a/obj/d_a_obj_shrine_bef_inside.cpp
@@ -53,7 +53,7 @@ int dAcOshrineBefInside_c::actorExecute() {
 
 int dAcOshrineBefInside_c::draw() {
     for (int i = 0; i < 2; i++) {
-        drawModelType1(&mModel[i]);
+        drawModel(&mModel[i]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_shrine_before.cpp b/src/REL/d/a/obj/d_a_obj_shrine_before.cpp
index cf9aa98b..e3e0076b 100644
--- a/src/REL/d/a/obj/d_a_obj_shrine_before.cpp
+++ b/src/REL/d/a/obj/d_a_obj_shrine_before.cpp
@@ -28,6 +28,6 @@ int dAcOshrineBefore_c::actorExecute() {
 }
 
 int dAcOshrineBefore_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_smoke.cpp b/src/REL/d/a/obj/d_a_obj_smoke.cpp
index 71d50df2..fafa73c4 100644
--- a/src/REL/d/a/obj/d_a_obj_smoke.cpp
+++ b/src/REL/d/a/obj/d_a_obj_smoke.cpp
@@ -47,7 +47,7 @@ int dAcOsmoke_c::actorExecute() {
 }
 
 int dAcOsmoke_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_soil.cpp b/src/REL/d/a/obj/d_a_obj_soil.cpp
index 57cebabf..a065bbc5 100644
--- a/src/REL/d/a/obj/d_a_obj_soil.cpp
+++ b/src/REL/d/a/obj/d_a_obj_soil.cpp
@@ -1,4 +1,5 @@
 #include "d/a/obj/d_a_obj_soil.h"
+
 #include "c/c_math.h"
 #include "common.h"
 #include "d/a/d_a_base.h"
@@ -31,6 +32,7 @@
 #include "toBeSorted/dowsing_target.h"
 #include "toBeSorted/event_manager.h"
 
+
 SPECIAL_ACTOR_PROFILE(OBJ_SOIL, dAcOsoil_c, fProfile::OBJ_SOIL, 0x268, 0, 7);
 
 STATE_DEFINE(dAcOsoil_c, Soil);
@@ -52,19 +54,12 @@ s32 useUnused() {
         240.f,
         240.f,
     };
-    static const s32 a2[] = {
-        1,
-        0x000F0000,
-        0x459C4000,
-        0x006E6950,
-        0
-    };
+    static const s32 a2[] = {1, 0x000F0000, 0x459C4000, 0x006E6950, 0};
     return (s32)a1 + (s32)a2;
 }
 
-
 bool dAcOsoil_c::createHeap() {
-    void* data = getOarcResFile("MoundShovel");
+    void *data = getOarcResFile("MoundShovel");
     if (data == nullptr) {
         return false;
     }
@@ -74,19 +69,19 @@ bool dAcOsoil_c::createHeap() {
     mModels[MODEL_COVERED].setPriorityDraw(0x22, field_0x793 ? 0x82 : 9);
     setModelColorFromParams(&mColors[MODEL_COVERED], mModels[MODEL_COVERED]);
     if (isSubtypeVentOrDrop()) {
-        static const char* oarcResForType[4] = {
+        static const char *oarcResForType[4] = {
             "HoleShovel",
             "HoleShovel",
             "MudShovel",
             "MudShovel",
         };
-        static const char* mdlForType[4] = {
+        static const char *mdlForType[4] = {
             "HoleShovel",
             "HoleShovel",
             "MudShovel",
             "MudShovel",
         };
-        void* subtypeData = getOarcResFile(oarcResForType[getSubtype()]);
+        void *subtypeData = getOarcResFile(oarcResForType[getSubtype()]);
         if (subtypeData == nullptr) {
             return false;
         }
@@ -118,7 +113,7 @@ int dAcOsoil_c::actorCreate() {
     }
     if (getFromParams(0x13, 1) == 0 && mItemSubtype == ITEMTYPE_DROP && mSubtype != SUBTYPE_TBOX) {
         mForInsects = true;
-    } 
+    }
     if (!mForInsects) {
         mCountInParams = getFromParams(0xC, 0xF);
         if (mCountInParams == 0) {
@@ -194,9 +189,9 @@ int dAcOsoil_c::actorPostCreate() {
         }
     }
     if (mForInsects) {
-        dTgInsect_c* tgInsect = nullptr;
+        dTgInsect_c *tgInsect = nullptr;
         do {
-            tgInsect = static_cast<dTgInsect_c*>(fManager_c::searchBaseByProfName(fProfile::TAG_INSECT, tgInsect));
+            tgInsect = static_cast<dTgInsect_c *>(fManager_c::searchBaseByProfName(fProfile::TAG_INSECT, tgInsect));
             if (tgInsect != nullptr) {
                 f32 dist = tgInsect->mPosition.squareDistanceToXZ(mPosition);
                 if (dist < 10000.f) {
@@ -204,9 +199,10 @@ int dAcOsoil_c::actorPostCreate() {
                     break;
                 }
             }
-        } while(tgInsect != nullptr);
+        } while (tgInsect != nullptr);
     }
-    if (mSceneflag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag) && dScGame_c::currentSpawnInfo.stageName == "F401") {
+    if (mSceneflag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag) &&
+        dScGame_c::currentSpawnInfo.stageName == "F401") {
         mColors[MODEL_DUG_UP].a = 0xFF;
         mModelIndex = MODEL_DUG_UP;
         mModels[MODEL_DUG_UP].setTevColorAll(GX_TEVREG1, mColors[MODEL_DUG_UP], false);
@@ -223,7 +219,6 @@ int dAcOsoil_c::actorPostCreate() {
     return SUCCEEDED;
 }
 
-
 int dAcOsoil_c::doDelete() {
     if (mAlwaysLoaded) {
         changeLoadedEntitiesNoSet();
@@ -232,13 +227,13 @@ int dAcOsoil_c::doDelete() {
 }
 
 extern "C" dAcBase_c *getCurrentEventActor();
-extern "C" bool AcItem__isKeyPiece2(dAcItem_c*);
+extern "C" bool AcItem__isKeyPiece2(dAcItem_c *);
 int dAcOsoil_c::actorExecute() {
     if (mShouldSetFlagInEvent) {
         if (EventManager::isInEvent()) {
             if (EventManager::isCurrentEvent("DefaultGetItem") || EventManager::isCurrentEvent("ItemGetGorgeous")) {
                 if (mItemSubtype == ITEMTYPE_KEY_PIECE) {
-                    if (AcItem__isKeyPiece2(static_cast<dAcItem_c*>(getCurrentEventActor()))) {
+                    if (AcItem__isKeyPiece2(static_cast<dAcItem_c *>(getCurrentEventActor()))) {
                         mShouldSetFlagInEvent = false;
                         SceneflagManager::sInstance->setFlag(mRoomID, mSceneflag);
                     }
@@ -281,16 +276,16 @@ int dAcOsoil_c::draw() {
     if (isSubtypeVentOrDrop()) {
         if (mStateMgr.isState(StateID_Ready)) {
             if (mHideCover) {
-                drawModelType1(&mModels[MODEL_DUG_UP]);
+                drawModel(&mModels[MODEL_DUG_UP]);
             } else {
-                drawModelType1(&mModels[MODEL_COVERED]);
-                drawModelType1(&mModels[MODEL_DUG_UP]);
+                drawModel(&mModels[MODEL_COVERED]);
+                drawModel(&mModels[MODEL_DUG_UP]);
             }
         } else {
-            drawModelType1(&mModels[mModelIndex]);
+            drawModel(&mModels[mModelIndex]);
         }
-    } else if(mModelIndex == MODEL_COVERED) {
-        drawModelType1(&mModels[MODEL_COVERED]);
+    } else if (mModelIndex == MODEL_COVERED) {
+        drawModel(&mModels[MODEL_COVERED]);
     }
     return SUCCEEDED;
 }
@@ -416,10 +411,10 @@ void dAcOsoil_c::finalizeState_Ready() {
 void dAcOsoil_c::tryLinkTbox() {
     if (mSubtype == SUBTYPE_TBOX && !mHasTriedTboxLink) {
         mHasTriedTboxLink = true;
-        dAcTbox_c* tbox = nullptr;
+        dAcTbox_c *tbox = nullptr;
         f32 minDist = 100.f;
         do {
-            tbox = static_cast<dAcTbox_c*>(fManager_c::searchBaseByProfName(fProfile::TBOX, tbox));
+            tbox = static_cast<dAcTbox_c *>(fManager_c::searchBaseByProfName(fProfile::TBOX, tbox));
             if (tbox != nullptr) {
                 f32 dist = tbox->mPosition.squareDistanceToXZ(mPosition);
                 if (dist < minDist) {
@@ -427,9 +422,9 @@ void dAcOsoil_c::tryLinkTbox() {
                     mTboxLink.link(tbox);
                 }
             }
-        } while(tbox != nullptr);
+        } while (tbox != nullptr);
         if (mTboxLink.isLinked()) {
-            dAcTbox_c* tbox = mTboxLink.get();
+            dAcTbox_c *tbox = mTboxLink.get();
             if (tbox->hasBeenOpened() == true) {
                 mStateMgr.changeState(StateID_Hole);
                 mInteractionDisabled = true;
@@ -470,7 +465,7 @@ void dAcOsoil_c::giveItemFinal() {
         }
     } else if (mInsectLink.isLinked()) {
         calcItemAndInsectSpawnPos();
-        dTgInsect_c* tgInsect = mInsectLink.get();
+        dTgInsect_c *tgInsect = mInsectLink.get();
         tgInsect->reveal(&mItemAndInsectSpawnPos);
     }
 }
@@ -485,7 +480,7 @@ void dAcOsoil_c::fn_255_1A50() {
     if (mFinalDigTimer != 0 && --mFinalDigTimer == 0) {
         if (mSubtype == SUBTYPE_TBOX) {
             if (!mTboxPrepared && mTboxLink.isLinked()) {
-                dAcTbox_c* tbox = mTboxLink.get();
+                dAcTbox_c *tbox = mTboxLink.get();
                 tbox->unsetActorProperty(AC_PROP_0x40000000);
                 tbox->unsetObjectProperty(OBJ_PROP_0x200);
                 tbox->mRotation.y = tbox->getXZAngleToPlayer();
@@ -496,8 +491,8 @@ void dAcOsoil_c::fn_255_1A50() {
         }
     }
     if (mTboxPrepared) {
-        if (mTboxLink.isLinked())  {
-            dAcTbox_c* tbox = mTboxLink.get();
+        if (mTboxLink.isLinked()) {
+            dAcTbox_c *tbox = mTboxLink.get();
             if (tbox->mScale.x >= 1) {
                 mTboxPrepared = false;
                 dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_READ_RIDDLE_A);
@@ -508,12 +503,14 @@ void dAcOsoil_c::fn_255_1A50() {
     }
 }
 
-bool dAcOsoil_c::checkCoHit(bool* pOut) {
+bool dAcOsoil_c::checkCoHit(bool *pOut) {
     bool hitByWind = false;
     *pOut = false;
     if (mCollider.ChkCoHit()) {
-        dAcObjBase_c* actor = mCollider.GetCoActor();
-        if (actor != nullptr && (actor->mProfileName == fProfile::OBJ_WIND || actor->mProfileName == fProfile::OBJ_WIND02 || actor->mProfileName == fProfile::OBJ_WIND03)) {
+        dAcObjBase_c *actor = mCollider.GetCoActor();
+        if (actor != nullptr &&
+            (actor->mProfileName == fProfile::OBJ_WIND || actor->mProfileName == fProfile::OBJ_WIND02 ||
+             actor->mProfileName == fProfile::OBJ_WIND03)) {
             hitByWind = true;
         } else {
             *pOut = true;
@@ -522,17 +519,14 @@ bool dAcOsoil_c::checkCoHit(bool* pOut) {
     return hitByWind;
 }
 
-void dAcOsoil_c::setModelColorFromParams(GXColor* pOutColor, m3d::smdl_c& mdl) {
+void dAcOsoil_c::setModelColorFromParams(GXColor *pOutColor, m3d::smdl_c &mdl) {
     u32 param = getFromParams(0x14, 0xF);
     if (param >= 5) {
         param = 0;
     }
     static const mColor colors[5] = {
-        mColor(0x6E, 0x69, 0x50, 0xFF),
-        mColor(0xB4, 0x8C, 0, 0xFF),
-        mColor(0xC8, 0x96, 0x50, 0xFF),
-        mColor(0x8C, 0x6E, 0x46, 0xFF),
-        mColor(0x8C, 0x82, 0x64, 0xFF),
+        mColor(0x6E, 0x69, 0x50, 0xFF), mColor(0xB4, 0x8C, 0, 0xFF),    mColor(0xC8, 0x96, 0x50, 0xFF),
+        mColor(0x8C, 0x6E, 0x46, 0xFF), mColor(0x8C, 0x82, 0x64, 0xFF),
     };
     *pOutColor = colors[param];
     mdl.setTevColorAll(GX_TEVREG1, *pOutColor, false);
@@ -570,7 +564,7 @@ void dAcOsoil_c::handleModelsOpacities() {
         return;
     }
     if (dAcPy_c::LINK->mPosition.squareDistance(mPosition) < 1000000.f) {
-        dCamera_c* camera = dScGame_c::getCamera();
+        dCamera_c *camera = dScGame_c::getCamera();
         if (camera != nullptr) {
             f32 dist = (camera->getPosition() - mPosition).y * (1.f / 80.f);
             if (dist < 0.1f) {
@@ -592,18 +586,7 @@ void dAcOsoil_c::handleModelsOpacities() {
 }
 
 s32 moreUnusedd() {
-    static const s32 stuff[] = {
-        0x49742400,
-        0x42a00000,
-        0x3c4ccccd,
-        0x41f00000,
-        0x42c80000,
-        0x0000001e,
-        0x00000014,
-        0x00000032,
-        0x461c4000,
-        0x40a00000,
-        0x48afc800
-    };
-    return (s32) stuff;
+    static const s32 stuff[] = {0x49742400, 0x42a00000, 0x3c4ccccd, 0x41f00000, 0x42c80000, 0x0000001e,
+                                0x00000014, 0x00000032, 0x461c4000, 0x40a00000, 0x48afc800};
+    return (s32)stuff;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_spike.cpp b/src/REL/d/a/obj/d_a_obj_spike.cpp
index 9188021b..b8621ef2 100644
--- a/src/REL/d/a/obj/d_a_obj_spike.cpp
+++ b/src/REL/d/a/obj/d_a_obj_spike.cpp
@@ -83,7 +83,7 @@ int dAcOspike_c::actorExecute() {
 }
 
 int dAcOspike_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_stage_cover.cpp b/src/REL/d/a/obj/d_a_obj_stage_cover.cpp
index b2c62eed..3f76736b 100644
--- a/src/REL/d/a/obj/d_a_obj_stage_cover.cpp
+++ b/src/REL/d/a/obj/d_a_obj_stage_cover.cpp
@@ -35,7 +35,7 @@ int dAcOstageCover_c::actorExecute() {
 }
 
 int dAcOstageCover_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_stopping_rope.cpp b/src/REL/d/a/obj/d_a_obj_stopping_rope.cpp
index 3da0f987..97962c47 100644
--- a/src/REL/d/a/obj/d_a_obj_stopping_rope.cpp
+++ b/src/REL/d/a/obj/d_a_obj_stopping_rope.cpp
@@ -36,7 +36,7 @@ int dAcOStoppingRope_c::actorExecute() {
 }
 
 int dAcOStoppingRope_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_stream_lava.cpp b/src/REL/d/a/obj/d_a_obj_stream_lava.cpp
index 4e11814c..80fa29ec 100644
--- a/src/REL/d/a/obj/d_a_obj_stream_lava.cpp
+++ b/src/REL/d/a/obj/d_a_obj_stream_lava.cpp
@@ -119,7 +119,7 @@ int dAcOstreamLava_c::actorExecute() {
 
 int dAcOstreamLava_c::draw() {
     if (!mHideActor) {
-        drawModelType1(&mModel);
+        drawModel(&mModel);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_sun_light.cpp b/src/REL/d/a/obj/d_a_obj_sun_light.cpp
index 114691a8..8e07e0ac 100644
--- a/src/REL/d/a/obj/d_a_obj_sun_light.cpp
+++ b/src/REL/d/a/obj/d_a_obj_sun_light.cpp
@@ -46,7 +46,7 @@ int dAcOsunLight_c::actorExecute() {
 
 int dAcOsunLight_c::draw() {
     if (isDay()) {
-        drawModelType1(&mModel);
+        drawModel(&mModel);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp b/src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp
index 8fe2a321..062a41be 100644
--- a/src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp
@@ -102,6 +102,6 @@ int dAcOTarzanPole_c::actorExecute() {
 }
 
 int dAcOTarzanPole_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_tenijima.cpp b/src/REL/d/a/obj/d_a_obj_tenijima.cpp
index 7cf72bd6..c1f93a52 100644
--- a/src/REL/d/a/obj/d_a_obj_tenijima.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tenijima.cpp
@@ -60,7 +60,7 @@ int dAcOtenijima_c::actorExecute() {
 }
 
 int dAcOtenijima_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_terry_island.cpp b/src/REL/d/a/obj/d_a_obj_terry_island.cpp
index ca7b2a50..ae938b8c 100644
--- a/src/REL/d/a/obj/d_a_obj_terry_island.cpp
+++ b/src/REL/d/a/obj/d_a_obj_terry_island.cpp
@@ -120,7 +120,7 @@ int dAcOterryIsland_c::actorExecute() {
 }
 
 int dAcOterryIsland_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp b/src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp
index efb71c64..cd588302 100644
--- a/src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp
+++ b/src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp
@@ -103,12 +103,12 @@ int dAcOTimeStageBg_c::actorExecute() {
 int dAcOTimeStageBg_c::draw() {
     if (field_0x3F8 > 0.0f) {
         if (!secondMdl() || field_0x3F8 != 255.0f) {
-            drawModelType1(&mMdl1);
+            drawModel(&mMdl1);
         }
     }
 
     if (secondMdl() && field_0x3F8 == 255.0f) {
-        drawModelType1(&mMdl2);
+        drawModel(&mMdl2);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp b/src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp
index 2fb30b82..2e42654a 100644
--- a/src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp
+++ b/src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp
@@ -91,7 +91,7 @@ int dAcOtoD3StoneFigure_c::actorExecute() {
 
 int dAcOtoD3StoneFigure_c::draw() {
     if (dScGame_c::currentSpawnInfo.layer != 0x12) {
-        drawModelType1(&mMdl);
+        drawModel(&mMdl);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp b/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp
index 09ebb0dd..f30f2639 100644
--- a/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp
@@ -77,7 +77,7 @@ int dAcOTowerGearD101_c::actorExecute() {
 }
 
 int dAcOTowerGearD101_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp b/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp
index b36f9045..fed9d9bd 100644
--- a/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp
@@ -324,7 +324,7 @@ int dAcOTowerHandD101_c::actorExecuteInEvent() {
 }
 
 int dAcOTowerHandD101_c::draw() {
-    drawModelType1(&mMdl.getModel());
+    drawModel(&mMdl.getModel());
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp b/src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp
index 30ab8033..4ae2cecf 100644
--- a/src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp
+++ b/src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp
@@ -58,7 +58,7 @@ int dAcOtrapRock1_c::actorExecute() {
 }
 
 int dAcOtrapRock1_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_treasure_island.cpp b/src/REL/d/a/obj/d_a_obj_treasure_island.cpp
index 125eb63f..3ec35624 100644
--- a/src/REL/d/a/obj/d_a_obj_treasure_island.cpp
+++ b/src/REL/d/a/obj/d_a_obj_treasure_island.cpp
@@ -108,10 +108,10 @@ int dAcOtreasureIsland_c::actorExecute() {
 }
 
 int dAcOtreasureIsland_c::draw() {
-    drawModelType1(&mModel);
+    drawModel(&mModel);
     if (subtype == 2) {
-        drawModelType1(&mWater00);
-        drawModelType1(&mWater01);
+        drawModel(&mWater00);
+        drawModel(&mWater01);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_treasure_island_b.cpp b/src/REL/d/a/obj/d_a_obj_treasure_island_b.cpp
index f9e41590..93362846 100644
--- a/src/REL/d/a/obj/d_a_obj_treasure_island_b.cpp
+++ b/src/REL/d/a/obj/d_a_obj_treasure_island_b.cpp
@@ -121,9 +121,9 @@ int dAcOtreasureIslandB_c::actorExecute() {
 }
 
 int dAcOtreasureIslandB_c::draw() {
-    drawModelType1(&mMdl[ISLAND]);
+    drawModel(&mMdl[ISLAND]);
     if (getStateID() != StateID_CoverBreak) {
-        drawModelType1(&mMdl[ROCK]);
+        drawModel(&mMdl[ROCK]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_triforce.cpp b/src/REL/d/a/obj/d_a_obj_triforce.cpp
index ca2608dc..e37ff747 100644
--- a/src/REL/d/a/obj/d_a_obj_triforce.cpp
+++ b/src/REL/d/a/obj/d_a_obj_triforce.cpp
@@ -76,6 +76,6 @@ int dAcOtriforce_c::actorExecute() {
 }
 
 int dAcOtriforce_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return 1;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_tubo.cpp b/src/REL/d/a/obj/d_a_obj_tubo.cpp
index 232483c4..2f319511 100644
--- a/src/REL/d/a/obj/d_a_obj_tubo.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tubo.cpp
@@ -75,7 +75,7 @@ int dAcOtubo_c::actorCreate() {
     mEff_0x91C.setIsSmall(true);
     int unkParam = getParams_0x3000();
     if (unkParam != 1 && unkParam != 2) {
-        fn_8002EA30(-60.f, -20.f, 2.f, 1.f, 4.f, &mObjAcch);
+        setSinkDepths(-60.f, -20.f, 2.f, 1.f, 4.f, &mObjAcch);
     }
     mStts.SetRank(5);
     mSph.Set(sSphSrc);
@@ -201,12 +201,12 @@ void dAcOtubo_c::registerInEvent() {
 }
 
 int dAcOtubo_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
 
     static mSphere_c sph(mVec3_c(0.f, 30.f, 0.f), 40.f);
 
     if (mYOffset >= 0.f) {
-        drawShadow(mShdw, nullptr, mWorldMtx, &sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
+        drawShadow(mShdw, nullptr, mWorldMtx, sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
     }
     return SUCCEEDED;
 }
@@ -216,7 +216,7 @@ void dAcOtubo_c::executeState_Wait() {
     if (mObjAcch.ChkGroundLanding()) {
         if (!mbField_0x9EF || !EventManager::isInEvent()) {
             if (field_0x9F6 == 2) {
-                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);
             }
             if (mbField_0x9F3) {
                 startSound(SE_Tubo_PUT);
@@ -225,7 +225,7 @@ void dAcOtubo_c::executeState_Wait() {
             if (checkOnLava()) {
                 if (field_0x9F6 != 2) {
                     dJEffManager_c::spawnGroundEffect(
-                        mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 0, 1.0f, field_0x1B0
+                        mPosition, mPolyAttr0, mPolyAttr1, mGndNormal, 0, 1.0f, field_0x1B0
                     );
                 }
                 startSound(SE_O_FALL_LAVA_S);
@@ -359,7 +359,7 @@ void dAcOtubo_c::initializeState_Slope() {
 }
 void dAcOtubo_c::executeState_Slope() {
     if (mObjAcch.ChkGroundLanding()) {
-        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);
     } else if (mObjAcch.ChkGndHit()) {
         field_0x9DC = 0.f;
         addPickupTarget();
@@ -666,7 +666,7 @@ void dAcOtubo_c::attemptDestroy() {
 
     if (mObjAcch.ChkRoofHit()) {
         destroy();
-    } else if (!mbField_0x9EF && checkYOffsetField_0x100() && getParams_0x3000() != 1) {
+    } else if (!mbField_0x9EF && checkAtDeepSinkDepth() && getParams_0x3000() != 1) {
         killNoItemDrop();
     } else if (fn_272_38A0()) {
         destroy();
diff --git a/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp b/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
index 3e600b80..fbd4cbaa 100644
--- a/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
@@ -154,11 +154,11 @@ int dAcOTumbleWeed_c::actorExecute() {
 }
 
 int dAcOTumbleWeed_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
 
     static mSphere_c sph(mVec3_c(0.f, 30.f, 0.f), 50.f);
     if (0.f < mScale.x) {
-        drawShadow(mShdw, nullptr, mShadowMtx, &sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
+        drawShadow(mShdw, nullptr, mShadowMtx, sph, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH());
     }
 
     return SUCCEEDED;
diff --git a/src/REL/d/a/obj/d_a_obj_under_cloud.cpp b/src/REL/d/a/obj/d_a_obj_under_cloud.cpp
index 0af63227..167d8f8b 100644
--- a/src/REL/d/a/obj/d_a_obj_under_cloud.cpp
+++ b/src/REL/d/a/obj/d_a_obj_under_cloud.cpp
@@ -72,6 +72,6 @@ int dAcOunderCloud_c::draw() {
     if (lightEnv.fn_80024770(6) && !lightEnv.fn_800247A0(6)) {
         return SUCCEEDED;
     }
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_underground_switch.cpp b/src/REL/d/a/obj/d_a_obj_underground_switch.cpp
index aca8de7f..49ca46f8 100644
--- a/src/REL/d/a/obj/d_a_obj_underground_switch.cpp
+++ b/src/REL/d/a/obj/d_a_obj_underground_switch.cpp
@@ -87,7 +87,7 @@ int dAcOUgSwitch_c::actorExecuteInEvent() {
 }
 
 int dAcOUgSwitch_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp b/src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp
index 2f0b48d3..74b50b22 100644
--- a/src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp
+++ b/src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp
@@ -55,6 +55,6 @@ int dAcOutaDemoPedest_c::actorExecute() {
 }
 
 int dAcOutaDemoPedest_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_utajima.cpp b/src/REL/d/a/obj/d_a_obj_utajima.cpp
index d25bacc9..ab894928 100644
--- a/src/REL/d/a/obj/d_a_obj_utajima.cpp
+++ b/src/REL/d/a/obj/d_a_obj_utajima.cpp
@@ -78,7 +78,7 @@ int dAcOutajima_c::actorExecute() {
 
 int dAcOutajima_c::draw() {
     for (int i = 0; i < 2; i++) {
-        drawModelType1(&mMdls[i]);
+        drawModel(&mMdls[i]);
     }
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_utajima_island.cpp b/src/REL/d/a/obj/d_a_obj_utajima_island.cpp
index b38a3cac..86f1174c 100644
--- a/src/REL/d/a/obj/d_a_obj_utajima_island.cpp
+++ b/src/REL/d/a/obj/d_a_obj_utajima_island.cpp
@@ -91,7 +91,7 @@ int dAcOutajimaIsland_c::actorExecute() {
 }
 
 int dAcOutajimaIsland_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_utajima_lv2.cpp b/src/REL/d/a/obj/d_a_obj_utajima_lv2.cpp
index 39906b7c..47f4c197 100644
--- a/src/REL/d/a/obj/d_a_obj_utajima_lv2.cpp
+++ b/src/REL/d/a/obj/d_a_obj_utajima_lv2.cpp
@@ -46,6 +46,6 @@ int dAcOutajimaLv2_c::actorExecute() {
 }
 
 int dAcOutajimaLv2_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_water_shield.cpp b/src/REL/d/a/obj/d_a_obj_water_shield.cpp
index 2ae69e37..ef4839cc 100644
--- a/src/REL/d/a/obj/d_a_obj_water_shield.cpp
+++ b/src/REL/d/a/obj/d_a_obj_water_shield.cpp
@@ -47,7 +47,7 @@ int dAcOwaterShield_c::actorExecute() {
 }
 
 int dAcOwaterShield_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/a/obj/d_a_obj_windmill.cpp b/src/REL/d/a/obj/d_a_obj_windmill.cpp
index 063ac162..b4253b8a 100644
--- a/src/REL/d/a/obj/d_a_obj_windmill.cpp
+++ b/src/REL/d/a/obj/d_a_obj_windmill.cpp
@@ -123,7 +123,7 @@ int dAcOwindmill_c::actorExecute() {
 }
 
 int dAcOwindmill_c::draw() {
-    drawModelType1(&mMdl);
+    drawModel(&mMdl);
     return SUCCEEDED;
 }
 
diff --git a/src/REL/d/t/d_t_sound_area.cpp b/src/REL/d/t/d_t_sound_area.cpp
index 59bf2db0..18db3a69 100644
--- a/src/REL/d/t/d_t_sound_area.cpp
+++ b/src/REL/d/t/d_t_sound_area.cpp
@@ -18,7 +18,7 @@ void float_ordering() {
 int dTgSndAr_c::create() {
     mScale *= 0.01f;
     if (dTgSndMg_c::GetInstance() == nullptr) {
-        dAcObjBase_c::createActorUnkGroup3(fProfile::SOUND_AREA_MGR, mRoomID, 0, nullptr, nullptr, nullptr, -1);
+        dAcObjBase_c::createStageActor(fProfile::SOUND_AREA_MGR, mRoomID, 0, nullptr, nullptr, nullptr, -1);
     }
 
     switch (getTypeFromParams()) {