clean up some inline parameters

23 files changed, 40 insertions, 45 deletions

diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index 2d80377c..aa75f7a1 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -626,7 +626,7 @@ void daAgb_c::modeLookAttention() {
             }
         }
     } else {
-        fopAcM_orderOtherEvent2(this, "DEFAULT_AGB_LOOK_ATTENTION", 4);
+        fopAcM_orderOtherEvent2(this, "DEFAULT_AGB_LOOK_ATTENTION", dEvtFlag_TALK_e);
     }
 }
 
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index 8fb035e7..3fa4e376 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -1073,7 +1073,7 @@ BOOL daAgbsw0_c::ExeSubMW() {
             }
         }
         else {
-            fopAcM_orderOtherEvent2(this, "DEFAULT_AGB_LOOK_ATTENTION", 4);
+            fopAcM_orderOtherEvent2(this, "DEFAULT_AGB_LOOK_ATTENTION", dEvtFlag_TALK_e);
         }
     }
 
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index d1c5e099..3da0611e 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -844,7 +844,7 @@ BOOL daArrow_c::procMove() {
                 current.pos = old.pos;
                 field_0x69c = 0x2C00;
                 csXyz temp9;
-                cM3d_CalcVecZAngle(triPla->mNormal, &temp9);
+                cM3d_CalcVecZAngle(*triPla->GetNP(), &temp9);
                 
                 dComIfGp_particle_setP1(dPa_name::ID_COMMON_PURPLE_HIT, &field_0x6a8, &temp9);
                 fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_REBOUND, mtrlSndId);
@@ -910,7 +910,7 @@ BOOL daArrow_c::procReturn() {
         cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinChk);
         f32 temp2 = speed.abs();
         cXyz temp1;
-        C_VECReflect(&speed, &triPla->mNormal, &temp1);
+        C_VECReflect(&speed, triPla->GetNP(), &temp1);
         speed.x = temp1.x*temp2*0.5f;
         speed.y = temp1.y*temp2*0.5f;
         speed.z = temp1.z*temp2*0.5f;
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index 78a62244..a4feea62 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -494,8 +494,7 @@ static void daBk_shadowDraw(bk_class* i_this) {
         i_this->mShadowId = dComIfGd_setShadow(
             i_this->mShadowId, 1, model, &shadowPos, temp, shadowSize,
             i_this->current.pos.y, i_this->dr.mAcch.GetGroundH(),
-            i_this->dr.mAcch.m_gnd, &i_this->tevStr,
-            0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
+            i_this->dr.mAcch.m_gnd, &i_this->tevStr
         );
     }
     
diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc
index 132394e2..de75e1c9 100644
--- a/src/d/actor/d_a_bomb3.inc
+++ b/src/d/actor/d_a_bomb3.inc
@@ -203,7 +203,7 @@ BOOL daBomb_c::draw() {
     if(fopAcM_GetModel(this) == 0 && mAcch.GetGroundH() != -1.0e9f) {
         cM3dGPla* pNormal = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd);
         if(pNormal) {
-            dComIfGd_setSimpleShadow(&current.pos, mAcch.GetGroundH(), 25.0f, &pNormal->mNormal, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
+            dComIfGd_setSimpleShadow(&current.pos, mAcch.GetGroundH(), 25.0f, pNormal->GetNP());
         }
     }
 
@@ -472,17 +472,17 @@ void daBomb_c::posMoveF() {
             f32 temp2;
             cXyz* norm;
             if(tri) {
-                norm = &tri->mNormal;
+                norm = tri->GetNP();
                 mag = 0.06f;
                 temp2 = cM_scos(0xA4F);
             }
             else {
-                norm = 0;
+                norm = NULL;
                 mag = 0.0f;
                 temp2 = 0.0f;
             }
 
-            daObj::posMoveF_grade(this, mStts.GetCCMoveP(), &mWindVec, 0.002f, 0.0005f, norm, mag, temp2, 0);
+            daObj::posMoveF_grade(this, mStts.GetCCMoveP(), &mWindVec, 0.002f, 0.0005f, norm, mag, temp2, NULL);
         }
         else {
             fopAcM_posMoveF(this, mStts.GetCCMoveP());
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 463ec2db..4dfdfadd 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -1103,7 +1103,7 @@ void daItem_c::checkWall() {
     }
     
     cM3dGPla* wallPlane = dComIfG_Bgsp()->GetTriPla(mAcchCir);
-    cXyz wallNorm = wallPlane->mNormal;
+    cXyz wallNorm = *wallPlane->GetNP();
     
     cXyz vel;
     vel.x = speedF * cM_ssin(current.angle.y);
diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
index 12faa0d0..b7b3774a 100644
--- a/src/d/actor/d_a_itembase.cpp
+++ b/src/d/actor/d_a_itembase.cpp
@@ -188,14 +188,12 @@ void daItemBase_c::setShadow() {
     f32 shadowSize = scale.x * dItem_data::getShadowSize(m_itemNo);
     if (!dItem_data::chkFlag(m_itemNo, 0x10)) {
         dComIfGd_setSimpleShadow2(
-            &current.pos, mAcch.GetGroundH(), shadowSize, mAcch.m_gnd,
-            0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
+            &current.pos, mAcch.GetGroundH(), shadowSize, mAcch.m_gnd
         );
     } else {
         mShadowId = dComIfGd_setShadow(
             mShadowId, 1, mpModel, &current.pos, 80.0f, shadowSize,
-            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
-            0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
+            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr
         );
     }
 }
diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index 77af7bd5..fcad0704 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -460,7 +460,7 @@ BOOL daMbdoor_actionWait(daMbdoor_c* i_this) {
 BOOL daMbdoor_actionLockWait(daMbdoor_c* i_this) {
     if (i_this->checkUnlock()) {
         i_this->setAction(2);
-        fopAcM_orderOtherEvent2(i_this, "MBDOOR_STOP_OPEN", 1);
+        fopAcM_orderOtherEvent(i_this, "MBDOOR_STOP_OPEN");
     }
     return TRUE;
 }
@@ -472,7 +472,7 @@ BOOL daMbdoor_actionLockOff(daMbdoor_c* i_this) {
         i_this->demoProc();
         i_this->setAction(3);
     } else {
-        fopAcM_orderOtherEvent2(i_this, "MBDOOR_STOP_OPEN", 1);
+        fopAcM_orderOtherEvent(i_this, "MBDOOR_STOP_OPEN");
     }
     return TRUE;
 }
diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp
index 7ec60a00..a096f9a2 100644
--- a/src/d/actor/d_a_npc_bs1.cpp
+++ b/src/d/actor/d_a_npc_bs1.cpp
@@ -2103,9 +2103,10 @@ BOOL daNpc_Bs1_c::_draw() {
     mBtpAnm.remove(pModelData);
     
     cXyz shadowPos(current.pos.x, current.pos.y + 150.0f, current.pos.z);
-    m29C = dComIfGd_setShadow(m29C, 1, mpMorf->getModel(), &shadowPos, 800.0f, 20.0f, current.pos.y,
-                              mAcch.GetGroundH(), mAcch.m_gnd, &tevStr, 0, 1.0f,
-                              &dDlst_shadowControl_c::mSimpleTexObj);
+    m29C = dComIfGd_setShadow(
+        m29C, 1, mpMorf->getModel(), &shadowPos, 800.0f, 20.0f,
+        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr
+    );
     
     if (mShopItems.mSelectedItemIdx >= 0) {
         mpShopCursor->draw();
diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp
index c254ab39..0400849b 100644
--- a/src/d/actor/d_a_npc_btsw2.cpp
+++ b/src/d/actor/d_a_npc_btsw2.cpp
@@ -678,8 +678,7 @@ BOOL daNpc_Btsw2_c::_draw() {
     cXyz shadowPos(current.pos.x, current.pos.y + 130.0f, current.pos.z);
     mShadowId = dComIfGd_setShadow(
         mShadowId, 1, mpMorf->getModel(), &shadowPos, 800.0f, 20.0f,
-        current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr,
-        0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
+        current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr
     );
     
     dSnap_RegistFig(DSNAP_TYPE_BTSW, this, current.pos, current.angle.y, 1.0f, 1.0f, 1.0f);
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 1b5e5f27..df64c628 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -3225,7 +3225,10 @@ BOOL daNpc_Ji1_c::_draw() {
         field_0x3FC.entry(field_0x3F8->getModelData(), (s16)field_0x414);
         mDoExt_modelUpdateDL(field_0x3F8);
         cXyz temp(current.pos.x, current.pos.y + 150.0f, current.pos.z);
-        field_0x3F0 = dComIfGd_setShadow(field_0x3F0, 1, field_0x330->getModel(), &temp, 800.0f, 20.0f, current.pos.y, field_0x434.GetGroundH(), field_0x434.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
+        field_0x3F0 = dComIfGd_setShadow(
+            field_0x3F0, 1, field_0x330->getModel(), &temp, 800.0f, 20.0f,
+            current.pos.y, field_0x434.GetGroundH(), field_0x434.m_gnd, &tevStr
+        );
         if(field_0x3F0 != 0 && field_0xD84 != 0) {
             dComIfGd_addRealShadow(field_0x3F0, mpMorf->getModel());
         }
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index 6118eb9c..28a51ef9 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -1401,8 +1401,7 @@ BOOL daNpc_kam_c::draw() {
     cXyz shadowPos(current.pos.x, current.pos.y, current.pos.z);
     mShadowId = dComIfGd_setShadow(
         mShadowId, 1, model, &shadowPos, 800.0f, 20.0f,
-        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
-        0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
+        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr
     );
     
     dSnap_RegistFig(DSNAP_TYPE_KAMOME, this, 1.0f, 1.0f, 1.0f);
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index f491dd25..1285b5e4 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -2967,8 +2967,7 @@ BOOL daNpc_Md_c::draw() {
         cXyz shadowPos(current.pos.x, current.pos.y + 150.0f, current.pos.z);
         mShadowId = dComIfGd_setShadow(
             mShadowId, 0, mpMorf->getModel(), &shadowPos, 800.0f, 20.0f,
-            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
-            0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
+            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr
         );
         
         if (mShadowId != 0) {
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index ebe0727a..c8476e2e 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -2031,8 +2031,7 @@ BOOL daNpc_Os_c::draw() {
 
         mShadowId = dComIfGd_setShadow(
             mShadowId, 0, pModel, &shadowPos, 800.0f, 20.0f,
-            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
-            0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
+            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr
         );
     }
 
diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp
index a3d1afa8..bf581021 100644
--- a/src/d/actor/d_a_obj_hole.cpp
+++ b/src/d/actor/d_a_obj_hole.cpp
@@ -140,7 +140,7 @@ void daObj_Hole_c::modeEvent() {
         }
     }
     else {
-        fopAcM_orderOtherEvent2(this, "DEFAULT_PITFALL", 1);
+        fopAcM_orderOtherEvent(this, "DEFAULT_PITFALL");
     }
 }
 
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 17705287..6ab83f94 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -1940,7 +1940,7 @@ namespace daObjMovebox {
             f32 groundH = mBgc.mGroundY[temp];
             cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(Bgc_c::M_gnd_work[temp]);
             if (triPla && groundH != -1000000000.0f) {
-                dComIfGd_setSimpleShadow(&current.pos, groundH, i_attr()->m10, &triPla->mNormal, shape_angle.y, 1.0f, NULL);
+                dComIfGd_setSimpleShadow(&current.pos, groundH, i_attr()->m10, triPla->GetNP(), shape_angle.y, 1.0f, NULL);
             }
         }
         
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 7b263ba6..187119ae 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -525,7 +525,7 @@ void daObjTpost_c::eventOrder() {
         }
     }
     else if(field_0x8F7 >= 3) {
-        fopAcM_orderOtherEvent2(this, a_demo_name_tbl[field_0x8F7 - 3], 1, 0x14F);
+        fopAcM_orderOtherEvent(this, a_demo_name_tbl[field_0x8F7 - 3], 0x14F);
     }
 }
 
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index ab1cf235..1e599741 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -951,7 +951,7 @@ void daRd_c::modeCryInit() {
     if (dComIfGp_evmng_startCheck("DEFAULT_RD_CRY")) {
         dComIfGp_event_reset();
     }
-    fopAcM_orderOtherEvent2(this, "DEFAULT_RD_CRY", 1);
+    fopAcM_orderOtherEvent(this, "DEFAULT_RD_CRY");
     fopAcM_monsSeStart(this, JA_SE_CV_RD_SCREAM, 0);
     mTimer1 = l_HIO.m54;
     mBreakFreeCounter = l_HIO.m78;
@@ -1142,7 +1142,7 @@ void daRd_c::modeAttack() {
             modeProcInit(MODE_CRY_WAIT);
         }
     } else if (!checkTgHit()) {
-        fopAcM_orderOtherEvent2(this, "DEFAULT_RD_ATTACK", 1, 0x1CF);
+        fopAcM_orderOtherEvent(this, "DEFAULT_RD_ATTACK", 0x1CF);
     }
 }
 
@@ -1740,8 +1740,7 @@ bool daRd_c::_draw() {
     cXyz shadowPos(current.pos.x, current.pos.y + 150.0f, current.pos.z);
     mShadowId = dComIfGd_setShadow(
         mShadowId, 1, mpMorf->getModel(), &shadowPos, 800.0f, 40.0f,
-        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
-        0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
+        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr
     );
     
     dSnap_RegistFig(DSNAP_TYPE_RD, this, 1.0f, 1.0f, 1.0f);
diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp
index 0e268126..f50181c1 100644
--- a/src/d/actor/d_a_tag_ghostship.cpp
+++ b/src/d/actor/d_a_tag_ghostship.cpp
@@ -62,7 +62,7 @@ void daTag_Gship_c::modeClearEvent() {
         }
     }
     else {
-        fopAcM_orderOtherEvent2(this, "PSHIP_CLEAR", 1);
+        fopAcM_orderOtherEvent(this, "PSHIP_CLEAR");
     }
 }
 
diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp
index d5574f28..4388074a 100644
--- a/src/d/actor/d_a_tag_volcano.cpp
+++ b/src/d/actor/d_a_tag_volcano.cpp
@@ -152,14 +152,14 @@ bool daTagvolcano::Act_c::_execute() {
                     dComIfG_TimerDeleteRequest();
 
                 field_0x2a4 = 1;
-                fopAcM_orderOtherEvent(this, "TAG_VOLCANO", dEvtFlag_NOPARTNER_e);
+                fopAcM_orderOtherEvent(this, "TAG_VOLCANO");
             }
 #if VERSION != VERSION_JPN
         } else {
             mDoAud_seStart(JA_SE_ISLE_TIMER_0);
             dComIfGp_getVibration().StartShock(6, -33, cXyz(0.0f, 1.0f, 0.0f));
             field_0x2a4 = 1;
-            fopAcM_orderOtherEvent(this, "TAG_VOLCANO", dEvtFlag_NOPARTNER_e);
+            fopAcM_orderOtherEvent(this, "TAG_VOLCANO");
 #endif
         }
 
@@ -171,7 +171,7 @@ bool daTagvolcano::Act_c::_execute() {
                     dComIfGp_setNextStage("sea", 2, 40);
                 }
             } else {
-                fopAcM_orderOtherEvent(this, "TAG_VOLCANO", dEvtFlag_NOPARTNER_e);
+                fopAcM_orderOtherEvent(this, "TAG_VOLCANO");
             }
         }
     }
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index a0a6848a..aab8063d 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -1066,7 +1066,7 @@ BOOL daTbox_c::actionSwOnWait() {
     }
     else {
         if (dComIfGs_isSwitch(getSwNo(), mRoomNo)) {
-            fopAcM_orderOtherEvent2(this, "DEFAULT_TREASURE_APPEAR", 1);
+            fopAcM_orderOtherEvent(this, "DEFAULT_TREASURE_APPEAR");
             eventInfo.onCondition(dEvtCnd_UNK2_e);
         }
     }
@@ -1098,7 +1098,7 @@ BOOL daTbox_c::actionGenocide() {
                 mGenocideDelayTimer--;
             }
             else {
-                fopAcM_orderOtherEvent2(this, "DEFAULT_TREASURE_APPEAR", 1);
+                fopAcM_orderOtherEvent(this, "DEFAULT_TREASURE_APPEAR");
                 eventInfo.onCondition(dEvtCnd_UNK2_e);
 
                 dComIfGs_onSwitch(getSwNo(), mRoomNo);
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 6a50d620..697650ea 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -562,8 +562,7 @@ int dComIfGd_setSimpleShadow2(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyIn
         cM3dGPla* plane_p =
             dComIfG_Bgsp()->GetTriPla(i_floorPoly);
 
-        return dComIfGd_setSimpleShadow(i_pos, param_1, param_2, &plane_p->mNormal, i_angle,
-                                        param_5, i_tex);
+        return dComIfGd_setSimpleShadow(i_pos, param_1, param_2, plane_p->GetNP(), i_angle, param_5, i_tex);
     } else {
         return 0;
     }
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp
index e0bf69bc..f069a93f 100644
--- a/src/d/d_event_manager.cpp
+++ b/src/d/d_event_manager.cpp
@@ -593,7 +593,7 @@ void dEvent_manager_c::exceptionProc() {
             if (strcmp(eventName, "look_tetra") == 0)
                 dComIfGs_onEventBit(0x0280);
         } else {
-            fopAcM_orderOtherEvent2(NULL, (char*)eventName, dEvtFlag_NOPARTNER_e);
+            fopAcM_orderOtherEvent(NULL, (char*)eventName);
         }
         break;
     case 2: