getDemoIDData matched, fix up various inlines and template classes (#2489)

* Fix debug build

* getDemoIDData matched, fix up various inlines and template classes

* Remove nonmatching comments

src/d/actor/d_a_alink_demo.inc

@@ -1441,7 +1441,6 @@ f32 daAlink_c::setStickAnmData(J3DAnmBase* i_anm, int param_1, int param_2, u16
 
 /* 80119464-801195C0 113DA4 015C+00 1/1 0/0 0/0 .text
  * daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi      */
-// NONMATCHING - some stack issues
 static int daAlink_c_getDemoIDData(dDemo_actor_c* param_0, int* param_1, int* param_2,
                                        int* param_3, u16* param_4, int* param_5, int* param_6) {
     JStudio::stb::TParseData_fixed<51, TValueIterator_misaligned<u32> > sp30(param_0->getPrm()->getData());

src/d/actor/d_a_e_gb.cpp

@@ -1591,7 +1591,7 @@ static cPhs__Step daE_GB_Create(fopAc_ac_c* a_this) {
         u8 swBit = fopAcM_GetParam(a_this) >> 16;
         if (swBit != 0xFF) {
             if (dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(a_this))) {
-                OS_REPORT("E_gb やられ後なので再セットしません\n")
+                OS_REPORT("E_gb やられ後なので再セットしません\n");
                 return cPhs_ERROR_e;
             }
         }

src/d/actor/d_a_obj_flag3.cpp

@@ -8,9 +8,11 @@
 #include "d/actor/d_a_set_bgobj.h"
 #include "d/d_com_inf_game.h"
 #include "dol2asm.h"
+#include "d/d_a_obj.h"
 
 #ifdef DEBUG
 class daObjFlag3_Hio_c : public JORReflexible {
+public:
     daObjFlag3_Hio_c() {
         mCount = 0;
         default_set();
@@ -23,7 +25,7 @@ class daObjFlag3_Hio_c : public JORReflexible {
         ctx->genSlider("重力", &mAttr.mGravity, -10.0f, 0.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
         ctx->genSlider("バネ係数", &mAttr.mSpringCoeeficient, 0.0f, 10.0f, 0, NULL, 0xffff, 0xffff,
                        0x200, 0x18);
-        ctx->genSlider("減衰率", &mAttr.mAttenuationRate, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff,
+        ctx->genSlider("減衰率", &mAttr.mDecayRate, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff,
                        0x200, 0x18);
         ctx->genSlider("風係数", &mAttr.mWindCoefficient, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff,
                        0x200, 0x18);
@@ -45,6 +47,8 @@ class daObjFlag3_Hio_c : public JORReflexible {
     /* 0x4 */ int mCount;
     /* 0x8 */ daObjFlag3_Attr_c mAttr;
 };
+
+daObjFlag3_Hio_c M_hio;
 #endif
 
 /* 80BF0458-80BF046C 000000 0014+00 3/3 0/0 0/0 .rodata          M_attr__12daObjFlag3_c */

src/d/actor/d_a_title.cpp

@@ -241,8 +241,11 @@ void daTitle_c::nextScene_init() {
 void daTitle_c::nextScene_proc() {
     if (!fopOvlpM_IsPeek() && !mDoRst::isReset()) {
         scene_class* playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
+        JUT_ASSERT(706, playScene != 0);
         fopScnM_ChangeReq(playScene, 13, 0, 5);
+#if VERSION != VERSION_SHIELD_DEBUG
         mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor);
+#endif
     }
 }
 

src/d/d_demo.cpp

@@ -225,7 +225,6 @@ const u8* dDemo_c::m_branchData;
 
 /* 80038338-80038490 032C78 0158+00 0/0 1/1 5/5 .text getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc
  */
-// NONMATCHING - some stack issues
 int dDemo_actor_c::getDemoIDData(int* param_0, int* param_1, int* param_2, u16* param_3,
                                       u8* param_4) {
     JStudio::stb::TParseData_fixed<51, TValueIterator_misaligned<u32> > data(getPrm()->getData());

src/d/d_s_logo.cpp

@@ -432,7 +432,7 @@ dScnLogo_c::~dScnLogo_c() {
 
     field_0x1d4->destroy();
     field_0x1d0->destroy();
-    JKRFree(buffer);
+    JKRFree(dummyGameAlloc);
 
     dComIfGp_particle_createCommon(mParticleCommand->getMemAddress());
     dComIfGp_setFieldMapArchive2(mpField0Command->getArchive());
@@ -508,8 +508,9 @@ static int phase_0(dScnLogo_c* i_this) {
     mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor);
     dComIfGp_particle_create();
 
-    i_this->buffer = mDoExt_getGameHeap()->alloc(0x340000, -0x10);
-    i_this->field_0x1d0 = JKRExpHeap::create(i_this->buffer, 0x340000, NULL, false);
+    i_this->dummyGameAlloc = mDoExt_getGameHeap()->alloc(0x340000, -0x10);
+    JUT_ASSERT(1523, i_this->dummyGameAlloc != 0);
+    i_this->field_0x1d0 = JKRExpHeap::create(i_this->dummyGameAlloc, 0x340000, NULL, false);
     i_this->field_0x1d4 = JKRExpHeap::create(0x130000, i_this->field_0x1d0, false);
 
     return cPhs_NEXT_e;