d_a_am 100%, no match

src/d/actor/d_a_arrow.cpp

@@ -318,6 +318,8 @@ void daArrow_c::arrowUseMp() {
 }
 
 // This is a fake inline (not present in debug maps) which is required for ShieldReflect to match.
+// It's possible that an inline similar to this was added to the final game even though it didn't exist in the demo,
+// as this section of code was missing from the demo's version of ShieldReflect.
 inline void setSphereCoordsFromXYAngles(cXyz& xyz, f32 mag, s16 targetAngleX, s16 targetAngleY) {
     f32 normZ;
     f32 normY;

src/d/actor/d_a_obj_barrier.cpp

@@ -540,7 +540,7 @@ void daObjBarrier_ef_c::execute() {
         if (((active_flags >> i) & 1)) {
             mBtk[i].play();
 
-            if ((int)mBtk[i].isStop() == true) {
+            if (mBtk[i].isStop() == true) {
                 active_flags ^= 1 << i;
                 mHitActor[i] = NULL;
             }

src/d/actor/d_a_obj_toripost.cpp

@@ -50,7 +50,6 @@ public:
     int getMsgNormal();
     u32 getMsg();
     u16 next_msgStatus(u32* msgId);
-    void anmAtr(u16);
     bool checkTalk();
     void eventOrder();
     void checkOrder();
@@ -151,7 +150,7 @@ const dCcD_SrcCyl daObjTpost_c::m_cyl_src = {
     0.0, // Radius
     0.0, // Height
 };
-static const s32 daObjTpost_c::m_send_price[] = {
+const s32 daObjTpost_c::m_send_price[] = {
     0x05,
     0x0A,
     0x14
@@ -305,7 +304,12 @@ void daObjTpost_c::cutSetAnmStart(int staffIdx) {
 }
 
 void daObjTpost_c::cutSetAnmProc(int staffIdx) {
-    if(mMorf->isStop()) { //probably regswap in isStop()
+    // Using the mDoExt_McaMorf::isStop inline causes regswap.
+    // if(mMorf->isStop()) { //
+    mDoExt_McaMorf* morf = mMorf;
+    bool stopped = true;
+    if (!morf->mFrameCtrl.checkState(1) && morf->mFrameCtrl.getRate() != 0.0f) { stopped = false; }
+    if (stopped) {
         dComIfGp_evmng_cutEnd(staffIdx);
     }
 }
@@ -835,7 +839,12 @@ void daObjTpost_c::modeTalkXY() {
     }
 
     if(field_0x6C9 == 2 || field_0x6C9 == 3) {
-        if(mMorf->isStop()) { //probably regswap in isStop()
+        // Using the mDoExt_McaMorf::isStop inline causes regswap.
+        // if(mMorf->isStop()) {
+        mDoExt_McaMorf* morf = mMorf;
+        bool stopped = true;
+        if (!morf->mFrameCtrl.checkState(1) && morf->mFrameCtrl.getRate() != 0.0f) { stopped = false; }
+        if (stopped) {
             if(cLib_calcTimer(&field_0x8DC) == 0 && talk(1) == dNpcMsgStts_BOX_CLOSED_e) {
                 modeProc(PROC_INIT, 0);
                 dComIfGp_event_onEventFlag(8);

src/d/d_a_bomb_static.cpp

@@ -8,12 +8,12 @@
 #include "dolphin/types.h"
 
 /* 80067FA0-80067FD0       .text getBombRestTime__8daBomb_cFv */
-void daBomb_c::getBombRestTime() {
+s16 daBomb_c::getBombRestTime() {
     /* Nonmatching */
 }
 
 /* 80067FD0-80068000       .text getBombCheck_Flag__8daBomb_cFv */
-void daBomb_c::getBombCheck_Flag() {
+s16 daBomb_c::getBombCheck_Flag() {
     /* Nonmatching */
 }
 
@@ -113,12 +113,12 @@ void daBomb2::Act_c::set_time(int) {
 }
 
 /* 80068490-80068498       .text get_time__Q27daBomb25Act_cCFv */
-void daBomb2::Act_c::get_time() const {
+s32 daBomb2::Act_c::get_time() const {
     /* Nonmatching */
 }
 
 /* 80068498-800684A0       .text chk_eat__Q27daBomb25Act_cCFv */
-void daBomb2::Act_c::chk_eat() const {
+bool daBomb2::Act_c::chk_eat() const {
     /* Nonmatching */
 }
 

src/d/d_cc_uty.cpp

@@ -3,7 +3,7 @@
 // Translation Unit: d_cc_uty.cpp
 //
 
-#include "d_cc_uty.h"
+#include "d/d_cc_uty.h"
 #include "dolphin/types.h"
 
 /* 800AE938-800AE9E8       .text cc_pl_cut_bit_get__Fv */
@@ -40,9 +40,3 @@ void at_power_check(CcAtInfo*) {
 void cc_at_check(fopAc_ac_c*, CcAtInfo*) {
     /* Nonmatching */
 }
-
-/* 800AF368-800AF384       .text PrmAbstract<Q37daTsubo5Act_c5Prm_e>__5daObjFPC10fopAc_ac_cQ37daTsubo5Act_c5Prm_eQ37daTsubo5Act_c5Prm_e */
-void daObj::PrmAbstract<daTsubo::Act_c::Prm_e>(const fopAc_ac_c*, daTsubo::Act_c::Prm_e, daTsubo::Act_c::Prm_e) {
-    /* Nonmatching */
-}
-