ShieldD: Clean up a bunch of 99% matching TUs (#3113)

* d_a_npc_ks debug code 100%

* d_a_npc_rafrel debug code 100%

* d_a_npc_inko minor improvements

* d_a_npc_gro debug code 100%

* d_a_npc_pachi_taro debug code 100%

* d_a_npc_passer debug code 100%

* d_a_npc_pachi_maro debug code 100%

* d_a_npc_post debug code 100%

* d_a_obj_bemos debug improvements

* d_a_obj_scannon_ten debug code 100%

* d_a_b_mgn debug code 100%

* d_a_e_fb debug code 100%

* d_a_e_gb debug code 100%

* d_a_e_hz debug code 100%

* d_a_e_cr_egg debug code 100%

* d_a_e_md debug code 100%

* d_a_e_wb debug code 100%

* d_a_obj_mirror_6pole debug code 100%

* d_a_obj_spinLift debug data fixes

* d_a_obj_pdwall debug data fixes

* d_a_obj_ss_drink debug code almost matching

* d_a_obj_poFire debug code 100%

* d_a_obj_picture debug code 100%

* d_a_obj_dust debug code 100%

* d_a_obj_fallobj debug code 100%

* d_a_obj_itamato debug code almost matching

* d_a_obj_syRock debug code 100%

* d_a_obj_katatsumuri debug code 100%

* d_a_obj_wood_statue debug code 100%

* d_a_obj_lv6egate debug code 100%

* d_a_tag_qs minor debug symbol fixes

* d_a_obj_twGate debug code 100%

* d_a_obj_lv6SwGate debug code 100%

* d_a_obj_lv6swturn debug code 100%

* d_a_obj_lv6Tenbin debug code 100%

* d_a_obj_kwheel01 debug code 100%

* Fix RTTI order regression (cM3dGCyl vs cBgS_*)

1 files changed, 19 insertions, 11 deletions

diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp
index afe283c125..e76709c58c 100644
--- a/src/d/actor/d_a_npc_gro.cpp
+++ b/src/d/actor/d_a_npc_gro.cpp
@@ -409,6 +409,8 @@ cPhs_Step daNpc_grO_c::create() {
     cPhs_Step phase;
     int res = 0;
     int i = 0;
+    J3DModelData* mdlData_p;
+    int sp10 = i;
     for (; l_loadRes_list[mType][i] >= 0; i++) {
         phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
         if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
@@ -429,7 +431,7 @@ cPhs_Step daNpc_grO_c::create() {
             return cPhs_ERROR_e;
         }
 
-        J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
+        mdlData_p = mAnm_p->getModel()->getModelData();
         fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
         fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
         mSound.init(&current.pos, &eyePos, 3, 1);
@@ -535,7 +537,8 @@ int daNpc_grO_c::Draw() {
 }
 
 int daNpc_grO_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
-    int jntNo = i_joint->getJntNo();
+    J3DJoint* joint = i_joint;
+    int jntNo = joint->getJntNo();
     int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
 
     if (jntNo == JNT_CENTER) {
@@ -566,7 +569,7 @@ int daNpc_grO_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     }
 
     i_model->setAnmMtx(jntNo, mDoMtx_stack_c::get());
-    MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
+    cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
 
     if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) {
         J3DAnmTransform* anm = mBckAnm.getBckAnm();
@@ -632,6 +635,8 @@ void daNpc_grO_c::setParam() {
 }
 
 BOOL daNpc_grO_c::main() {
+    u16 mapToolId = 0xFFFF;
+
     if (!doEvent()) {
         doNormalAction(1);
     }
@@ -640,12 +645,14 @@ BOOL daNpc_grO_c::main() {
         attention_info.flags = 0;
     }
 
-    if (!mpHIO->m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) {
+    if (!mpHIO->m.common.debug_mode_ON &&
+        (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) {
         if (mOrderEvtNo != EVT_NONE) {
             eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
         }
 
-        orderEvent(mUnkFlag, l_evtNames[l_evtGetParamList[mOrderEvtNo].fileIdx], 0xFFFF, 40, 0xFF, 1);
+        orderEvent(mUnkFlag, l_evtNames[l_evtGetParamList[mOrderEvtNo].fileIdx], mapToolId, 40,
+                   0xFF, 1);
     }
 
     if (field_0x9ee) {
@@ -1287,11 +1294,12 @@ void daNpc_grO_c::doNormalAction(int param_1) {
 }
 
 BOOL daNpc_grO_c::doEvent() {
-    int evtCutNo = 0;
+    dEvent_manager_c* eventManager = NULL;
+    int evtCutNo;
     BOOL rv = FALSE;
 
     if (dComIfGp_event_runCheck()) {
-        dEvent_manager_c& eventManager = dComIfGp_getEventManager();
+        eventManager = &dComIfGp_getEventManager();
 
         if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mUnkFlag) {
             mOrderNewEvt = false;
@@ -1311,22 +1319,22 @@ BOOL daNpc_grO_c::doEvent() {
                 mItemID = fpcM_ERROR_PROCESS_ID_e;
             }
 
-            int staffId = eventManager.getMyStaffId(l_myName, NULL, 0);
+            int staffId = eventManager->getMyStaffId(l_myName, NULL, 0);
             if (staffId != -1) {
                 mStaffID = staffId;
-                evtCutNo = eventManager.getMyActIdx(staffId, mEvtCutNameList, 3, 0, 0);
+                evtCutNo = eventManager->getMyActIdx(staffId, mEvtCutNameList, 3, 0, 0);
 
                 JUT_ASSERT(1844, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e));
                 JUT_ASSERT(1845, NULL != mEvtCutList[evtCutNo]);
 
                 if ((this->*mEvtCutList[evtCutNo])(staffId)) {
-                    eventManager.cutEnd(staffId);
+                    eventManager->cutEnd(staffId);
                 }
 
                 rv = TRUE;
             }
 
-            if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && eventManager.endCheck(mEventIdx) != 0) {
+            if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && eventManager->endCheck(mEventIdx) != 0) {
                 switch (mOrderEvtNo) {
                     default:
                         break;