d_a_e_zm matching (#2638)

* initial work

* a little more work

* matching

* pr cleanup

* changed 'subtype' to 'argument'

* fixed debug error

src/d/actor/d_a_L7op_demo_dr.cpp

@@ -707,7 +707,7 @@ void daL7ODR_c::dr_fly() {
             if (7.0f == mpModelMorf->getFrame() || 37.0f == mpModelMorf->getFrame()) {
                 mSound.startCreatureSound(Z2SE_EN_DR_WING, 0, -1);
             } else if (62.0f == mpModelMorf->getFrame()) {
-                subtype = 1;
+                argument = 1;
             }
 
             if (mpModelMorf->isStop()) {

src/d/actor/d_a_alink_guard.inc

@@ -311,7 +311,7 @@ int daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) {
     mProcVar4.field_0x3010 = 0;
     mProcVar5.field_0x3012 = 0;
 
-    if (param_1 != NULL && param_1->GetTgHitAc() != NULL && fopAcM_GetName(param_1->GetTgHitAc()) == PROC_E_MM_MT && param_1->GetTgHitAc()->subtype == 1) {
+    if (param_1 != NULL && param_1->GetTgHitAc() != NULL && fopAcM_GetName(param_1->GetTgHitAc()) == PROC_E_MM_MT && param_1->GetTgHitAc()->argument == 1) {
         if (checkBootsOrArmorHeavy()) {
             mNormalSpeed = daAlinkHIO_guard_c0::m.mMagneHvyGuardSpeed;
             mProcVar5.field_0x3012 = 1;

src/d/actor/d_a_b_dr.cpp

@@ -3927,7 +3927,7 @@ int daB_DR_c::execute() {
     if (arg0 == 0xFF) {
         if (parentActorID != 0 && health > 1 && cLib_calcTimer<int>(&mTimer[0]) == 0) {
             fopAc_ac_c* parent;
-            if (fopAcM_SearchByID(parentActorID, &parent) != 0 && parent != NULL && parent->subtype != 1) {
+            if (fopAcM_SearchByID(parentActorID, &parent) != 0 && parent != NULL && parent->argument != 1) {
                 if (dComIfGs_isZoneSwitch(20, fopAcM_GetRoomNo(this))) {
                     dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
                 }
@@ -3965,7 +3965,7 @@ int daB_DR_c::execute() {
                 current.angle = parent->current.angle;
                 shape_angle = parent->shape_angle;
 
-                if (parent->subtype == 1 && field_0x7e0 < 54) {
+                if (parent->argument == 1 && field_0x7e0 < 54) {
                     if (mAnm != ANM_DR_BURU) {
                         setBck(ANM_DR_BURU, 0, 0.0f, 1.0f);
                         mpModelMorf->setStartFrame(111.0f);

src/d/actor/d_a_b_dre.cpp

@@ -336,7 +336,7 @@ void daB_DRE_c::DrAction2() {
         break;
     case 2:
         if (mpModelMorf->checkFrame(110.0f)) {
-            subtype = 1;
+            argument = 1;
             mBlurRate = 150.0f;
             mTimers[0] = 100;
             mHideParts = true;

src/d/actor/d_a_demo00.cpp

@@ -1352,7 +1352,7 @@ int daDemo00_c::execute() {
 
     if (actor == NULL) {
         fopAcM_delete(this);
-        OS_REPORT("汎用くん<dactor%d>削除！！\n", subtype);
+        OS_REPORT("汎用くん<dactor%d>削除！！\n", argument);
     } else {
         if (actor->checkEnable(dDemo_actor_c::ENABLE_SHAPE_e)) {
             mModel.field_0x0.mShapeID = actor->getShapeId();

src/d/actor/d_a_door_mbossL1.cpp

@@ -17,7 +17,7 @@
 
 /* 80672838-80672844 000078 000C+00 15/15 0/0 0/0 .text            getNowLevel__FP10fopAc_ac_c */
 static int getNowLevel(fopAc_ac_c* i_this) {
-    return static_cast<daMBdoorL1_c*>(i_this)->subtype;
+    return static_cast<daMBdoorL1_c*>(i_this)->argument;
 }
 
 /* 80672844-80672894 000084 0050+00 1/1 0/0 0/0 .text            searchStop__FPvPv */

src/d/actor/d_a_kytag01.cpp

@@ -119,12 +119,12 @@ static int daKytag01_Execute(kytag01_class* i_this) {
     camera_class* camera = dComIfGp_getCamera(0);
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
-    if ((a_this->subtype & 0xFF) == 2) {
+    if ((a_this->argument & 0xFF) == 2) {
         if (i_this->mStartPoint == dComIfGs_getStartPoint()) {
             i_this->mStartPoint = 0xFF;
             dKy_change_colpat(i_this->field_0x59e);
         }
-    } else if ((a_this->subtype & 0xFF) == 0) {
+    } else if ((a_this->argument & 0xFF) == 0) {
         if (a_this->home.roomNo == dComIfGp_roomControl_getStayNo()) {
             if (i_this->mSwNo1 != 0xFF) {
                 if (dComIfGs_isSwitch(i_this->mSwNo1, a_this->home.roomNo)) {
@@ -178,7 +178,7 @@ static int daKytag01_Create(fopAc_ac_c* i_this) {
     kytag01_class* a_this = (kytag01_class*)i_this;
     fopAcM_SetupActor(i_this, kytag01_class);
 
-    if ((a_this->subtype & 0xFF) == 2) {
+    if ((a_this->argument & 0xFF) == 2) {
         a_this->mNamiInnerRange = i_this->scale.x * 100.0f;
         a_this->field_0x59d = fopAcM_GetParam(i_this);
         a_this->mStartPoint = fopAcM_GetParam(i_this) >> 8;
@@ -197,7 +197,7 @@ static int daKytag01_Create(fopAc_ac_c* i_this) {
         a_this->mSwNo2 = (i_this->current.angle.x >> 8) & 0xFF;
         a_this->field_0x594 = 0.0f;
 
-        if ((a_this->subtype & 0xFF) == 0) {
+        if ((a_this->argument & 0xFF) == 0) {
             if (a_this->mNamiSize == 255.0f) {
                 a_this->mNamiSize = 10.0f;
             }

src/d/actor/d_a_no_chg_room.cpp

@@ -67,7 +67,7 @@ int daNocrm_c::execute() {
 
     if (sp14.y < 0.0f || sp14.y > scale.y || fabsf(sp14.x) > scale.x || fabsf(sp14.z) > scale.z)
     {
-        if (subtype == 0 || !mRoomLoading ||
+        if (argument == 0 || !mRoomLoading ||
             dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 0)
         {
             return 1;
@@ -87,7 +87,7 @@ int daNocrm_c::execute() {
                                                              player_p->shape_angle.y, 1);
     }
 
-    if (subtype == 0) {
+    if (argument == 0) {
         dStage_roomControl_c::setRoomReadId(getReadRoomId());
     } else {
         dStage_roomControl_c::onNoChangeRoom();
@@ -119,7 +119,7 @@ int daNocrm_c::getRoomNo(int param_0) {
 }
 
 int daNocrm_c::create() {
-    if (subtype == 0 && getReadRoomId() < 0) {
+    if (argument == 0 && getReadRoomId() < 0) {
         // "Room Load Rectangle: Load ID is -1, so destroy self!\n"
         OSReport_Warning("部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n");
         return cPhs_ERROR_e;

src/d/actor/d_a_npc_zra.cpp

@@ -1570,7 +1570,7 @@ void daNpc_zrA_c::drawOtherMdls() {
 
 /* 80B7C44C-80B7C4B4 00402C 0068+00 2/1 0/0 0/0 .text getTypeFromArgument__11daNpc_zrA_cFv */
 daNpc_zrA_c::Type daNpc_zrA_c::getTypeFromArgument() {
-    switch (subtype) {
+    switch (argument) {
     case 0:
         return TYPE_WAIT;
     case 1:

src/d/actor/d_a_obj_zra_freeze.cpp

@@ -93,7 +93,7 @@ int daZraFreeze_c::CreateHeap() {
         "zrA_pain_TW.bmd",
         "zrA_sol_TW.bmd",
     };
-    J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName[subtype]);
+    J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName[argument]);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
     if (mpModel == NULL) {
         return 0;

src/d/actor/d_a_swhit0.cpp

@@ -138,7 +138,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
 int daSwhit0_c::create() {
     fopAcM_SetupActor(this, daSwhit0_c);
 
-    if (subtype != 0) {
+    if (argument != 0) {
         setDrawMtx();
         cMtx_copy(mDoMtx_stack_c::get(), field_0x5a8);
         fopAcM_SetMtx(this, field_0x5a8);
@@ -438,7 +438,7 @@ int daSwhit0_c::draw() {
 
 /* 80487138-80487228 0011B8 00F0+00 1/0 0/0 0/0 .text            daSwhit0_Draw__FP10daSwhit0_c */
 static int daSwhit0_Draw(daSwhit0_c* i_this) {
-    if (i_this->subtype != 0) {
+    if (i_this->argument != 0) {
         return 1;
     }
 
@@ -487,7 +487,7 @@ static int daSwhit0_Execute(daSwhit0_c* i_this) {
 
 /* 804872E4-8048732C 001364 0048+00 1/0 0/0 0/0 .text            daSwhit0_Delete__FP10daSwhit0_c */
 static int daSwhit0_Delete(daSwhit0_c* i_this) {
-    if (i_this->subtype == 0) {
+    if (i_this->argument == 0) {
         dComIfG_resDelete(i_this, l_arcName);
     }