Misc matches (#2845)

* Misc debug matches

* Fix d_map weak function order

* Remove old nonmatching comments

* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment

* More misc matches

22 files changed, 77 insertions, 72 deletions

diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp
index 1afcdf5294..f1932d9926 100644
--- a/src/d/actor/d_a_e_rdy.cpp
+++ b/src/d/actor/d_a_e_rdy.cpp
@@ -239,7 +239,7 @@ daE_RDY_HIO_c::daE_RDY_HIO_c() {
 }
 
 void daE_RDY_HIO_c::genMessage(JORMContext* context) {
-    // NONMATCHING
+    // DEBUG NONMATCHING
 }
 
 /* 8076BE80-8076BF6C 0001A0 00EC+00 23/23 0/0 0/0 .text            anm_init__FP11e_rdy_classifUcf */
diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp
index b06bc75023..990a21b42e 100644
--- a/src/d/actor/d_a_e_ymb.cpp
+++ b/src/d/actor/d_a_e_ymb.cpp
@@ -2946,7 +2946,6 @@ void daE_YMB_c::getBellyBitePos(cXyz* i_pos) {
 
 /* 80820128-808203D8 00A108 02B0+00 2/2 0/0 0/0 .text            getDownLockPoint__9daE_YMB_cFv */
 int daE_YMB_c::getDownLockPoint() {
-    // NONMATCHING
     if (field_0x6f4 >= 7) {
         return 1;
     }
diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp
index 28cba5a79b..2ef046bede 100644
--- a/src/d/actor/d_a_mg_fish.cpp
+++ b/src/d/actor/d_a_mg_fish.cpp
@@ -2651,7 +2651,6 @@ static void mf_aqua(mg_fish_class* i_this) {
 
 
 /* 80531CD4-805322E0 008094 060C+00 1/1 0/0 0/0 .text            ri_aqua__FP13mg_fish_class */
-// NONMATCHING - equivalent, but missing fmr instruction
 static void ri_aqua(mg_fish_class* i_this) {
     // Two different vectors in Debug, but this messes up the stack for GZ2E01.
     // cXyz commonXyz2;
diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp
index a8d516a043..4312f6ffe1 100644
--- a/src/d/actor/d_a_npc_bou.cpp
+++ b/src/d/actor/d_a_npc_bou.cpp
@@ -1593,7 +1593,6 @@ int daNpc_Bou_c::talkwithJagar(void* param_0) {
 
 /* 80970F9C-8097146C 0040FC 04D0+00 3/0 0/0 0/0 .text            talk__11daNpc_Bou_cFPv */
 int daNpc_Bou_c::talk(void* param_0) {
-    // NONMATCHING
     daNpc_Jagar_c* jagar_p = NULL;
     switch (mMode) {
         case 0:
diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp
index ed375e3a50..31b17c9eba 100644
--- a/src/d/actor/d_a_npc_doc.cpp
+++ b/src/d/actor/d_a_npc_doc.cpp
@@ -322,7 +322,8 @@ int daNpc_Doc_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
 
 /* 809A7628-809A7660 000A88 0038+00 1/1 0/0 0/0 .text            getType__11daNpc_Doc_cFv */
 int daNpc_Doc_c::getType() {
-    switch (fopAcM_GetParam(this) & 0xFF) {
+    u8 r31 = fopAcM_GetParam(this) & 0xFF;
+    switch (r31) {
     case 0:
         return 0;
     case 1:
diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp
index 3381654437..da3acb45bf 100644
--- a/src/d/actor/d_a_npc_moir.cpp
+++ b/src/d/actor/d_a_npc_moir.cpp
@@ -1096,7 +1096,6 @@ static daNpcMoiR_c::Action2Fn dummy_4854() {
 
 /* 80A7D934-80A7DD94 0018B4 0460+00 1/0 0/0 0/0 .text            wait_type0__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::wait_type0(void* param_1) {
-    // NONMATCHING
     switch (field_0xe08) {
         case 0:
             setExpression(EXPR_NONE, -1.0f);
@@ -1175,7 +1174,6 @@ void daNpcMoiR_c::setExpression(int i_expression, f32 i_morf) {
 
 /* 80A7DE04-80A7E668 001D84 0864+00 2/0 0/0 0/0 .text            wait_type1__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::wait_type1(void* param_1) {
-    // NONMATCHING
     f32 fVar1;
 
     switch (field_0xe08) {
@@ -1275,7 +1273,6 @@ bool daNpcMoiR_c::wait_type1(void* param_1) {
 
 /* 80A7E668-80A7E8C0 0025E8 0258+00 1/0 0/0 0/0 .text            wait_type2__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::wait_type2(void* param_1) {
-    // NONMATCHING
     switch (field_0xe08) {
         case 0:
             setExpression(EXPR_FH_TAKAJO_HI, -1.0f);
@@ -1421,7 +1418,6 @@ bool daNpcMoiR_c::talk(void* param_1) {
 
 /* 80A7EFBC-80A7F40C 002F3C 0450+00 2/0 0/0 0/0 .text            multiTalk__11daNpcMoiR_cFPv */
 BOOL daNpcMoiR_c::multiTalk(void* param_1) {
-    // NONMATCHING
     BOOL rv = FALSE;
     fopAc_ac_c* speakers[4] = {this, mActorMngr[1].getActorP(), mActorMngr[2].getActorP(), mActorMngr[3].getActorP()};
 
@@ -1479,7 +1475,6 @@ BOOL daNpcMoiR_c::multiTalk(void* param_1) {
 
 /* 80A7F40C-80A7F9AC 00338C 05A0+00 2/0 0/0 0/0 .text            fight__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::fight(void* param_1) {
-    // NONMATCHING
     f32 fVar1;
     int iVar1 = 1;
 
diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp
index c396aaae5b..b627d4f82f 100644
--- a/src/d/actor/d_a_npc_pachi_besu.cpp
+++ b/src/d/actor/d_a_npc_pachi_besu.cpp
@@ -1136,7 +1136,7 @@ BOOL daNpc_Pachi_Besu_c::talk(void* param_1) {
 
 #ifdef DEBUG
 BOOL daNpc_Pachi_Besu_c::test(void* param_1) {
-    // NONMATCHING
+    // DEBUG NONMATCHING
 }
 #endif
 
diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp
index 9b9fb82063..435103f5d4 100644
--- a/src/d/actor/d_a_npc_pachi_maro.cpp
+++ b/src/d/actor/d_a_npc_pachi_maro.cpp
@@ -1101,7 +1101,6 @@ BOOL daNpc_Pachi_Maro_c::setAction(actionFunc action) {
 
 /* 80A99604-80A9986C 001A64 0268+00 2/0 0/0 0/0 .text            wait__18daNpc_Pachi_Maro_cFPv */
 int daNpc_Pachi_Maro_c::wait(void* param_1) {
-    // NONMATCHING
     int unused = 0;
     
     switch (mMode) {
diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp
index 584785d355..1bff4d51b0 100644
--- a/src/d/actor/d_a_npc_tks.cpp
+++ b/src/d/actor/d_a_npc_tks.cpp
@@ -357,7 +357,6 @@ cPhs__Step daNpcTks_c::Create() {
 
 /* 80B14ED0-80B1521C 000990 034C+00 1/1 0/0 0/0 .text            CreateHeap__10daNpcTks_cFv */
 int daNpcTks_c::CreateHeap() {
-    // NONMATCHING
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_TKS);
 
     JUT_ASSERT(410, NULL != mdlData_p);
@@ -390,7 +389,9 @@ int daNpcTks_c::CreateHeap() {
     setMotion(MOT_WAIT_A, -1.0f, 0);
 
     if (mTksTsubo.mTsuboType < 2) {
-        mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(mTksTsubo.mTsuboType != 0 ? l_arcNames[2] : l_arcNames[1], 3));
+        const char* sp30 = mTksTsubo.mTsuboType != 0 ? l_arcNames[2] : l_arcNames[1];
+        int sp2C = mTksTsubo.mTsuboType != 0 ? 3 : 3;
+        mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(sp30, sp2C));
 
         JUT_ASSERT(453, NULL != mdlData_p);
         
@@ -589,7 +590,6 @@ void daNpcTks_c::setMotion(int i_motion, f32 i_morf, int param_3) {
 
 /* 80B1C4F8-80B1CB4C 007FB8 0654+00 1/0 0/0 0/0 .text            main__10daNpcTks_cFv */
 BOOL daNpcTks_c::main() {
-    // NONMATCHING
     if (field_0x138a && mTksTsubo.mCyl.ChkTgHit()) {
         if (mTksTsubo.mCyl.GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) {
             setAction(&daNpcTks_c::damage);
@@ -783,8 +783,8 @@ BOOL daNpcTks_c::setAction(actionFunc action) {
 
 int daNpcTks_c::getPlayerArea() {
     f32 fVar3, fVar2, fVar1;
-    fVar1 = pow(daNpcTks_Param_c::m.area_a_dist, 2.0);
-    fVar2 = pow(daNpcTks_Param_c::m.area_b_dist, 2.0);
+    fVar1 = std::pow(daNpcTks_Param_c::m.area_a_dist, 2.0f);
+    fVar2 = std::pow(daNpcTks_Param_c::m.area_b_dist, 2.0f);
     fVar3 = fopAcM_searchPlayerDistanceXZ2(this);
 
     if (fVar3 > 0.0f && fVar3 <= fVar2) {
@@ -913,21 +913,23 @@ void daNpcTks_c::lookat() {
 }
 
 void daNpcTks_c::playTsuboAnm() {
-    if (mTksTsubo.field_0x586 != 0) {
-        if ((mAnmFlags & ANM_PLAY_MORF) != 0) {
-            f32 playSpeed = mTksTsubo.mpModelMorf->getPlaySpeed();
+    if (mTksTsubo.field_0x586 == 0) {
+        return;
+    }
 
-            if ((mTksTsubo.mAnmFlags & ANM_PAUSE_MORF) != 0) {
-                mTksTsubo.mpModelMorf->setPlaySpeed(0.0f);
-                mTksTsubo.mpModelMorf->play(0, 0);
-                mTksTsubo.mpModelMorf->setPlaySpeed(playSpeed);
-            } else {
-                mTksTsubo.mpModelMorf->play(0, 0);
-            }
-        }
+    if ((mAnmFlags & ANM_PLAY_MORF) != 0) {
+        f32 playSpeed = mTksTsubo.mpModelMorf->getPlaySpeed();
 
-        mTksTsubo.mAnmFlags &= 0xFFFFEF38;
+        if ((mTksTsubo.mAnmFlags & ANM_PAUSE_MORF) != 0) {
+            mTksTsubo.mpModelMorf->setPlaySpeed(0.0f);
+            mTksTsubo.mpModelMorf->play(0, 0);
+            mTksTsubo.mpModelMorf->setPlaySpeed(playSpeed);
+        } else {
+            mTksTsubo.mpModelMorf->play(0, 0);
+        }
     }
+
+    mTksTsubo.mAnmFlags &= 0xFFFFEF38;
 };
 
 BOOL daNpcTks_c::checkFindPlayer() {
diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp
index 134df546f1..ef49ffc703 100644
--- a/src/d/actor/d_a_npc_ykw.cpp
+++ b/src/d/actor/d_a_npc_ykw.cpp
@@ -15,6 +15,7 @@
 #include "d/d_debug_viewer.h"
 #include "d/d_meter2_info.h"
 #include "d/d_timer.h"
+#include "d/d_tresure.h"
 #include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_ext.h"
 
diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp
index 066df7b26c..0fe1ea5c2a 100644
--- a/src/d/actor/d_a_npc_zrz.cpp
+++ b/src/d/actor/d_a_npc_zrz.cpp
@@ -179,7 +179,6 @@ daNpc_zrZ_c::EventFn daNpc_zrZ_c::mEvtCutList[8] = {
 };
 
 /* 80B93DCC-80B93F84 0000EC 01B8+00 1/1 0/0 0/0 .text            __ct__11daNpc_zrZ_cFv */
-// NONMATCHING inlining
 daNpc_zrZ_c::daNpc_zrZ_c() {
     /* empty function */
 }
@@ -1308,7 +1307,6 @@ void daNpc_zrZ_c::lightPowerCalc(int param_0) {
 }
 
 /* 80B972EC-80B974BC 00360C 01D0+00 1/1 0/0 0/0 .text            lightColorProc__11daNpc_zrZ_cFv */
-// NONMATCHING regalloc
 void daNpc_zrZ_c::lightColorProc() {
     static int const key_frame[4] = {
         0, 50, 190, 220,
diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp
index 6140d13e4a..4c22994727 100644
--- a/src/d/actor/d_a_obj_cwall.cpp
+++ b/src/d/actor/d_a_obj_cwall.cpp
@@ -14,8 +14,6 @@
 #include "d/d_com_inf_game.h"
 #include "cmath.h"
 
-// NONMATCHING - getRightHandPos is not generated at the end of the TU 
-
 /* 80BD6A4C-80BD6A88 0000EC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjCwall_cFv */
 void daObjCwall_c::initBaseMtx() {
     mWallModel->setBaseScale(scale);
diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp
index 6af9aaeca7..8bc2a60e8b 100644
--- a/src/d/actor/d_a_obj_hb.cpp
+++ b/src/d/actor/d_a_obj_hb.cpp
@@ -655,7 +655,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
 
 /* 80C1B1F4-80C1B4E8 001CB4 02F4+00 1/0 0/0 0/0 .text            daOBJ_HB_Create__FP10fopAc_ac_c */
 static cPhs__Step daOBJ_HB_Create(fopAc_ac_c* a_this) {
-    // NONMATCHING
     fopAcM_ct(a_this, obj_hb_class);
     obj_hb_class* i_this = (obj_hb_class*)a_this;
 
diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp
index 412523f027..4a264cedd0 100644
--- a/src/d/actor/d_a_obj_ice_l.cpp
+++ b/src/d/actor/d_a_obj_ice_l.cpp
@@ -216,7 +216,6 @@ int daObjIce_l_c::Create() {
 
 /* 80C203C4-80C206AC 000A44 02E8+00 1/0 0/0 0/0 .text            Execute__12daObjIce_l_cFPPA3_A4_f
  */
-// NONMATCHING
 int daObjIce_l_c::Execute(Mtx** param_0) {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     cXyz& pos = fopAcM_GetPosition(player_p);
diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp
index eb44abe2a1..165a02cf12 100644
--- a/src/d/actor/d_a_obj_ice_s.cpp
+++ b/src/d/actor/d_a_obj_ice_s.cpp
@@ -106,13 +106,12 @@ void daObjIce_s_c::setBaseMtx() {
 
 /* 80C20F48-80C21234 000688 02EC+00 1/1 0/0 0/0 .text
  * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
- // NONMATCHING
- // reg alloc
+// NONMATCHING - regalloc, equivalent
 static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) {
     (void)param_1;
     daObjIce_s_c* ice = (daObjIce_s_c*)param_2;
     daPy_py_c* player = daPy_getPlayerActorClass();
-    cXyz& playerPos = fopAcM_GetPosition(player);
+    cXyz* playerPos = &fopAcM_GetPosition(player);
     cXyz* pBallCenter = player->getIronBallCenterPos();
 
     // !@bug misplaced ! operator. This condition is probably always false
@@ -122,10 +121,10 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3
         ice->field_0x5ac = 0x500;
     } else {
         ice->field_0x5a4 = -1.3f;
-        ice->Check_LinkRideOn(playerPos);
+        ice->Check_LinkRideOn(*playerPos);
     }
 
-    cXyz* icePos = &fopAcM_GetPosition(param_2);
+    cXyz* icePos = (cXyz*)&fopAcM_GetPosition(param_2);
     if (pBallCenter != NULL && icePos != NULL && icePos->absXZ(*pBallCenter) < ice->field_0x5c8.x * 600.0f) {
         ice->field_0x5d8 = 0x300;
         ice->field_0x5a4 = -11.0f;
@@ -136,7 +135,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3
         ice->field_0x5d8 = 0x300;
         ice->field_0x5a4 = -11.0f;
         ice->field_0x5ac = 0x1000;
-        ice->Check_RideOn(playerPos);
+        ice->Check_RideOn(*playerPos);
     }
     if (ice->field_0x5c5 == 0xff &&
         fopAcM_GetName(param_3) == PROC_ALINK)
@@ -144,7 +143,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3
         ice->field_0x5d8 = 0x300;
         ice->field_0x5a4 = -11.0f;
         ice->field_0x5ac = 0x1000;
-        ice->Check_RideOn(playerPos);
+        ice->Check_RideOn(*playerPos);
     }
 }
 
diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp
index 1f8cccff46..22b0d8988c 100644
--- a/src/d/actor/d_a_obj_lv6SzGate.cpp
+++ b/src/d/actor/d_a_obj_lv6SzGate.cpp
@@ -25,7 +25,7 @@ daLv6SzGate_HIO_c::daLv6SzGate_HIO_c() {
 }
 
 void daLv6SzGate_HIO_c::genMessage(JORMContext* arg) {
-    // NONMATCHING
+    // DEBUG NONMATCHING
 }
 
 /* 80C75900-80C75A54 000180 0154+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv6SzGate_cFv */
diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp
index 6db7d96ada..260ba1825d 100644
--- a/src/d/actor/d_a_obj_lv7bridge.cpp
+++ b/src/d/actor/d_a_obj_lv7bridge.cpp
@@ -26,7 +26,7 @@ daObjLv7Brg_HIO_c::daObjLv7Brg_HIO_c() {
 }
 
 void daObjLv7Brg_HIO_c::genMessage(JORMContext* ctx) {
-    // NONMATCHING
+    // DEBUG NONMATCHING
 }
 
 static daObjLv7Brg_HIO_c l_HIO;
diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp
index ca7c694628..4cc0b70ce7 100644
--- a/src/d/actor/d_a_obj_mirror_6pole.cpp
+++ b/src/d/actor/d_a_obj_mirror_6pole.cpp
@@ -7,22 +7,42 @@
 
 #include "d/actor/d_a_obj_mirror_6pole.h"
 #include "d/d_procname.h"
-
-/* 80C95E18-80C95E2C 000078 0014+00 1/0 0/0 0/0 .text            initWait__18daObjMirror6Pole_cFv */
-void daObjMirror6Pole_c::initWait() {
-    mpBck->setPlaySpeed(0.0f);
-}
+#include "f_op/f_op_actor_mng.h"
 
 /* 80C9654C-80C96550 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "MR-6Pole";
 
 /* 80C96580-80C965B0 000054 0030+00 3/4 0/0 0/0 .data            ActionTable__18daObjMirror6Pole_c
  */
-actionFunc daObjMirror6Pole_c::ActionTable[][2] = {
+const actionFunc daObjMirror6Pole_c::ActionTable[][2] = {
     {&daObjMirror6Pole_c::initWait, &daObjMirror6Pole_c::executeWait},
     {&daObjMirror6Pole_c::initDemo, &daObjMirror6Pole_c::executeDemo},
 };
 
+void daObjMirror6Pole_c::setAction(Mode_e i_action) {
+    JUT_ASSERT(89, i_action < MODE_MAX_e);
+    Mode_e oldMode = mMode;
+    mMode = i_action;
+    mAction = (actionFunc*)ActionTable[mMode];
+
+    callInit();
+}
+
+void daObjMirror6Pole_c::callInit() {
+    JUT_ASSERT(123, mAction != NULL);
+    (this->*mAction[0])();
+}
+
+void daObjMirror6Pole_c::callExecute() {
+    JUT_ASSERT(136, mAction != NULL);
+    (this->*mAction[1])();
+}
+
+/* 80C95E18-80C95E2C 000078 0014+00 1/0 0/0 0/0 .text            initWait__18daObjMirror6Pole_cFv */
+void daObjMirror6Pole_c::initWait() {
+    mpBck->setPlaySpeed(0.0f);
+}
+
 /* 80C95E2C-80C95E88 00008C 005C+00 1/0 0/0 0/0 .text            executeWait__18daObjMirror6Pole_cFv
  */
 void daObjMirror6Pole_c::executeWait() {
@@ -67,27 +87,26 @@ void daObjMirror6Pole_c::create_init() {
 /* 80C95F50-80C95F70 0001B0 0020+00 1/1 0/0 0/0 .text
  * createHeapCallBack__18daObjMirror6Pole_cFP10fopAc_ac_c       */
 int daObjMirror6Pole_c::createHeapCallBack(fopAc_ac_c* i_this) {
-    return static_cast<daObjMirror6Pole_c*>(i_this)->CreateHeap();
+    daObjMirror6Pole_c* a_this = (daObjMirror6Pole_c*)i_this;
+    return a_this->CreateHeap();
 }
 
 /* 80C95F70-80C961D8 0001D0 0268+00 1/1 0/0 0/0 .text            CreateHeap__18daObjMirror6Pole_cFv
  */
 int daObjMirror6Pole_c::CreateHeap() {
+    BOOL r26 = FALSE;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7);
+    JUT_ASSERT(318, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpModel == NULL) {
         return 0;
     }
 
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4);
+    JUT_ASSERT(327, bck != NULL);
     mpBck = new mDoExt_bckAnm();
 
-    f32 speed;
-    if (isSwitch()) {
-        speed = 1.0f;
-    } else {
-        speed = 0.0f;
-    }
+    f32 speed = isSwitch() ? 1.0f : 0.0f;
 
     if (mpBck == NULL || !mpBck->init(bck, FALSE, J3DFrameCtrl::EMode_NONE, speed, 0, -1, false)) {
         return 0;
@@ -117,6 +136,7 @@ int daObjMirror6Pole_c::create() {
 
 /* 80C96220-80C96328 000480 0108+00 1/0 0/0 0/0 .text daObjMirror6Pole_Create__FP10fopAc_ac_c */
 static int daObjMirror6Pole_Create(fopAc_ac_c* i_this) {
+    fopAcM_RegisterCreateID(daObjMirror6Pole_c, i_this, "Obj_Mirror6Pole");
     return static_cast<daObjMirror6Pole_c*>(i_this)->create();
 }
 
@@ -127,6 +147,7 @@ daObjMirror6Pole_c::~daObjMirror6Pole_c() {
 /* 80C96328-80C96378 000588 0050+00 1/0 0/0 0/0 .text
  * daObjMirror6Pole_Delete__FP18daObjMirror6Pole_c              */
 static int daObjMirror6Pole_Delete(daObjMirror6Pole_c* i_this) {
+    fopAcM_RegisterDeleteID(i_this, "Obj_Mirror6Pole");
     i_this->~daObjMirror6Pole_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp
index 047ccfc09d..e2df9dbdfd 100644
--- a/src/d/actor/d_a_obj_sw.cpp
+++ b/src/d/actor/d_a_obj_sw.cpp
@@ -120,7 +120,6 @@ static void anm_init(obj_sc_s* i_this, int param_2, f32 i_morf, u8 i_mode, f32 i
 
 /* 80CF09A8-80CF1008 0003E8 0660+00 1/1 0/0 0/0 .text            sc_build__FP12obj_sw_class */
 static void sc_build(obj_sw_class* i_this) {
-    // NONMATCHING
     fopAc_ac_c* a_this = &i_this->actor;
     obj_sc_s* sc_p = i_this->field_0x5a8;
     cXyz sp24, sp30;
@@ -285,7 +284,6 @@ static void sc_move(obj_sw_class* i_this) {
 
 /* 80CF1384-80CF1970 000DC4 05EC+00 1/1 0/0 0/0 .text            demo_camera__FP12obj_sw_class */
 static void demo_camera(obj_sw_class* i_this) {
-    // NONMATCHING
     fopAc_ac_c* a_this = &i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -408,7 +406,6 @@ static void demo_camera(obj_sw_class* i_this) {
 
 /* 80CF1970-80CF2160 0013B0 07F0+00 1/1 0/0 0/0 .text            sc_action__FP12obj_sw_class */
 static void sc_action(obj_sw_class* i_this) {
-    // NONMATCHING
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp90;
     int swBit = fopAcM_GetParam(a_this) >> 24;
@@ -545,7 +542,6 @@ static void sc_action(obj_sw_class* i_this) {
 
 /* 80CF2160-80CF2604 001BA0 04A4+00 1/1 0/0 0/0 .text            sw_action__FP12obj_sw_class */
 static void sw_action(obj_sw_class* i_this) {
-    // NONMATCHING
     f32 tmp;
     f32 fVar1;
     f32 fVar2;
@@ -722,7 +718,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
 
 /* 80CF29D4-80CF2F38 002414 0564+00 1/0 0/0 0/0 .text            daObj_Sw_Create__FP10fopAc_ac_c */
 static int daObj_Sw_Create(fopAc_ac_c* a_this) {
-    // NONMATCHING
     obj_sw_class* i_this = (obj_sw_class*)a_this;
     int phase;
     u32 i_size;
diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp
index 55beed1766..32823eeddd 100644
--- a/src/d/actor/d_a_obj_timer.cpp
+++ b/src/d/actor/d_a_obj_timer.cpp
@@ -104,30 +104,31 @@ bool daObjTimer::Act_c::_execute() {
     }
 }
 
+namespace daObjTimer {
+
 namespace {
     /* 804855A4-804855C0 .text                  daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Create */
-    int Mthd_Create(fopAc_ac_c* i_this) {
+    int Mthd_Create(void* i_this) {
         return static_cast<daObjTimer::Act_c*>(i_this)->_create();
     }
 
     /* 804855C4-804855E4 .text                  daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Delete */
-    int Mthd_Delete(fopAc_ac_c* i_this) {
+    int Mthd_Delete(void* i_this) {
         return static_cast<daObjTimer::Act_c*>(i_this)->_delete();
     }
 
     /* 804855E8-80485608 .text                  daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Execute */
-    int Mthd_Execute(fopAc_ac_c* i_this) {
-        // NONMATCHING
+    int Mthd_Execute(void* i_this) {
         return static_cast<daObjTimer::Act_c*>(i_this)->_execute();
     }
 
     /* 8048560C-80485610 .text                      daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Draw */
-    int Mthd_Draw(fopAc_ac_c* i_this) {
+    int Mthd_Draw(void* i_this) {
         return 1;
     }
 
     /* 80485614-80485618 .text                  daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_IsDelete */
-    int Mthd_IsDelete(fopAc_ac_c* i_this) {
+    int Mthd_IsDelete(void* i_this) {
         return 1;
     }
 
@@ -139,7 +140,9 @@ namespace {
         (process_method_func)Mthd_IsDelete,
         (process_method_func)Mthd_Draw,
     };
-}
+}  // namespace
+
+};  // namespace daObjTimer
 
 /* 804856B8-804856E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Timer */
 extern actor_process_profile_definition g_profile_Obj_Timer = {
@@ -153,7 +156,7 @@ extern actor_process_profile_definition g_profile_Obj_Timer = {
   0,                        // mParameters
   &g_fopAc_Method.base,     // sub_method
   22,                       // mPriority
-  &l_daTimer_Method,           // sub_method
+  &daObjTimer::l_daTimer_Method,           // sub_method
   0x00040000,               // mStatus
   fopAc_ACTOR_e,            // mActorType
   fopAc_CULLBOX_0_e,        // cullType
diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp
index a3dfc53ca1..9ba80e6d79 100644
--- a/src/d/actor/d_a_obj_web0.cpp
+++ b/src/d/actor/d_a_obj_web0.cpp
@@ -72,7 +72,6 @@ static void damage_check(obj_web0_class* i_this) {
 }
 
 /* 80D34794-80D34B24 000354 0390+00 2/1 0/0 0/0 .text daObj_Web0_Execute__FP14obj_web0_class */
-// NONMATCHING - reg alloc
 static int daObj_Web0_Execute(obj_web0_class* i_this) {
     fopAc_ac_c* base_p = i_this;
     fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0);
diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc
index 4ffd8562e0..4389ef19a5 100644
--- a/src/d/actor/d_flower.inc
+++ b/src/d/actor/d_flower.inc
@@ -810,7 +810,6 @@ void dFlower_packet_c::draw() {
 }
 
 /* 80522774-8052299C 006B14 0228+00 1/1 0/0 0/0 .text            calc__16dFlower_packet_cFv */
-// NONMATCHING
 void dFlower_packet_c::calc() {
     dFlower_anm_c* anm_p = getAnm();