Add a precompiled header for RELs (#2597)

src/DynamicLink.cpp

@@ -554,4 +554,4 @@ extern "C" void ModuleDestructorsX(void (**dtors)()) {
 /* 80263210-80263218 25DB50 0008+00 1/0 0/0 0/0 .text getModuleSize__24DynamicModuleControlBaseCFv
  */
 
-/* 80263218-80263220 25DB58 0008+00 1/0 0/0 0/0 .text getModuleName__20DynamicModuleControlCFv */
+/* 80263218-80263220 25DB58 0008+00 1/0 0/0 0/0 .text getModuleName__20DynamicModuleControlCFv */

src/JSystem/J2DGraph/J2DTextBox.cpp

@@ -488,4 +488,4 @@ bool J2DTextBox::isUsed(ResTIMG const* p_timg) {
 /* 80300C90-80300C94 2FB5D0 0004+00 1/0 0/0 0/0 .text            rewriteAlpha__10J2DTextBoxFv */
 void J2DTextBox::rewriteAlpha() {
     /* empty function */
-}
+}

src/JSystem/J3DGraphBase/J3DMatBlock.cpp

@@ -337,11 +337,6 @@ static u8 sdata_padding[4] = {};
 /* 804515D8-804515DC 000AD8 0004+00 2/2 0/0 0/0 .sbss            SizeOfJ3DColorBlockLightOffLoad */
 static u32 SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans;
 
-u8 J3DColorChan::getAttnFn() const {
-    u8 AttnArr[] = {2,0,2,1};
-    return AttnArr[(u32)(mColorChanID & (3 << 9)) >> 9];
-}
-
 /* 80317C0C-8031816C 31254C 0560+00 1/0 0/0 0/0 .text            load__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::load() {
     GDOverflowCheck(SizeOfJ3DColorBlockLightOffLoad);

src/JSystem/J3DU/J3DUDL.cpp

@@ -9,4 +9,4 @@
 // Fake function to make the weak function J3DShapeMtx::getUseMtxNum appear in this TU
 u32 J3DUGetUseMtxNum(J3DShapeMtx* i_shapeMtx) {
     return i_shapeMtx->getUseMtxNum();
-}
+}

src/JSystem/JAudio2/JAISoundHandles.cpp

@@ -35,4 +35,4 @@ JAISoundHandle* JAISoundHandles::getFreeHandle() {
         }
     }
     return NULL;
-}
+}

src/JSystem/JAudio2/JAISoundInfo.cpp

@@ -25,4 +25,4 @@ JAISoundInfo::JAISoundInfo(bool param_0) : JASGlobalInstance<JAISoundInfo>(param
 
 /* 802A2D50-802A2DB4 29D690 0064+00 1/0 2/2 0/0 .text            __dt__12JAISoundInfoFv */
 JAISoundInfo::~JAISoundInfo() {
-}
+}

src/JSystem/JAudio2/JASAudioReseter.cpp

@@ -114,4 +114,4 @@ s32 JASAudioReseter::calc() {
 /* 8029D2D4-8029D2F4 297C14 0020+00 1/1 0/0 0/0 .text            callback__15JASAudioReseterFPv */
 s32 JASAudioReseter::callback(void* param_0) {
     return ((JASAudioReseter*)param_0)->calc();
-}
+}

src/JSystem/JAudio2/JASCallback.cpp

@@ -60,4 +60,4 @@ void JASCallbackMgr::callback() {
 			mCallbacks[i].mArgument = NULL;
 		}
 	}
-}
+}

src/JSystem/JAudio2/JASDSPChannel.cpp

@@ -245,4 +245,4 @@ int JASDSPChannel::killActiveChannel() {
 /* 8029D948-8029D958 298288 0010+00 0/0 1/1 0/0 .text            getHandle__13JASDSPChannelFUl */
 JASDSPChannel* JASDSPChannel::getHandle(u32 i_index) {
     return &sDspChannels[i_index];
-}
+}

src/JSystem/JAudio2/JASDrumSet.cpp

@@ -118,4 +118,4 @@ void JASDrumSet::TPerc::setRelease(u32 param_0) {
 }
 
 /* 802984EC-802984F8 292E2C 000C+00 1/0 0/0 0/0 .text            getType__10JASDrumSetCFv */
-u32 JASDrumSet::getType() const { return 'PERC'; }
+u32 JASDrumSet::getType() const { return 'PERC'; }

src/JSystem/JAudio2/JASDvdThread.cpp

@@ -36,4 +36,4 @@ bool JASDvd::createThread(s32 priority, int param_1, u32 param_2) {
     sThread->setCurrentHeap(JKRGetSystemHeap());
 	OSResumeThread(sThread->getThreadRecord());
 	return true;
-}
+}

src/JSystem/JAudio2/JASLfo.cpp

@@ -82,4 +82,4 @@ void JASLfo::resetCounter() {
     }
 }
 
-/* 8029BE6C-8029BE94 2967AC 0028+00 0/0 1/0 0/0 .text            __sinit_JASLfo_cpp */
+/* 8029BE6C-8029BE94 2967AC 0028+00 0/0 1/0 0/0 .text            __sinit_JASLfo_cpp */

src/JSystem/JAudio2/JASOscillator.cpp

@@ -214,4 +214,4 @@ void JASOscillator::updateCurrentValue(f32 param_0) {
     f32 fVar2 = (1.0f - fVar3) * table[index];
     f32 fVar4 = fVar2 + fVar3 * table[index + 1];
     _08 = _0C * fVar4 + _10 * (1.0f - fVar4);
-}
+}

src/JSystem/JAudio2/JASProbe.cpp

@@ -68,4 +68,4 @@ void JASProbe::stop(s32 index) {
             sProbeTable[index]->stop();
         }
     }
-}
+}

src/JSystem/JAudio2/JASRegisterParam.cpp

@@ -147,4 +147,4 @@ u32 JASRegisterParam::read(JASRegisterParam::RegID param_0) {
         break;
     }
     return rv;
-}
+}

src/JSystem/JAudio2/JASResArcLoader.cpp

@@ -68,4 +68,4 @@ int JASResArcLoader::loadResourceAsync(JKRArchive* archive, u16 id, u8* buffer,
 	args.mCallbackArg = cbArg;
 
 	return JASDvd::getThreadPointer()->sendCmdMsg(&loadResourceCallback, (void*)&args, sizeof(CallbackArgs));
-}
+}

src/JSystem/JAudio2/JASSeqCtrl.cpp

@@ -155,4 +155,4 @@ void JASSeqCtrl::timerProcess() {
     }
 }
 
-/* ############################################################################################## */
+/* ############################################################################################## */

src/JSystem/JAudio2/JASSoundParams.cpp

@@ -22,4 +22,4 @@ void JASSoundParams::combine(const JASSoundParams &other1, const JASSoundParams
     mFxMix = other1.mFxMix + other2.mFxMix;
     mPan = other1.mPan + other2.mPan - 0.5f;
     mDolby = other1.mDolby + other2.mDolby;
-}
+}

src/JSystem/JAudio2/JASTrackPort.cpp

@@ -46,4 +46,4 @@ u32 JASTrackPort::checkImport(u32 param_0) const {
 /* 80293628-80293644 28DF68 001C+00 0/0 1/1 0/0 .text            checkExport__12JASTrackPortCFUl */
 u32 JASTrackPort::checkExport(u32 param_0) const {
     return field_0x2 & 1 << param_0 ? 1 : 0;
-}
+}

src/JSystem/JAudio2/JASVoiceBank.cpp

@@ -39,4 +39,4 @@ JASVoiceBank::~JASVoiceBank() {}
 /* 80298008-80298014 292948 000C+00 1/0 0/0 0/0 .text            getType__12JASVoiceBankCFv */
 u32 JASVoiceBank::getType() const {
     return 'VOIC';
-}
+}

src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp

@@ -130,4 +130,4 @@ bool JAUAudioArcInterpreter::readCommand_() {
         break;
     }
     return true;
-}
+}

src/JSystem/JAudio2/JAUAudioArcLoader.cpp

@@ -105,4 +105,4 @@ void JAUAudioArcLoader::readMaxSeCategory(int param_0, int param_1, int param_2)
         seMgr->getCategory(param_0)->setMaxActiveSe(param_1);
         seMgr->getCategory(param_0)->setMaxInactiveSe(param_2);
     }
-}
+}

src/JSystem/JAudio2/JAUSeqCollection.cpp

@@ -103,4 +103,4 @@ JAUSeqDataMgr_SeqCollection::SeqDataReturnValue JAUSeqDataMgr_SeqCollection::get
 }
 
 /* 802A6894-802A68F4 2A11D4 0060+00 1/0 0/0 0/0 .text __dt__27JAUSeqDataMgr_SeqCollectionFv */
-JAUSeqDataMgr_SeqCollection::~JAUSeqDataMgr_SeqCollection() {}
+JAUSeqDataMgr_SeqCollection::~JAUSeqDataMgr_SeqCollection() {}

src/JSystem/JAudio2/JAUSoundAnimator.cpp

@@ -25,4 +25,4 @@ int JAUSoundAnimation::getEndSoundIndex(f32 param_0) const {
         }
     }
     return i;
-}
+}

src/JSystem/JMath/JMath.cpp

@@ -135,4 +135,4 @@ void JMAMTXApplyScale(register const Mtx src, register Mtx dst, register f32 xSc
         psq_st z, 40(dst), 0, 0
     }
 #endif  // clang-format on
-}
+}

src/JSystem/JMath/random.cpp

@@ -8,4 +8,4 @@
 /* 80339AE4-80339AEC -00001 0008+00 0/0 0/0 0/0 .text            __ct__Q25JMath13TRandom_fast_FUl */
 JMath::TRandom_fast_::TRandom_fast_(u32 param_0) {
     value = param_0;
-}
+}

src/JSystem/JParticle/JPAExTexShape.cpp

@@ -32,4 +32,4 @@ void JPALoadExTex(JPAEmitterWorkData* work) {
 /* 8027B13C-8027B144 -00001 0008+00 0/0 0/0 0/0 .text            __ct__13JPAExTexShapeFPCUc */
 JPAExTexShape::JPAExTexShape(u8 const* data) {
     mpData = (const JPAExTexShapeData*)data;
-}
+}

src/JSystem/JParticle/JPAResourceManager.cpp

@@ -81,4 +81,4 @@ u32 JPAResourceManager::getResUserWork(u16 usrIdx) const {
         ret = res->getDyn()->getResUserWork();
 
     return ret;
-}
+}

src/JSystem/JParticle/JPATexture.cpp

@@ -12,4 +12,4 @@ JPATexture::JPATexture(u8 const* pData) {
 }
 
 /* 8027D83C-8027D8A0 27817C 0064+00 1/0 0/0 0/0 .text            __dt__10JPATextureFv */
-JPATexture::~JPATexture() {}
+JPATexture::~JPATexture() {}

src/JSystem/JStudio/JStudio/fvb-data-parse.cpp

@@ -34,4 +34,4 @@ void JStudio::fvb::data::TParse_TParagraph::getData(TParse_TParagraph::TData* da
 		data->pContent = parse;
 		data->next    = parse + ((t + 3) >> 1 & ~1);
 	}
-}
+}

src/JSystem/JSupport/JSUFileStream.cpp

@@ -71,4 +71,4 @@ s32 JSUFileInputStream::getLength() const {
 /* 802DC85C-802DC864 2D719C 0008+00 1/0 0/0 0/0 .text getPosition__18JSUFileInputStreamCFv */
 s32 JSUFileInputStream::getPosition() const {
     return mPosition;
-}
+}

src/JSystem/JSupport/JSUList.cpp

@@ -159,4 +159,4 @@ JSUPtrLink* JSUPtrList::getNthLink(u32 index) const {
     }
 
     return node;
-}
+}

src/JSystem/JUtility/JUTCacheFont.cpp

@@ -529,4 +529,4 @@ s32 JUTResFont::getDescent() const {
 /* 802DE01C-802DE078 2D895C 005C+00 1/0 1/0 0/0 .text            getHeight__10JUTResFontCFv */
 s32 JUTResFont::getHeight() const {
     return getAscent() + getDescent();
-}
+}

src/JSystem/JUtility/JUTDbPrint.cpp

@@ -129,4 +129,4 @@ void JUTReport(int param_0, int param_1, int param_2, char const* fmt, ...) {
         return;
     }
     JUTDbPrint::sDebugPrint->enter(param_0, param_1, param_2, buf, ret < 0x100 ? ret : 0xFF);
-}
+}

src/JSystem/JUtility/JUTFader.cpp

@@ -116,4 +116,4 @@ void JUTFader::setStatus(JUTFader::EStatus i_status, int param_1) {
 }
 
 /* 802E5840-802E5888 2E0180 0048+00 1/0 0/0 0/0 .text            __dt__8JUTFaderFv */
-JUTFader::~JUTFader() {}
+JUTFader::~JUTFader() {}

src/JSystem/JUtility/JUTFont.cpp

@@ -56,4 +56,4 @@ f32 JUTFont::drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* s
     }
 
     return a1 - temp;
-}
+}

src/JSystem/JUtility/JUTGraphFifo.cpp

@@ -44,4 +44,4 @@ JUTGraphFifo::~JUTGraphFifo() {
         sCurrentFifo = NULL;
     }
     JKRFreeToSysHeap(mBase);
-}
+}

src/JSystem/JUtility/JUTNameTab.cpp

@@ -49,4 +49,4 @@ u16 JUTNameTab::calcKeyCode(const char* pName) const {
     while (*pName)
         keyCode = (keyCode * 3) + *pName++;
     return keyCode;
-}
+}

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h

@@ -1,7 +1,6 @@
 #ifndef STD_CMATH_H_
 #define STD_CMATH_H_
 
-
 namespace std {
 template<typename T>
 inline double fabs(T x) {

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h

@@ -68,16 +68,14 @@ double sqrt(double);
 double tan(double);
 float tanf(float);
 
-inline double sqrt_step(double tmpd, float mag) {
-    return tmpd * 0.5 * (3.0 - mag * (tmpd * tmpd));
-}
-
 inline float sqrtf(float mag) {
+    static const double _half = 0.5;
+    static const double _three = 3.0;
     if (mag > 0.0f) {
         double tmpd = __frsqrte(mag);
-        tmpd = sqrt_step(tmpd, mag);
-        tmpd = sqrt_step(tmpd, mag);
-        tmpd = sqrt_step(tmpd, mag);
+        tmpd = tmpd * _half * (_three - mag * (tmpd * tmpd));
+        tmpd = tmpd * _half * (_three - mag * (tmpd * tmpd));
+        tmpd = tmpd * _half * (_three - mag * (tmpd * tmpd));
         return mag * tmpd;
     } else if (mag < 0.0) {
         return NAN;

src/SSystem/SStandard/s_basic.cpp

@@ -17,4 +17,4 @@ void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue) {
 /* 80271CAC-80271CD0 0024+00 s=0 e=2 z=0  None .text      sBs_ClearArea__FPvUl */
 void sBs_ClearArea(void* pPtr, u32 pNumBytes) {
     sBs_FillArea_s(pPtr, pNumBytes, 0);
-}
+}

src/Z2AudioLib/Z2Calc.cpp

@@ -139,4 +139,4 @@ f32 Z2Calc::FNoise1f::calcNoise1f(void) {
     this->unk4 = temp2;
 
     return this->unk0;
-}
+}

src/Z2AudioLib/Z2EnvSeMgr.cpp

@@ -85,9 +85,6 @@ bool Z2EnvSeBase::startEnvSeLevel(JAISoundID param_1, f32 param_2, f32 param_3,
     return rv;
 }
 
-/* 8039C250-8039C260 0288B0 000C+04 2/2 0/0 0/0 .rodata          cNullVec__6Z2Calc */
-static Vec const cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f};
-
 /* 802C5C9C-802C5D1C 2C05DC 0080+00 1/1 0/0 0/0 .text            __ct__10Z2EnvSeDirFP3Vec */
 Z2EnvSeDir::Z2EnvSeDir(Vec* param_0) {
     field_0x8 = 0.5f;
@@ -95,7 +92,7 @@ Z2EnvSeDir::Z2EnvSeDir(Vec* param_0) {
     if (param_0) {
         setPanDir(param_0);
     } else {
-        mPanDir = cNullVec__6Z2Calc;
+        mPanDir = Z2Calc::cNullVec;
     }
 }
 
@@ -895,7 +892,7 @@ void Z2EnvSeMgr::initStrongWindSe() {
 /* 802C7FC8-802C800C 2C2908 0044+00 0/0 1/1 1/1 .text setWindDirection__10Z2EnvSeMgrFP3Vec */
 void Z2EnvSeMgr::setWindDirection(Vec* param_0) {
     if (mWindType == WIND_TYPE_3) {
-        field_0x144.setPanDir((Vec*)&cNullVec__6Z2Calc);
+        field_0x144.setPanDir(const_cast<Vec*>(&Z2Calc::cNullVec));
     } else {
         field_0x144.setPanDir(param_0);
     }

src/Z2AudioLib/Z2SoundObject.cpp

@@ -177,14 +177,10 @@ Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 pId, u32 pUserData, Z2So
     return handle;
 }
 
-/* ############################################################################################## */
-/* 8039C230-8039C240 028890 000C+04 1/1 0/0 0/0 .rodata          cNullVec__6Z2Calc */
-static Vec const cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f};
-
 /* 802BE5A0-802BE5FC 2B8EE0 005C+00 1/1 0/0 0/0 .text            __ct__21Z2DopplerSoundObjBaseFv */
 Z2DopplerSoundObjBase::Z2DopplerSoundObjBase() : Z2SoundObjBase() {
-    field_0x20 = cNullVec__6Z2Calc;
-    field_0x2c = cNullVec__6Z2Calc;
+    field_0x20 = Z2Calc::cNullVec;
+    field_0x2c = Z2Calc::cNullVec;
 }
 
 /* 802BE5FC-802BE65C 2B8F3C 0060+00 0/0 0/0 1/1 .text            __dt__21Z2DopplerSoundObjBaseFv */

src/d/actor/d_a_L7demo_dr.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_L7demo_dr.h"
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_obj_lv7bridge.h"

src/d/actor/d_a_L7low_dr.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_L7low_dr.h"
 #include "d/d_com_inf_game.h"
 

src/d/actor/d_a_L7op_demo_dr.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_L7op_demo_dr.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_alink.cpp

@@ -3,6 +3,8 @@
  * Player (Link) Actor
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_alink.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -175,11 +177,6 @@ static char const l_wolfWorldChangeEventName[21] = "WOLF_WORLD_CHANGE_IN";
 /* 8038FA38-8038FA48 01C098 0010+00 0/1 0/0 0/0 .rodata          l_defaultGetEventName */
 static char const l_defaultGetEventName[16] = "DEFAULT_GETITEM";
 
-/* 803AF990-803AF99C 00CAB0 000C+00 4/4 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
 /* 803AF99C-803AF9A8 00CABC 000A+02 2/2 0/0 0/0 .data            l_peepEventName */
 static char l_peepEventName[10] = "PEEP_HOLE";
 

src/d/actor/d_a_alldie.cpp

@@ -3,6 +3,8 @@
  * Activates a switch when all enemies are defeated 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_alldie.h"
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"

src/d/actor/d_a_andsw.cpp

@@ -3,6 +3,8 @@
  * AND - Switch
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_andsw.h"
 #include "d/d_procname.h"
 

src/d/actor/d_a_andsw2.cpp

@@ -3,6 +3,8 @@
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_andsw2.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_lib.h"

src/d/actor/d_a_arrow.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_arrow.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/JAudio2/JAUSectionHeap.h"
@@ -404,23 +406,6 @@ void daArrow_c::setNormalMatrix() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-UNK_BSS(1109)
-UNK_BSS(1107)
-UNK_BSS(1105)
-UNK_BSS(1104)
-UNK_BSS(1099)
-UNK_BSS(1097)
-UNK_BSS(1095)
-UNK_BSS(1094)
-UNK_BSS(1057)
-UNK_BSS(1055)
-UNK_BSS(1053)
-UNK_BSS(1052)
-UNK_BSS(1014)
-UNK_BSS(1012)
-UNK_BSS(1010)
-UNK_BSS(1009)
-
 /* 8049AF18-8049AFEC 001398 00D4+00 3/3 0/0 0/0 .text            setSmokePos__9daArrow_cFv */
 void daArrow_c::setSmokePos() {
     static cXyz localOffset(-3.3f, -3.0f, 94.0f);
@@ -512,8 +497,6 @@ bool daArrow_c::checkReget() {
     }
 }
 
-UNK_REL_DATA
-
 /* 8049B45C-8049B764 0018DC 0308+00 1/0 0/0 0/0 .text            procWait__9daArrow_cFv */
 int daArrow_c::procWait() {
     setKeepMatrix();

src/d/actor/d_a_b_bh.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_bh.h"
 #include "d/actor/d_a_b_bq.h"
 #include "d/d_bomb.h"
@@ -95,8 +97,6 @@ static int daB_BH_Draw(b_bh_class* i_this) {
     return 1;
 }
 
-UNK_REL_BSS;
-
 /* 805B33ED 0003+00 data_805B33ED None */
 static u8 l_initHIO;
 

src/d/actor/d_a_b_bq.cpp

@@ -3,6 +3,8 @@
  * Boss Baba (Diababa)
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_bq.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
@@ -194,8 +196,6 @@ enum daB_BQ_JNT {
     JNT_SLEAF_UR2,
 };
 
-UNK_REL_DATA;
-
 /* 805B356C-805B35A0 0000EC 0034+00 1/1 0/0 0/0 .text            __ct__12daB_BQ_HIO_cFv */
 daB_BQ_HIO_c::daB_BQ_HIO_c() {
     field_0x4 = -1;

src/d/actor/d_a_b_dr.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_dr.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
@@ -14,6 +16,53 @@
 #include "c/c_damagereaction.h"
 #include "Z2AudioLib/Z2Instances.h"
 
+
+class daB_DR_HIO_c : public JORReflexible {
+public:
+    /* 805BAE6C */ daB_DR_HIO_c();
+    /* 805C6B94 */ virtual ~daB_DR_HIO_c() {}
+
+    void genMessage(JORMContext*);
+
+    /* 0x04 */ s8 field_0x4;
+    /* 0x08 */ f32 model_size;
+    /* 0x0C */ f32 fall_accel;
+    /* 0x10 */ f32 fall_accel_max;
+    /* 0x14 */ f32 wind_large_attack_lockon_range;
+    /* 0x18 */ f32 unk_0x18;
+    /* 0x1C */ f32 wind_small_attack_power;
+    /* 0x20 */ f32 wind_attack_power;
+    /* 0x24 */ f32 glide_wind_power;
+    /* 0x28 */ f32 breath_attack_threshold;
+    /* 0x2C */ f32 unk_0x2c;
+    /* 0x30 */ f32 breath_move_speed_max;
+    /* 0x34 */ f32 breath_move_speed_min;
+    /* 0x38 */ s16 tail_hit_chance_time;
+    /* 0x3A */ s16 center_wind_time;
+    /* 0x3C */ s16 breath_continue_time;
+    /* 0x3E */ s16 breath_continue_no_armor_time;
+    /* 0x40 */ s16 breath_feint1_time;
+    /* 0x42 */ s16 breath_feint2_time;
+    /* 0x44 */ s16 breath_feint3_time;
+    /* 0x46 */ s16 no_attack_time;
+    /* 0x48 */ s16 unk_0x48;
+    /* 0x4A */ s16 no_attack_no_armor_time;
+    /* 0x4C */ s16 unk_0x4c;
+    /* 0x4E */ s16 back_hit_chance_time;
+    /* 0x50 */ s16 after_breath_chance_time;
+    /* 0x52 */ s16 neck_search_speed;
+    /* 0x54 */ s16 neck_search2_speed;
+    /* 0x56 */ s16 neck_search_speed_max;
+    /* 0x58 */ s16 body_search_speed;
+    /* 0x5A */ s16 body_search2_speed;
+    /* 0x5C */ s16 body_search_speed_max;
+    /* 0x5E */ s16 body_search_feint_speed_max;
+    /* 0x60 */ s16 feint_angle;
+    /* 0x62 */ s16 unk_0x62;
+    /* 0x64 */ u8 display_range;
+    /* 0x65 */ u8 breath_feint2_OFF;
+};
+
 #define ANM_DR_BOOT_A 0x10
 #define ANM_DR_BOOT_A_DEMO 0x11
 #define ANM_DR_BOOT_B 0x12
@@ -86,8 +135,6 @@ enum daB_DR_Action {
     ACTION_DEAD,
 };
 
-UNK_REL_DATA
-
 namespace {
 /* 805C7268-805C72AC 000020 0044+00 0/1 0/0 0/0 .data cc_dr_week_src__22@unnamed@d_a_b_dr_cpp@ */
 static dCcD_SrcCyl cc_dr_week_src = {
@@ -245,8 +292,6 @@ daB_DR_HIO_c::daB_DR_HIO_c() {
     breath_feint2_OFF = true;
 }
 
-UNK_REL_BSS
-
 /* 805C78FD 0003+00 l_initHIO None */
 static u8 l_initHIO;
 
@@ -879,6 +924,10 @@ void daB_DR_c::mHabatakiAnmSet(int param_0) {
     }
 }
 
+static u8 dummy(u8 param_0) {
+    return cLib_calcTimer<u8>(&param_0);
+}
+
 /* 805BC57C-805BC8B4 0017FC 0338+00 3/2 0/0 0/0 .text            mGlider_AniSet__8daB_DR_cFb */
 void daB_DR_c::mGlider_AniSet(bool param_0) {
     if (param_0 && mTimer[0] != 0 && mAnm == ANM_DR_FLY) {

src/d/actor/d_a_b_dre.cpp

@@ -1,8 +1,10 @@
 /**
- * @file d_a_b_dre.cpp
+* @file d_a_b_dre.cpp
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_dre.h"
 #include "SSystem/SComponent/c_math.h"
 #include "Z2AudioLib/Z2Instances.h"
@@ -180,23 +182,6 @@ void daB_DRE_c::SetReleaseCam() {
     dComIfGp_event_reset();
 }
 
-UNK_BSS(1109)
-UNK_BSS(1107)
-UNK_BSS(1105)
-UNK_BSS(1104)
-UNK_BSS(1099)
-UNK_BSS(1097)
-UNK_BSS(1095)
-UNK_BSS(1094)
-UNK_BSS(1057)
-UNK_BSS(1055)
-UNK_BSS(1053)
-UNK_BSS(1052)
-UNK_BSS(1014)
-UNK_BSS(1012)
-UNK_BSS(1010)
-UNK_BSS(1009)
-
 namespace {
 /* 805CB080-805CB084 000048 0004+00 0/1 0/0 0/0 .bss             s_dis__23@unnamed@d_a_b_dre_cpp@ */
 static f32 s_dis;

src/d/actor/d_a_b_ds.cpp

@@ -3,6 +3,8 @@
  * Boss - Stallord
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_ds.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
@@ -14,7 +16,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_math.h"
 #include "c/c_damagereaction.h"
-UNK_REL_DATA;
 #include "f_op/f_op_actor_enemy.h"
 
 enum daB_DS_Joint {
@@ -207,99 +208,6 @@ daB_DS_HIO_c::daB_DS_HIO_c() {
     mP2HealthDebugOn = false;
 }
 
-/* ############################################################################################## */
-/* 805DDA70-805DDA74 000008 0001+03 8/8 0/0 0/0 .bss             @1109 */
-static u8 lit_1109[1 + 3 /* padding */];
-
-/* 805DDA74-805DDA78 00000C 0001+03 0/0 0/0 0/0 .bss             @1107 */
-#pragma push
-#pragma force_active on
-static u8 lit_1107[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA78-805DDA7C 000010 0001+03 0/0 0/0 0/0 .bss             @1105 */
-#pragma push
-#pragma force_active on
-static u8 lit_1105[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA7C-805DDA80 000014 0001+03 0/0 0/0 0/0 .bss             @1104 */
-#pragma push
-#pragma force_active on
-static u8 lit_1104[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA80-805DDA84 000018 0001+03 0/0 0/0 0/0 .bss             @1099 */
-#pragma push
-#pragma force_active on
-static u8 lit_1099[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA84-805DDA88 00001C 0001+03 0/0 0/0 0/0 .bss             @1097 */
-#pragma push
-#pragma force_active on
-static u8 lit_1097[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA88-805DDA8C 000020 0001+03 0/0 0/0 0/0 .bss             @1095 */
-#pragma push
-#pragma force_active on
-static u8 lit_1095[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA8C-805DDA90 000024 0001+03 0/0 0/0 0/0 .bss             @1094 */
-#pragma push
-#pragma force_active on
-static u8 lit_1094[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA90-805DDA94 000028 0001+03 0/0 0/0 0/0 .bss             @1057 */
-#pragma push
-#pragma force_active on
-static u8 lit_1057[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA94-805DDA98 00002C 0001+03 0/0 0/0 0/0 .bss             @1055 */
-#pragma push
-#pragma force_active on
-static u8 lit_1055[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA98-805DDA9C 000030 0001+03 0/0 0/0 0/0 .bss             @1053 */
-#pragma push
-#pragma force_active on
-static u8 lit_1053[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDA9C-805DDAA0 000034 0001+03 0/0 0/0 0/0 .bss             @1052 */
-#pragma push
-#pragma force_active on
-static u8 lit_1052[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDAA0-805DDAA4 000038 0001+03 0/0 0/0 0/0 .bss             @1014 */
-#pragma push
-#pragma force_active on
-static u8 lit_1014[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDAA4-805DDAA8 00003C 0001+03 0/0 0/0 0/0 .bss             @1012 */
-#pragma push
-#pragma force_active on
-static u8 lit_1012[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDAA8-805DDAAC 000040 0001+03 0/0 0/0 0/0 .bss             @1010 */
-#pragma push
-#pragma force_active on
-static u8 lit_1010[1 + 3 /* padding */];
-#pragma pop
-
-/* 805DDAAC-805DDAB0 -00001 0004+00 2/2 0/0 0/0 .bss             None */
-/* 805DDAAC 0001+00 data_805DDAAC @1009 */
-/* 805DDAAD 0003+00 data_805DDAAD None */
-static u8 struct_805DDAAC;
-
 static bool hioInit;
 
 /* 805DDABC-805DDB0C 000054 0050+00 21/23 0/0 0/0 .bss             l_HIO */
@@ -5861,8 +5769,6 @@ static cPhs__Step daB_DS_Create(daB_DS_c* i_this) {
     return i_this->create();
 }
 
-#pragma nosyminline on
-
 /* ############################################################################################## */
 /* 805DE2AC-805DE2B0 000844 0004+00 0/0 0/0 0/0 .bss
  * sInstance__40JASGlobalInstance<19JASDefaultBankTable>        */

src/d/actor/d_a_b_gg.cpp

@@ -3,15 +3,31 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_gg.h"
 #include "d/d_com_inf_game.h"
 #include "c/c_damagereaction.h"
 #include "m_Do/m_Do_graphic.h"
 #include "Z2AudioLib/Z2Instances.h"
-
-UNK_REL_DATA;
 #include "f_op/f_op_actor_enemy.h"
 
+class daB_GG_HIO_c : public JORReflexible {
+public:
+    /* 805DE40C */ daB_GG_HIO_c();
+    /* 805EC9C4 */ virtual ~daB_GG_HIO_c() {}
+    void genMessage(JORMContext*) {}
+
+    /* 0x04 */ s8 id;
+    /* 0x08 */ f32 base_size;
+    /* 0x0C */ s16 takeoff_time;
+    /* 0x0E */ s16 fly_attack_wait_time;
+    /* 0x10 */ f32 fly_attack_speed;
+    /* 0x14 */ s16 takeoff2_time;
+    /* 0x16 */ s16 max_hp;
+    /* 0x18 */ f32 field_0x18;
+};
+
 enum daE_GG_TYPE {
     TYPE_L7_MBOSS = 0,
     TYPE_L7_W = 1,
@@ -256,8 +272,6 @@ void daB_GG_c::initCc() {
     }
 }
 
-UNK_REL_BSS
-
 /* 805ED6FC-805ED700 -00001 0004+00 1/2 0/0 0/0 .bss             None */
 /* 805ED6FD 0003+00 l_HIOInit None */
 static u8 l_HIOInit;

src/d/actor/d_a_b_gm.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_gm.h"
 #include "d/actor/d_a_e_gm.h"
 #include "d/actor/d_a_player.h"
@@ -39,8 +41,6 @@
 #define ANM_GOMA_UP_02          29
 #define ANM_GOMA_WAIT           30
 
-UNK_REL_DATA;
-
 enum daB_GM_ACTION {
     ACTION_WAIT,
     ACTION_MOVE,
@@ -135,23 +135,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-UNK_BSS(1109)
-UNK_BSS(1107)
-UNK_BSS(1105)
-UNK_BSS(1104)
-UNK_BSS(1099)
-UNK_BSS(1097)
-UNK_BSS(1095)
-UNK_BSS(1094)
-UNK_BSS(1057)
-UNK_BSS(1055)
-UNK_BSS(1053)
-UNK_BSS(1052)
-UNK_BSS(1014)
-UNK_BSS(1012)
-UNK_BSS(1010)
-
-static u8 lit_1009[1];
 static u8 l_initHIO;
 
 /* 805F47DC-805F4828 000054 004C+00 11/12 0/0 0/0 .bss             l_HIO */

src/d/actor/d_a_b_gnd.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_gnd.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_alink.h"
@@ -176,9 +178,6 @@ enum daB_GND_ACTION {
     ACTION_END = 22,
 };
 
-UNK_REL_DATA;
-UNK_REL_BSS;
-
 static u8 l_initHIO;
 
 /* 805F4A4C-805F4A94 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__13daB_GND_HIO_cFv */

src/d/actor/d_a_b_go.cpp

@@ -3,6 +3,8 @@
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_go.h"
 #include "SSystem/SComponent/c_math.h"
 #include "f_op/f_op_actor_mng.h"

src/d/actor/d_a_b_gos.cpp

@@ -3,6 +3,8 @@
  * Combined Goron Child
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_gos.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_b_mgn.cpp

@@ -3,16 +3,32 @@
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_mgn.h"
 #include "d/actor/d_a_obj_bhashi.h"
 #include "d/d_camera.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_graphic.h"
-
-UNK_REL_DATA;
-
 #include "f_op/f_op_actor_enemy.h"
 
+class daB_MGN_HIO_c : public JORReflexible {
+public:
+    /* 8060572C */ daB_MGN_HIO_c();
+    /* 8060F8D0 */ virtual ~daB_MGN_HIO_c() {}
+
+    void genMessage(JORMContext*);
+
+    /* 0x04 */ s8 no;
+    /* 0x08 */ f32 base_size;
+    /* 0x0C */ f32 dash_speed;
+    /* 0x10 */ f32 turn_speed;
+    /* 0x14 */ f32 dash_anim;
+    /* 0x18 */ f32 jewel_R;
+    /* 0x1C */ f32 jewel_G;
+    /* 0x20 */ f32 jewel_B;
+};
+
 enum B_MGN_RES_FILE_ID {
     /* BCK */
     /* 0x06 */ BCK_MGN_APPROACH = 6,

src/d/actor/d_a_b_ob.cpp

@@ -3,6 +3,8 @@
 // Translation Unit: d_a_b_ob
 //
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_ob.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_math.h"
@@ -19,8 +21,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 
 
-UNK_REL_DATA;
-
 /* 8061056C-806105BC 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daB_OB_HIO_cFv */
 daB_OB_HIO_c::daB_OB_HIO_c() {
     field_0x04 = -1;
@@ -102,8 +102,6 @@ static int TailCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-UNK_REL_BSS;
-
 static u8 data_8061B4FD;
 
 /* 8061B500-8061B504 000048 0004+00 0/2 0/0 0/0 .bss             moveSW */

src/d/actor/d_a_b_oh.cpp

@@ -8,6 +8,8 @@
  * things like cCcD_ShapeAttr, dCcD/cCcD_Stts, etc
  */
 
+#include "d/dolzel_rel.h"
+
 #include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
@@ -196,101 +198,8 @@ static int daB_OH_Draw(b_oh_class* i_this) {
     return 1;
 }
 
-/* 8061DB78-8061DB7C 000008 0001+03 2/2 0/0 0/0 .bss             @1109 */
-static u8 lit_1109[1 + 3 /* padding */];
-
-/* 8061DB7C-8061DB80 00000C 0001+03 0/0 0/0 0/0 .bss             @1107 */
-#pragma push
-#pragma force_active on
-static u8 lit_1107[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DB80-8061DB84 000010 0001+03 0/0 0/0 0/0 .bss             @1105 */
-#pragma push
-#pragma force_active on
-static u8 lit_1105[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DB84-8061DB88 000014 0001+03 0/0 0/0 0/0 .bss             @1104 */
-#pragma push
-#pragma force_active on
-static u8 lit_1104[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DB88-8061DB8C 000018 0001+03 0/0 0/0 0/0 .bss             @1099 */
-#pragma push
-#pragma force_active on
-static u8 lit_1099[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DB8C-8061DB90 00001C 0001+03 0/0 0/0 0/0 .bss             @1097 */
-#pragma push
-#pragma force_active on
-static u8 lit_1097[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DB90-8061DB94 000020 0001+03 0/0 0/0 0/0 .bss             @1095 */
-#pragma push
-#pragma force_active on
-static u8 lit_1095[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DB94-8061DB98 000024 0001+03 0/0 0/0 0/0 .bss             @1094 */
-#pragma push
-#pragma force_active on
-static u8 lit_1094[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DB98-8061DB9C 000028 0001+03 0/0 0/0 0/0 .bss             @1057 */
-#pragma push
-#pragma force_active on
-static u8 lit_1057[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DB9C-8061DBA0 00002C 0001+03 0/0 0/0 0/0 .bss             @1055 */
-#pragma push
-#pragma force_active on
-static u8 lit_1055[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DBA0-8061DBA4 000030 0001+03 0/0 0/0 0/0 .bss             @1053 */
-#pragma push
-#pragma force_active on
-static u8 lit_1053[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DBA4-8061DBA8 000034 0001+03 0/0 0/0 0/0 .bss             @1052 */
-#pragma push
-#pragma force_active on
-static u8 lit_1052[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DBA8-8061DBAC 000038 0001+03 0/0 0/0 0/0 .bss             @1014 */
-#pragma push
-#pragma force_active on
-static u8 lit_1014[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DBAC-8061DBB0 00003C 0001+03 0/0 0/0 0/0 .bss             @1012 */
-#pragma push
-#pragma force_active on
-static u8 lit_1012[1 + 3 /* padding */];
-#pragma pop
-
-/* 8061DBB0-8061DBB4 000040 0001+03 0/0 0/0 0/0 .bss             @1010 */
-#pragma push
-#pragma force_active on
-static u8 lit_1010[1 + 3 /* padding */];
-#pragma pop
-
 /* 8061DBB4-8061DBB8 -00001 0004+00 1/2 0/0 0/0 .bss             None */
-/* 8061DBB4 0001+00 data_8061DBB4 @1009 */
 /* 8061DBB5 0003+00 data_8061DBB5 None */
-#pragma push
-#pragma force_active on
-static u8 struct_8061DBB4;
-#pragma pop
-
 static u8 data_8061DBB5;
 
 /* 8061DBC4-8061DBD4 000054 0010+00 2/3 0/0 0/0 .bss             l_HIO */
@@ -1206,4 +1115,4 @@ SECTION_DATA extern void* g_profile_B_OH[12] = {
     (void*)NULL,       (void*)&g_fopAc_Method,
     (void*)0x00DA0000, (void*)&l_daB_OH_Method,
     (void*)0x00044000, (void*)0x020E0000,
-};
+};

src/d/actor/d_a_b_oh2.cpp

@@ -3,6 +3,8 @@
  * Morpheel Tentacle
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_oh2.h"
 #include "d/actor/d_a_b_ob.h"
 #include "SSystem/SComponent/c_math.h"

src/d/actor/d_a_b_tn.cpp

@@ -1,18 +1,38 @@
 /**
- * @file d_a_b_tn.cpp
+* @file d_a_b_tn.cpp
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_tn.h"
 #include <cmath.h>
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/actor/d_a_boomerang.h"
 #include "d/actor/d_a_nbomb.h"
 
-UNK_REL_DATA;
-
 #include "f_op/f_op_actor_enemy.h"
 
+class daB_TN_HIO_c {
+public:
+    /* 8061EBEC */ daB_TN_HIO_c();
+    /* 8062D98C */ virtual ~daB_TN_HIO_c() {};
+
+    /* 0x04 */ s8 mUnk1;
+    /* 0x08 */ f32 mScale;
+    /* 0x0C */ f32 mKColorA;
+    /* 0x10 */ f32 mTimer3Wolf;
+    /* 0x14 */ f32 mTimer3HumanType0;
+    /* 0x18 */ f32 mTimer3HumanType1;
+    /* 0x1C */ f32 mTimer3NormalType0;
+    /* 0x20 */ f32 mTimer3NormalType1;
+    /* 0x24 */ f32 field_0x24;
+    /* 0x28 */ f32 mTimer1Action1;
+    /* 0x2C */ f32 mTimer1Action2;
+};
+
+STATIC_ASSERT(sizeof(daB_TN_HIO_c) == 0x30);
+
 enum B_TN_RES_FILE_ID {
     /* BCK */
     /* 0x04 */ BCK_TN2B_DIE = 4,
@@ -339,9 +359,6 @@ void daB_TN_c::calcWaistAngle() {
     cLib_addCalcAngleS2(&mWaistAngle, sVar1, 4, 0x1000);
 }
 
-/* .bss     None */
-UNK_REL_BSS;
-
 /* 8062F01D 0003+00 data_8062F01D None */
 static u8 s_hioinit;
 
@@ -1123,45 +1140,45 @@ u32 daB_TN_c::getCutType() {
     }
 
     switch (daPy_getPlayerActorClass()->getCutType()) {
-    case 0x0:
+    case daPy_py_c::CUT_TYPE_TURN_LEFT:
+    case daPy_py_c::CUT_TYPE_TURN_RIGHT:
         if (mTimer13 == 0) {
-            return 32;
+            return 0x20;
         }
 
-        return rv | 32;
+        return rv | 0x20;
+
+    case daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT:
+    case daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT:
+        return rv | 0x20;
+
+    case daPy_py_c::CUT_TYPE_JUMP:
+    case daPy_py_c::CUT_TYPE_LARGE_JUMP:
+        return rv | 0x10;
+
+    case daPy_py_c::CUT_TYPE_TWIRL:
+        return rv | 0x22;
 
     case daPy_py_c::CUT_TYPE_NM_VERTICAL:
     case daPy_py_c::CUT_TYPE_NM_RIGHT:
     case daPy_py_c::CUT_TYPE_FINISH_LEFT:
     case daPy_py_c::CUT_TYPE_FINISH_VERTICAL:
     case daPy_py_c::CUT_TYPE_DASH_UNK_26:
-        return rv | 32;
+        return rv | 0x12;
 
     case daPy_py_c::CUT_TYPE_NM_STAB:
     case daPy_py_c::CUT_TYPE_FINISH_STAB:
-        return rv | 16;
+        return rv | 0x02;
 
     case daPy_py_c::CUT_TYPE_NM_LEFT:
     case daPy_py_c::CUT_TYPE_DASH_UNK_25:
-        return rv | 34;
+        return rv | 0x21;
 
-    case daPy_py_c::CUT_TYPE_TURN_RIGHT:
-    case daPy_py_c::CUT_TYPE_TURN_LEFT:
-        return rv | 18;
-
-    case daPy_py_c::CUT_TYPE_JUMP:
-    case daPy_py_c::CUT_TYPE_LARGE_JUMP:
-        return rv | 2;
-
-    case daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT:
-    case daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT:
-        return rv | 33;
-
-    case daPy_py_c::CUT_TYPE_TWIRL:
-        return rv | 1;
+    case daPy_py_c::CUT_TYPE_COMBO_STAB:
+        return rv | 0x01;
 
     default:
-        return rv | 3;
+        return rv | 0x03;
     }
 }
 

src/d/actor/d_a_b_yo.cpp

@@ -4,6 +4,8 @@
  * 
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_yo.h"
 #include "SSystem/SComponent/c_math.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -20,6 +22,30 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
+class daB_YO_HIO_c {
+public:
+    /* 8062F46C */ daB_YO_HIO_c();
+    /* 806395E4 */ virtual ~daB_YO_HIO_c() {}
+
+    /* 0x04 */ s8 field_0x4;
+    /* 0x08 */ f32 mScale[8];
+    /* 0x28 */ f32 mFreezardNum;
+    /* 0x2C */ f32 mMaxFallSpeed;
+    /* 0x30 */ f32 mReboundSpeedRatio;
+    /* 0x34 */ f32 mChaseSpeed;
+    /* 0x38 */ f32 mReboundSpeedMax;
+    /* 0x3C */ bool field_0x3c;
+    /* 0x40 */ f32 mGatherTimer;
+    /* 0x44 */ f32 mAttackTimer;
+    /* 0x48 */ f32 mFreezardRadius;
+    /* 0x4C */ f32 field_0x4c;
+    /* 0x50 */ f32 field_0x50;
+    /* 0x54 */ bool field_0x54;
+    /* 0x58 */ f32 field_0x58;
+};
+
+STATIC_ASSERT(sizeof(daB_YO_HIO_c) == 0x5C);
+
 enum B_YO_RES_FILE_ID {
     /* BCK */
     /* 0x07 */ BCK_YKW_B_ANGRY = 7,
@@ -94,16 +120,12 @@ enum L5_R50_RES_FIL_ID {
     /* 0x0A */ DZB_R50_P2,
 };
 
-UNK_REL_BSS;
-
 /* 80639F74 0001+00 data_80639F74 @1009 */
 static bool hioInit;
 
 /* 80639F84-80639FE0 000054 005C+00 12/13 0/0 0/0 .bss             l_HIO */
 static daB_YO_HIO_c l_HIO;
 
-UNK_REL_DATA;
-
 namespace {
 
 /* 80639A80-80639AC4 000020 0044+00 0/1 0/0 0/0 .data            cc_yo_src__22@unnamed@d_a_b_yo_cpp@ */

src/d/actor/d_a_b_yo_ice.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_yo_ice.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_math.h"
@@ -13,20 +15,17 @@
 #include "d/d_camera.h"
 #include "d/d_com_inf_game.h"
 
-/* 8063DDA4-8063DDB0 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+class daB_YOI_HIO_c {
+public:
+    /* 8063A14C */ daB_YOI_HIO_c();
+    /* 8063DBD0 */ virtual ~daB_YOI_HIO_c() {}
+
+    /* 0x4 */ s8 field_0x4;
+    /* 0x8 */ f32 mScaleY;
+    /* 0xC */ f32 mScaleXZ;
 };
 
-/* 8063DDB0-8063DDC4 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
+STATIC_ASSERT(sizeof(daB_YOI_HIO_c) == 0x10);
 
 /* 8063DFE8-8063DFEC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;

src/d/actor/d_a_b_zant.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_zant.h"
 #include "d/actor/d_a_b_zant_mobile.h"
 #include "d/actor/d_a_nbomb.h"
@@ -95,8 +97,6 @@ static u8 const lit_3757[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-UNK_REL_DATA
-
 namespace {
 /* 8064EEAC-8064EEEC 000020 0040+00 0/1 0/0 0/0 .data            cc_zant_src__24@unnamed@d_a_b_zant_cpp@ */
 dCcD_SrcSph cc_zant_src = {
@@ -418,26 +418,8 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) {
     }
 }
 
-UNK_BSS(1109)
-UNK_BSS(1107)
-UNK_BSS(1105)
-UNK_BSS(1104)
-UNK_BSS(1099)
-UNK_BSS(1097)
-UNK_BSS(1095)
-UNK_BSS(1094)
-UNK_BSS(1057)
-UNK_BSS(1055)
-UNK_BSS(1053)
-UNK_BSS(1052)
-UNK_BSS(1014)
-UNK_BSS(1012)
-UNK_BSS(1010)
-
 /* 8064F5F4-8064F5F8 -00001 0004+00 2/2 0/0 0/0 .bss             None */
-/* 8064F5F4 0001+00 data_8064F5F4 @1009 */
 /* 8064F5F5 0003+00 l_initHIO None */
-static u8 data_8064F5F4;
 static u8 l_initHIO;
 
 /* 8064F604-8064F648 000054 0044+00 12/13 0/0 0/0 .bss             l_HIO */

src/d/actor/d_a_b_zant_magic.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_zant_magic.h"
 #include "d/actor/d_a_b_zant.h"
 #include "d/d_com_inf_game.h"
@@ -21,8 +23,6 @@ static int daB_ZANTM_Draw(daB_ZANTM_c* i_this) {
     return i_this->draw();
 }
 
-UNK_REL_DATA
-
 namespace {
 /* 80650508-80650554 000020 004C+00 0/1 0/0 0/0 .data            cc_zant_src__30@unnamed@d_a_b_zant_magic_cpp@ */
 dCcD_SrcCps cc_zant_src = {

src/d/actor/d_a_b_zant_mobile.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_zant_mobile.h"
 #include "d/actor/d_a_b_zant.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_b_zant_sima.cpp

@@ -3,6 +3,8 @@
  * Boss Zant Lava Island
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_b_zant_sima.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/actor/d_a_obj_msima.h"

src/d/actor/d_a_balloon_2D.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_balloon_2D.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
@@ -16,6 +18,130 @@
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_lib.h"
 
+class daBalloon2D_HIO_c : public mDoHIO_entry_c {
+public:
+    inline daBalloon2D_HIO_c() {
+        static param aParam = {
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0.0f,
+            1.0f,
+            0.0f,
+            -10.0f,
+            0.8f,
+            0.0f,
+            -13.0f,
+            1.1f,
+            0.9f,
+            0.7f,
+            0.0f,
+            18.0f,
+            1.0f,
+            -6.6f,
+            6.6f,
+            1.3f,
+            -1.3f,
+            9.2f,
+            1.0f,
+            0.0f,
+            6.6f,
+            1.1f,
+            0.9f,
+            1.0f,
+            3.9f,
+            -9.2f,
+            0.85f,
+            0.8f,
+            6.6f,
+            1.3f,
+            0.75f,
+            0.9f,
+            3.9f,
+            0.0f,
+            0.85f,
+            0.9f,
+            3.9f,
+            0.0f,
+            0.95f,
+            0.9f,
+            22.0f,
+            -17.0f,
+            1.0f,
+            20.0f,
+        };
+        memcpy(&m, &aParam, sizeof(aParam));
+    }
+    /* 806553A8 */ virtual ~daBalloon2D_HIO_c() {}
+
+#if DEBUG
+    void genMessage(JORMContext*);
+
+#endif
+
+    void resetAddScoreSetFlag();
+
+    struct param {
+        /* 0x04 */ u8 mAdjustmentToggle;
+        /* 0x08 */ s32 mScore;
+        /* 0x0C */ u8 mComboCount;
+        /* 0x0D */ u8 mBalloonSize;
+        /* 0x0E */ u8 mOverheadScoreToggle;
+        /* 0x10 */ s32 mOverheadScore;
+        /* 0x14 */ s32 field_0x14;
+        /* 0x18 */ f32 field_0x1c;
+        /* 0x1C */ f32 field_0x20;
+        /* 0x20 */ f32 mScorePosX;
+        /* 0x24 */ f32 mScorePosY;
+        /* 0x28 */ f32 mScoreSize;
+        /* 0x2C */ f32 m5DNumberPosX;
+        /* 0x30 */ f32 m5DNumberPosY;
+        /* 0x34 */ f32 m5DNumberSizeX;
+        /* 0x38 */ f32 m5DNumberSizeY;
+        /* 0x3C */ f32 m5DNumberAlpha;
+        /* 0x40 */ f32 m5DNumber2PosX;
+        /* 0x44 */ f32 m5DNumber2PosY;
+        /* 0x48 */ f32 m5DNumber2Size;
+        /* 0x4C */ f32 mUnkPosX;
+        /* 0x50 */ f32 mUnkPosY;
+        /* 0x54 */ f32 mUnkSize;
+        /* 0x58 */ f32 mComboPosX;
+        /* 0x5C */ f32 mComboPosY;
+        /* 0x60 */ f32 mComboSize;
+        /* 0x64 */ f32 m2DNumberPosX;
+        /* 0x68 */ f32 m2DNumberPosY;
+        /* 0x6C */ f32 m2DNumberSizeX;
+        /* 0x70 */ f32 m2DNumberSizeY;
+        /* 0x74 */ f32 field_0x78;
+        /* 0x78 */ f32 m2DNumberComboPosX;
+        /* 0x7C */ f32 m2DNumberComboPosY;
+        /* 0x80 */ f32 m2DNumberComboSize;
+        /* 0x84 */ f32 m2DNumberComboAlpha;
+        /* 0x88 */ f32 mBalloonLargePosX;
+        /* 0x8C */ f32 mBalloonLargePosY;
+        /* 0x90 */ f32 mBalloonLargeSize;
+        /* 0x94 */ f32 mBalloonLargeAlpha;
+        /* 0x98 */ f32 mBalloonMedPosX;
+        /* 0x9C */ f32 mBalloonMedPosY;
+        /* 0xA0 */ f32 mBalloonMedSize;
+        /* 0xA4 */ f32 mBalloonMedAlpha;
+        /* 0xA8 */ f32 mBalloonSmallPosX;
+        /* 0xAC */ f32 mBalloonSmallPosY;
+        /* 0xB0 */ f32 mBalloonSmallSize;
+        /* 0xB4 */ f32 mBalloonSmallAlpha;
+        /* 0xB8 */ f32 m2DNumberCombo2PosX;
+        /* 0xBC */ f32 m2DNumberCombo2PosY;
+        /* 0xC0 */ f32 m2DNumberCombo2Size;
+        /* 0xC4 */ f32 m2DNumberCombo2PosX43;
+    };
+
+    param m;
+};
+
 /* 806534CC-80653518 0000EC 004C+00 1/0 0/0 0/0 .text            draw__Q213daBalloon2D_c6c_listFv */
 void daBalloon2D_c::c_list::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
@@ -455,63 +581,6 @@ void daBalloon2D_c::setHIO(bool param_1) {
     }
 }
 
-daBalloon2D_HIO_c::daBalloon2D_HIO_c() {
-    static param aParam = {
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0.0f,
-        1.0f,
-        0.0f,
-        -10.0f,
-        0.8f,
-        0.0f,
-        -13.0f,
-        1.1f,
-        0.9f,
-        0.7f,
-        0.0f,
-        18.0f,
-        1.0f,
-        -6.6f,
-        6.6f,
-        1.3f,
-        -1.3f,
-        9.2f,
-        1.0f,
-        0.0f,
-        6.6f,
-        1.1f,
-        0.9f,
-        1.0f,
-        3.9f,
-        -9.2f,
-        0.85f,
-        0.8f,
-        6.6f,
-        1.3f,
-        0.75f,
-        0.9f,
-        3.9f,
-        0.0f,
-        0.85f,
-        0.9f,
-        3.9f,
-        0.0f,
-        0.95f,
-        0.9f,
-        22.0f,
-        -17.0f,
-        1.0f,
-        20.0f,
-    };
-    memcpy(&m, &aParam, sizeof(aParam));
-}
-
 void daBalloon2D_HIO_c::resetAddScoreSetFlag() {
     JORMContext* ctx = attachJORMContext(8);
     ctx->startUpdateNode(this);
@@ -552,11 +621,6 @@ static int daBalloon2D_draw(daBalloon2D_c* i_this) {
     return i_this->draw();
 }
 
-/* 806553A8-80655404 001FC8 005C+00 2/1 0/0 0/0 .text            __dt__17daBalloon2D_HIO_cFv */
-daBalloon2D_HIO_c::~daBalloon2D_HIO_c() {
-    // NONMATCHING
-}
-
 #if DEBUG
 void daBalloon2D_HIO_c::genMessage(JORMContext* ctx) {
     ctx->genCheckBox("調整ＯＮ", &m.mAdjustmentToggle, 1, 0, NULL, 0xffff,
@@ -679,11 +743,6 @@ void daBalloon2D_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80655494-80655524 0020B4 0090+00 1/0 0/0 0/0 .text            __dt__13daBalloon2D_cFv */
-daBalloon2D_c::~daBalloon2D_c() {
-    // NONMATCHING
-}
-
 /* ############################################################################################## */
 /* 806556D8-806556F8 -00001 0020+00 1/0 0/0 0/0 .data            daBalloon2D_METHODS */
 static actor_method_class daBalloon2D_METHODS = {

src/d/actor/d_a_bd.cpp

@@ -1,8 +1,10 @@
 /**
- * @file d_a_bd.cpp
+* @file d_a_bd.cpp
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_bd.h"
 #include "d/actor/d_a_cow.h"
 #include "d/actor/d_a_horse.h"
@@ -10,7 +12,6 @@
 #include "d/d_cc_d.h"
 #include "d/d_s_play.h"
 #include "Z2AudioLib/Z2Instances.h"
-UNK_REL_BSS
 
 /* ############################################################################################## */
 

src/d/actor/d_a_bg.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_bg.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_com_static.h"

src/d/actor/d_a_bg_obj.cpp

@@ -3,200 +3,16 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_bg_obj.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "stdio.h"
-#include "dol2asm.h"
 #include "dolphin/os.h"
 #include "d/actor/d_a_set_bgobj.h"
 #include "d/d_s_play.h"
 #include "SSystem/SComponent/c_math.h"
 
-SECTION_DATA extern void* __vt__10cCcD_GStts[3];
-SECTION_DATA extern void* __vt__10dCcD_GStts[3];
-SECTION_DATA extern void* __vt__8cM3dGPla[3];
-SECTION_DATA extern void* __vt__8cM3dGTri[3];
-SECTION_DATA extern void* __vt__8cM3dGCyl[3];
-SECTION_DATA extern void* __vt__8cM3dGAab[3];
-SECTION_DATA extern void* __vt__9daBgObj_c[10];
-SECTION_DATA extern void* __vt__12J3DFrameCtrl[3];
-
-//
-// Forward References:
-//
-
-extern "C" static void getBmdName__Fii();
-extern "C" static void getBtkName__Fii();
-extern "C" static void getBrkName__Fii();
-extern "C" static void getDzbName__Fi();
-extern "C" void initParticleBlock__Q29daBgObj_c11spec_data_cFPUc();
-extern "C" void initSoundBlock__Q29daBgObj_c11spec_data_cFPUc();
-extern "C" void initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc();
-extern "C" void initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc();
-extern "C" void Set__Q29daBgObj_c11spec_data_cFPv();
-extern "C" void release__9daBgObj_cFP4dBgW();
-extern "C" void regist__9daBgObj_cFP4dBgW();
-extern "C" void initAtt__9daBgObj_cFv();
-extern "C" void setAttentionInfo__9daBgObj_cFP10fopAc_ac_c();
-extern "C" void initBaseMtx__9daBgObj_cFv();
-extern "C" void setBaseMtx__9daBgObj_cFv();
-extern "C" void settingCullSizeBoxForCo__9daBgObj_cFi();
-extern "C" void settingCullSizeBoxForCull__9daBgObj_cFi();
-extern "C" void CreateInitType0__9daBgObj_cFv();
-extern "C" void CreateInitType1__9daBgObj_cFv();
-extern "C" void Create__9daBgObj_cFv();
-extern "C" void CreateHeapType0__9daBgObj_cFv();
-extern "C" void __dt__12J3DFrameCtrlFv();
-extern "C" void CreateHeapType1__9daBgObj_cFv();
-extern "C" void doShareTexture__9daBgObj_cFv();
-extern "C" void CreateHeap__9daBgObj_cFv();
-extern "C" void create1st__9daBgObj_cFv();
-extern "C" void setColCommon__9daBgObj_cFv();
-extern "C" void set_tri_0__9daBgObj_cFv();
-extern "C" void set_tri_1__9daBgObj_cFv();
-extern "C" void set_cyl_0__9daBgObj_cFv();
-extern "C" void set_tri_2__9daBgObj_cFv();
-extern "C" void set_tri_3__9daBgObj_cFv();
-extern "C" void setParticle__9daBgObj_cFv();
-extern "C" void setSe__9daBgObj_cFv();
-extern "C" void checkDestroy__9daBgObj_cFv();
-extern "C" void checkHitAt__9daBgObj_cFP8cCcD_Obj();
-extern "C" void orderWait_tri__9daBgObj_cFv();
-extern "C" void orderWait_cyl__9daBgObj_cFv();
-extern "C" void orderWait_spec__9daBgObj_cFv();
-extern "C" void actionOrderWait__9daBgObj_cFv();
-extern "C" void actionOrder__9daBgObj_cFv();
-extern "C" void actionEvent__9daBgObj_cFv();
-extern "C" bool actionWait__9daBgObj_cFv();
-extern "C" void ExecuteType0__9daBgObj_cFv();
-extern "C" void ExecuteType1__9daBgObj_cFv();
-extern "C" void Execute__9daBgObj_cFPPA3_A4_f();
-extern "C" void Draw__9daBgObj_cFv();
-extern "C" void indirectProc__9daBgObj_cFP8J3DModel();
-extern "C" void Delete__9daBgObj_cFv();
-extern "C" static void daBgObj_create1st__FP9daBgObj_c();
-extern "C" void __dt__8cM3dGCylFv();
-extern "C" void __dt__8cM3dGAabFv();
-extern "C" void __dt__8dCcD_TriFv();
-extern "C" void __ct__8dCcD_TriFv();
-extern "C" void __dt__8cM3dGTriFv();
-extern "C" void __dt__8cM3dGPlaFv();
-extern "C" void __dt__10dCcD_GSttsFv();
-extern "C" static void daBgObj_MoveBGDelete__FP9daBgObj_c();
-extern "C" static void daBgObj_MoveBGExecute__FP9daBgObj_c();
-extern "C" static void daBgObj_MoveBGDraw__FP9daBgObj_c();
-extern "C" void __dt__10cCcD_GSttsFv();
-extern "C" void __sinit_d_a_bg_obj_cpp();
-extern "C" extern char const* const d_a_bg_obj__stringBase0;
-extern "C" u8 mCreateHeapFunc__9daBgObj_c[48];
-extern "C" u8 mCreateInitFunc__9daBgObj_c[48];
-extern "C" u8 mExecuteFunc__9daBgObj_c[48];
-extern "C" u8 mTgSetFunc__9daBgObj_c[60];
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_YrotS__FPA4_fs();
-extern "C" void mDoMtx_YrotM__FPA4_fs();
-extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
-extern "C" void play__14mDoExt_baseAnmFv();
-extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss();
-extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef();
-extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss();
-extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef();
-extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
-extern "C" void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData();
-extern "C" void mDoExt_setupStageTexture__FP12J3DModelData();
-extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
-extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
-extern "C" void fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv();
-extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
-extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs();
-extern "C" void fpcM_Execute__FPv();
-extern "C" void fpcSch_JudgeByID__FPvPv();
-extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
-extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
-extern "C" void dComIfGp_getReverb__Fi();
-extern "C" void getArcName__12daSetBgObj_cFP10fopAc_ac_c();
-extern "C" void onSwitch__10dSv_info_cFii();
-extern "C" void isSwitch__10dSv_info_cCFii();
-extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
-extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc();
-extern "C" void reset__14dEvt_control_cFv();
-extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc();
-extern "C" void endCheck__16dEvent_manager_cFs();
-extern "C" void
-setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc();
-extern "C" void
-set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
-extern "C" void StartShock__12dVibration_cFii4cXyz();
-extern "C" void Release__4cBgSFP9dBgW_Base();
-extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
-extern "C" void __ct__16dBgS_MoveBgActorFv();
-extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
-extern "C" bool ToFore__16dBgS_MoveBgActorFv();
-extern "C" bool ToBack__16dBgS_MoveBgActorFv();
-extern "C" void
-MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
-extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
-extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
-extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f();
-extern "C" void __ct__4dBgWFv();
-extern "C" void Move__4dBgWFv();
-extern "C" void GetAc__22dCcD_GAtTgCoCommonBaseFv();
-extern "C" void __ct__10dCcD_GSttsFv();
-extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
-extern "C" void __ct__12dCcD_GObjInfFv();
-extern "C" void __dt__12dCcD_GObjInfFv();
-extern "C" void ChkTgHit__12dCcD_GObjInfFv();
-extern "C" void GetTgHitObj__12dCcD_GObjInfFv();
-extern "C" void Set__8dCcD_TriFRC11dCcD_SrcTri();
-extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
-extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
-extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
-extern "C" void dKy_bg_MAxx_proc__FPv();
-extern "C" void Set__4cCcSFP8cCcD_Obj();
-extern "C" void __mi__4cXyzCFRC3Vec();
-extern "C" void cM_atan2s__Fff();
-extern "C" void ChkUsed__9cBgW_BgIdCFv();
-extern "C" void SetC__8cM3dGCylFRC4cXyz();
-extern "C" void SetH__8cM3dGCylFf();
-extern "C" void SetR__8cM3dGCylFf();
-extern "C" void setPos__8cM3dGTriFPC3VecPC3VecPC3Vec();
-extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f();
-extern "C" void init__12J3DFrameCtrlFs();
-extern "C" void __construct_array();
-extern "C" void __ptmf_scall();
-extern "C" void _savegpr_21();
-extern "C" void _savegpr_23();
-extern "C" void _savegpr_24();
-extern "C" void _savegpr_25();
-extern "C" void _savegpr_27();
-extern "C" void _savegpr_28();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_21();
-extern "C" void _restgpr_23();
-extern "C" void _restgpr_24();
-extern "C" void _restgpr_25();
-extern "C" void _restgpr_27();
-extern "C" void _restgpr_28();
-extern "C" void _restgpr_29();
-extern "C" extern void* __vt__8dCcD_Cyl[36];
-extern "C" extern void* __vt__8dCcD_Tri[36];
-extern "C" extern void* __vt__9dCcD_Stts[11];
-extern "C" extern void* __vt__12cCcD_CylAttr[25];
-extern "C" extern void* __vt__12cCcD_TriAttr[25];
-extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
-extern "C" extern void* __vt__9cCcD_Stts[8];
-extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" u8 mStatus__20dStage_roomControl_c[65792];
-extern "C" u8 mEcallback__18dPa_modelEcallBack[4];
-extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
-
 //
 // Declarations:
 //
@@ -256,6 +72,10 @@ static const char* getDzbName(int param_0) {
     return l_dzbName;
 }
 
+static const char* dummy() {
+    return "spec.dat";
+}
+
 /* 804597E8-80459814 000208 002C+00 1/1 0/0 0/0 .text
  * initParticleBlock__Q29daBgObj_c11spec_data_cFPUc             */
 u8* daBgObj_c::spec_data_c::initParticleBlock(u8* i_dataPtr) {
@@ -309,13 +129,6 @@ u8* daBgObj_c::spec_data_c::initFarInfoBlock(u8* i_dataPtr) {
     return i_dataPtr + 8;
 }
 
-/* ############################################################################################## */
-/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_8045CA7D = "spec.dat";
-#pragma pop
-
 /* 80459904-80459B64 000324 0260+00 1/1 0/0 1/1 .text            Set__Q29daBgObj_c11spec_data_cFPv
  */
 // NONMATCHING - close-ish
@@ -697,25 +510,6 @@ int daBgObj_c::CreateInitType1() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 8045CAC4-8045CAD0 000000 000C+00 2/2 0/0 0/0 .data            cNullVec__6Z2Calc */
-SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 8045CAD0-8045CAE4 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-#pragma pop
-
 /* 8045CAE4-8045CB38 000020 0054+00 4/4 0/0 0/0 .data            l_tri_src */
 static dCcD_SrcTri l_tri_src = {
     {
@@ -734,10 +528,10 @@ static dCcD_SrcTri l_tri_src = {
 };
 
 /* 8045CB38-8045CB3C -00001 0004+00 1/1 0/0 0/0 .data            l_specName */
-SECTION_DATA static const char* const l_specName = "spec.dat";
+static char* l_specName = "spec.dat";
 
 /* 8045CB6C-8045CB9C 0000A8 0030+00 1/2 0/0 0/0 .data            mCreateHeapFunc__9daBgObj_c */
-SECTION_DATA createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
+createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
     &daBgObj_c::CreateHeapType0,
     &daBgObj_c::CreateHeapType1,
     &daBgObj_c::CreateHeapType1,
@@ -745,7 +539,7 @@ SECTION_DATA createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
 };
 
 /* 8045CBCC-8045CBFC 000108 0030+00 1/2 0/0 0/0 .data            mCreateInitFunc__9daBgObj_c */
-SECTION_DATA createInitFunc daBgObj_c::mCreateInitFunc[] = {
+createInitFunc daBgObj_c::mCreateInitFunc[] = {
     &daBgObj_c::CreateInitType0,
     &daBgObj_c::CreateInitType1,
     &daBgObj_c::CreateInitType1,
@@ -758,7 +552,7 @@ int daBgObj_c::Create() {
 }
 
 /* 8045CC2C-8045CC5C 000168 0030+00 1/2 0/0 0/0 .data            mExecuteFunc__9daBgObj_c */
-SECTION_DATA executeFunc daBgObj_c::mExecuteFunc[] = {
+executeFunc daBgObj_c::mExecuteFunc[] = {
     &daBgObj_c::ExecuteType0,
     &daBgObj_c::ExecuteType1,
     &daBgObj_c::ExecuteType1,
@@ -766,7 +560,7 @@ SECTION_DATA executeFunc daBgObj_c::mExecuteFunc[] = {
 };
 
 /* 8045CC98-8045CCD4 0001D4 003C+00 1/2 0/0 0/0 .data            mTgSetFunc__9daBgObj_c */
-SECTION_DATA tgSetFunc daBgObj_c::mTgSetFunc[] = {
+tgSetFunc daBgObj_c::mTgSetFunc[] = {
     &daBgObj_c::set_tri_0, &daBgObj_c::set_tri_1, &daBgObj_c::set_cyl_0,
     &daBgObj_c::set_tri_2, &daBgObj_c::set_tri_3,
 };

src/d/actor/d_a_boomerang.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_boomerang.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "d/actor/d_a_alink.h"
@@ -820,9 +822,6 @@ JPABaseEmitter* daBoomerang_c::setEffectTraceMatrix(u32* i_emitterID, u16 i_name
     return emitter;
 }
 
-UNK_REL_DATA;
-UNK_REL_BSS;
-
 /* 804A2D10-804A2D14 000040 0001+03 0/0 0/0 0/0 .bss             l_HIO */
 static daBoomerang_HIO_c0 l_HIO;
 

src/d/actor/d_a_bullet.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_bullet.h"
 #include "d/d_com_inf_game.h"
 

src/d/actor/d_a_canoe.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_canoe.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_meter2_info.h"
@@ -551,8 +553,6 @@ void daCanoe_c::frontBackBgCheck() {
     }
 }
 
-UNK_REL_BSS
-
 /* 804DC330-804DC554 001ED0 0224+00 1/1 0/0 0/0 .text            setPaddleEffect__9daCanoe_cFv */
 void daCanoe_c::setPaddleEffect() {
     static cXyz paddleRippleScale(0.7f, 0.7f, 0.7f);

src/d/actor/d_a_coach_2D.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_coach_2D.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_meter2_info.h"
@@ -11,6 +13,86 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 
+class daCoach2D_HIO_c : public mDoHIO_entry_c {
+public:
+    struct Param {
+        /* 0x00 */ f32 pos_x;
+        /* 0x04 */ f32 pos_y;
+        /* 0x08 */ f32 size;
+        /* 0x0C */ f32 alpha;
+        /* 0x10 */ f32 icon_space_x;
+        /* 0x14 */ f32 icon_pos_x;
+        /* 0x18 */ f32 icon_pos_y;
+        /* 0x1C */ f32 icon_size;
+        /* 0x20 */ f32 icon_alpha;
+        /* 0x24 */ f32 coach_pos_x;
+        /* 0x28 */ f32 coach_pos_y;
+        /* 0x2C */ f32 coach_size;
+        /* 0x30 */ f32 coach_alpha;
+        /* 0x34 */ f32 blink_speed_min;
+        /* 0x38 */ f32 blink_speed_max;
+        /* 0x3C */ f32 pikari_scale;
+        /* 0x40 */ f32 pikari_anim_speed;
+        /* 0x44 */ u8 pikari_moyaR0_R;
+        /* 0x45 */ u8 pikari_moyaR0_G;
+        /* 0x46 */ u8 pikari_moyaR0_B;
+        /* 0x47 */ u8 pikari_moyaR0_A;
+        /* 0x48 */ u8 pikari_moyaR1_R;
+        /* 0x49 */ u8 pikari_moyaR1_G;
+        /* 0x4A */ u8 pikari_moyaR1_B;
+        /* 0x4B */ u8 pikari_moyaR1_A;
+        /* 0x4C */ u8 unk_0x4C;
+        /* 0x4D */ u8 unk_0x4D;
+        /* 0x4E */ u8 unk_0x4E;
+        /* 0x4F */ u8 unk_0x4F;
+        /* 0x50 */ u8 unk_0x50;
+        /* 0x51 */ u8 unk_0x51;
+        /* 0x52 */ u8 unk_0x52;
+        /* 0x53 */ u8 unk_0x53;
+        /* 0x54 */ u8 debug_ON;
+        /* 0x55 */ u8 max_damage_num;
+        /* 0x56 */ u8 now_damage_num;
+        /* 0x57 */ u8 reverse_flag;
+    };
+
+    daCoach2D_HIO_c() {
+        static Param aParam = {
+            45.0f,
+            -15.0f,
+            1.0f,
+            1.0f,
+            7.5f,
+            -6.5f,
+            0.0f,
+            0.5f,
+            1.0f,
+            0.0f,
+            0.0f,
+            1.0f,
+            1.0f,
+            1.0f,
+            5.0f,
+            3.0f,
+            8.0f,
+            0xFF, 0xFF, 0xFF, 0xB9,
+            0x00, 0x9B, 0x00, 0x00,
+            0xFF, 0xFF, 0xFF, 0x57,
+            0x00, 0x73, 0x00, 0x00,
+            false,
+            20,
+            0,
+            1,
+        };
+
+        memcpy(&param, &aParam, sizeof(Param));
+    }
+
+    /* 80657738 */ virtual ~daCoach2D_HIO_c() {}
+    void genMessage(JORMContext*) {}
+
+    /* 0x4 */ Param param;
+};
+
 /* 806569CC-80656A18 0000EC 004C+00 1/0 0/0 0/0 .text            draw__Q211daCoach2D_c6c_listFv */
 void daCoach2D_c::c_list::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();

src/d/actor/d_a_coach_fire.cpp

@@ -1,8 +1,10 @@
 /**
- * @file d_a_coach_fire.cpp
+* @file d_a_coach_fire.cpp
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_coach_fire.h"
 
 /* 806583E8-806583F8 000000 0010+00 3/3 0/0 0/0 .rodata          M_attr__13daCoachFire_c */

src/d/actor/d_a_cow.cpp

@@ -1,8 +1,10 @@
 /**
- * @file d_a_cow.cpp
+* @file d_a_cow.cpp
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_cow.h"
 #include "SSystem/SComponent/c_lib.h"
 #include "Z2AudioLib/Z2Instances.h"
@@ -34,10 +36,7 @@
         (val) = (min);                                                                             \
     }
 
-#define CLAMP_COW_BODY_ANGLE(angle) CLAMP((angle), -0x2000, 0x2000)
-
-UNK_REL_DATA;
-UNK_REL_BSS;
+#define CLAMP_COW_BODY_ANGLE(angle) CLAMP((angle), -0x2000, 0x2000);
 
 namespace {
 static dCcD_SrcSph cc_sph_src = {{{0, {{0, 0, {0}}, {0xfbfdfb, {0x11}}, {{0x79}}}},

src/d/actor/d_a_crod.cpp

@@ -3,6 +3,8 @@
  * Dominion Rod Object
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_crod.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/actor/d_a_alink.h"

src/d/actor/d_a_cstaF.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_cstaF.h"
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_crod.h"

src/d/actor/d_a_cstatue.cpp

@@ -1,8 +1,10 @@
 /**
- * @file d_a_cstatue.cpp
+* @file d_a_cstatue.cpp
  *
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_cstatue.h"
 #include <Z2AudioLib/Z2Instances.h>
 #include "d/actor/d_a_alink.h"
@@ -11,9 +13,6 @@
 #include "d/d_cc_d.h"
 #include "d/d_tresure.h"
 
-UNK_REL_BSS;
-UNK_REL_DATA;
-
 static u8 const unused[12] = {};
 
 /* 806676A4-806676AC 00000C 0008+00 0/1 0/0 0/0 .rodata          l_arcName */

src/d/actor/d_a_demo00.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_demo00.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "SSystem/SComponent/c_counter.h"
@@ -62,8 +64,6 @@ demo_s1_ke_s::~demo_s1_ke_s() {}
 /* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
 static char const* const stringBase_804A8998 = "V_24_tri_joint";
 
-UNK_REL_DATA;
-
 /* 804A4520-804A45A0 000300 0080+00 1/1 0/0 0/0 .text            get_foward_angle__FP4cXyzP4cXyzPsPs */
 static void get_foward_angle(cXyz* param_1, cXyz* param_2, s16* param_3, s16* param_4) {
     // NONMATCHING
@@ -774,8 +774,6 @@ static void teduna_calc(cXyz* param_1, cXyz* param_2, cXyz* param_3, s16 param_4
     }
 }
 
-UNK_REL_BSS;
-
 /* 804A8C64-804A8D24 000054 00C0+00 1/3 0/0 0/0 .bss             teduna_posL */
 static cXyz teduna_posL[16];
 

src/d/actor/d_a_demo_item.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_demo_item.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_item.h"
@@ -12,23 +14,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-UNK_BSS(1109)
-UNK_BSS(1107)
-UNK_BSS(1105)
-UNK_BSS(1104)
-UNK_BSS(1099)
-UNK_BSS(1097)
-UNK_BSS(1095)
-UNK_BSS(1094)
-UNK_BSS(1057)
-UNK_BSS(1055)
-UNK_BSS(1053)
-UNK_BSS(1052)
-UNK_BSS(1014)
-UNK_BSS(1012)
-UNK_BSS(1010)
-UNK_BSS(1009)
-
 /* 804E1C34-804E1C40 000054 000C+00 0/2 0/0 0/0 .bss             l_player_offset */
 static cXyz l_player_offset = cXyz(0.0f, 115.0f, 54.0f);
 

src/d/actor/d_a_disappear.cpp

@@ -3,6 +3,8 @@
  * Disappear death effect when an enemy is defeated
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_disappear.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"

src/d/actor/d_a_dmidna.cpp

@@ -3,6 +3,8 @@
  * Dying Midna Actor
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_dmidna.h"
 #include "f_op/f_op_actor_mng.h"
 

src/d/actor/d_a_do.cpp

@@ -5,110 +5,24 @@
 
 // Every function matches, but a Z2SoundObjSimple dtor is generated that should not exist
 
-#include "d/actor/d_a_do.h"
+#include "d/dolzel_rel.h"
+
 #include "JSystem/JGeometry.h"
 #include "SSystem/SComponent/c_math.h"
-#include "m_Do/m_Do_controller_pad.h"
+#include "Z2AudioLib/Z2Instances.h"
 #include "c/c_damagereaction.h"
-#include "d/d_com_inf_game.h"
+#include "d/actor/d_a_canoe.h"
+#include "d/actor/d_a_do.h"
+#include "d/actor/d_a_obj_food.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_a_item_static.h"
+#include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "d/actor/d_a_canoe.h"
-#include "d/actor/d_a_obj_food.h"
-
-/* 8066F278-8066F27C 000008 0001+03 3/3 0/0 0/0 .bss             @1109 */
-static u8 lit_1109[1 + 3 /* padding */];
-
-/* 8066F27C-8066F280 00000C 0001+03 0/0 0/0 0/0 .bss             @1107 */
-#pragma push
-#pragma force_active on
-static u8 lit_1107[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F280-8066F284 000010 0001+03 0/0 0/0 0/0 .bss             @1105 */
-#pragma push
-#pragma force_active on
-static u8 lit_1105[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F284-8066F288 000014 0001+03 0/0 0/0 0/0 .bss             @1104 */
-#pragma push
-#pragma force_active on
-static u8 lit_1104[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F288-8066F28C 000018 0001+03 0/0 0/0 0/0 .bss             @1099 */
-#pragma push
-#pragma force_active on
-static u8 lit_1099[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F28C-8066F290 00001C 0001+03 0/0 0/0 0/0 .bss             @1097 */
-#pragma push
-#pragma force_active on
-static u8 lit_1097[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F290-8066F294 000020 0001+03 0/0 0/0 0/0 .bss             @1095 */
-#pragma push
-#pragma force_active on
-static u8 lit_1095[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F294-8066F298 000024 0001+03 0/0 0/0 0/0 .bss             @1094 */
-#pragma push
-#pragma force_active on
-static u8 lit_1094[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F298-8066F29C 000028 0001+03 0/0 0/0 0/0 .bss             @1057 */
-#pragma push
-#pragma force_active on
-static u8 lit_1057[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F29C-8066F2A0 00002C 0001+03 0/0 0/0 0/0 .bss             @1055 */
-#pragma push
-#pragma force_active on
-static u8 lit_1055[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F2A0-8066F2A4 000030 0001+03 0/0 0/0 0/0 .bss             @1053 */
-#pragma push
-#pragma force_active on
-static u8 lit_1053[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F2A4-8066F2A8 000034 0001+03 0/0 0/0 0/0 .bss             @1052 */
-#pragma push
-#pragma force_active on
-static u8 lit_1052[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F2A8-8066F2AC 000038 0001+03 0/0 0/0 0/0 .bss             @1014 */
-#pragma push
-#pragma force_active on
-static u8 lit_1014[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F2AC-8066F2B0 00003C 0001+03 0/0 0/0 0/0 .bss             @1012 */
-#pragma push
-#pragma force_active on
-static u8 lit_1012[1 + 3 /* padding */];
-#pragma pop
-
-/* 8066F2B0-8066F2B4 000040 0001+03 0/0 0/0 0/0 .bss             @1010 */
-#pragma push
-#pragma force_active on
-static u8 lit_1010[1 + 3 /* padding */];
-#pragma pop
+#include "m_Do/m_Do_controller_pad.h"
 
 /* 8066F2B4-8066F2B8 -00001 0004+00 1/2 0/0 0/0 .bss             None */
-/* 8066F2B4 0001+01 data_8066F2B4 @1009 */
 /* 8066F2B6 0002+00 data_8066F2B6 None */
-static u8 data_8066F2B4;
 static bool noFallCheck;
 static bool hioInit;
 
@@ -2628,176 +2542,7 @@ static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 8066F32C-8066F330 0000BC 0004+00 0/0 0/0 0/0 .bss
- * sInstance__40JASGlobalInstance<19JASDefaultBankTable>        */
-#pragma push
-#pragma force_active on
-static u8 data_8066F32C[4];
-#pragma pop
-
-/* 8066F330-8066F334 0000C0 0004+00 0/0 0/0 0/0 .bss
- * sInstance__35JASGlobalInstance<14JASAudioThread>             */
-#pragma push
-#pragma force_active on
-static u8 data_8066F330[4];
-#pragma pop
-
-/* 8066F334-8066F338 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_8066F334[4];
-#pragma pop
-
-/* 8066F338-8066F33C 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_8066F338[4];
-#pragma pop
-
-/* 8066F33C-8066F340 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F33C[4];
-#pragma pop
-
-/* 8066F340-8066F344 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F340[4];
-#pragma pop
-
-/* 8066F344-8066F348 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F344[4];
-#pragma pop
-
-/* 8066F348-8066F34C 0000D8 0004+00 0/0 0/0 0/0 .bss
- * sInstance__36JASGlobalInstance<15JAISoundStarter>            */
-#pragma push
-#pragma force_active on
-static u8 data_8066F348[4];
-#pragma pop
-
-/* 8066F34C-8066F350 0000DC 0004+00 0/0 0/0 0/0 .bss
- * sInstance__35JASGlobalInstance<14Z2SoundStarter>             */
-#pragma push
-#pragma force_active on
-static u8 data_8066F34C[4];
-#pragma pop
-
-/* 8066F350-8066F354 0000E0 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12Z2SpeechMgr2>               */
-#pragma push
-#pragma force_active on
-static u8 data_8066F350[4];
-#pragma pop
-
-/* 8066F354-8066F358 0000E4 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_8066F354[4];
-#pragma pop
-
-/* 8066F358-8066F35C 0000E8 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_8066F358[4];
-#pragma pop
-
-/* 8066F35C-8066F360 0000EC 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAIStreamMgr>               */
-#pragma push
-#pragma force_active on
-static u8 data_8066F35C[4];
-#pragma pop
-
-/* 8066F360-8066F364 0000F0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F360[4];
-#pragma pop
-
-/* 8066F364-8066F368 0000F4 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAISoundInfo>               */
-#pragma push
-#pragma force_active on
-static u8 data_8066F364[4];
-#pragma pop
-
-/* 8066F368-8066F36C 0000F8 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13JAUSoundTable>              */
-#pragma push
-#pragma force_active on
-static u8 data_8066F368[4];
-#pragma pop
-
-/* 8066F36C-8066F370 0000FC 0004+00 0/0 0/0 0/0 .bss
- * sInstance__38JASGlobalInstance<17JAUSoundNameTable>          */
-#pragma push
-#pragma force_active on
-static u8 data_8066F36C[4];
-#pragma pop
-
-/* 8066F370-8066F374 000100 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAUSoundInfo>               */
-#pragma push
-#pragma force_active on
-static u8 data_8066F370[4];
-#pragma pop
-
-/* 8066F374-8066F378 000104 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F374[4];
-#pragma pop
-
-/* 8066F378-8066F37C 000108 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13Z2SoundObjMgr>              */
-#pragma push
-#pragma force_active on
-static u8 data_8066F378[4];
-#pragma pop
-
-/* 8066F37C-8066F380 00010C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F37C[4];
-#pragma pop
-
-/* 8066F380-8066F384 000110 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F380[4];
-#pragma pop
-
-/* 8066F384-8066F388 000114 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F384[4];
-#pragma pop
-
-/* 8066F388-8066F38C 000118 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8066F388[4];
-#pragma pop
-
-/* 8066F38C-8066F390 00011C 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr>              */
-#pragma push
-#pragma force_active on
-static u8 data_8066F38C[4];
-#pragma pop
+AUDIO_INSTANCES;
 
 /* 8066F1CC-8066F1EC -00001 0020+00 1/0 0/0 0/0 .data            l_daDo_Method */
 static actor_method_class l_daDo_Method = {

src/d/actor/d_a_door_boss.cpp

@@ -3,6 +3,8 @@
  * Boss Door
  */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_boss.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
@@ -10,21 +12,6 @@
 #include "d/d_door_param2.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80670A20-80670A2C 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 80670A2C-80670A40 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-
 /* 8066F418-8066F424 000078 000C+00 4/4 0/0 0/0 .text            getArcName__9daBdoor_cFv */
 char* daBdoor_c::getArcName() {
     return "Z_bdor00";

src/d/actor/d_a_door_bossL1.cpp

@@ -2,6 +2,8 @@
 // Translation Unit: Boss Door L1
 //
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_bossL1.h"
 #include "d/actor/d_a_obj_keyhole.h"
 #include "d/d_door_param2.h"
@@ -12,24 +14,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 804E4DF8-804E4E04 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 804E4E04-804E4E18 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-#pragma pop
-
 /* 804E4E18-804E4E68 -00001 0050+00 1/1 0/0 0/0 .data            l_stageName$3673 */
 static char* l_stageName[20] = {
     "D_MN05",

src/d/actor/d_a_door_bossL5.cpp

@@ -2,6 +2,8 @@
 // Boss Door Level 5
 //
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_bossL5.h"
 #include "d/actor/d_a_obj_keyhole.h"
 #include "d/d_com_inf_game.h"
@@ -65,24 +67,6 @@ static char const l_door_open_demo_1st[26] = "DEFAULT_BS_SHUTTER_L5_1ST";
 /* 806724FC-8067250C 000034 000D+03 3/3 0/0 0/0 .rodata          l_staff_name */
 static char const l_staff_name[13] = "SHUTTER_DOOR";
 
-/* 806725F4-80672600 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 80672600-80672614 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-#pragma pop
-
 /* 80672614-8067264C -00001 0038+00 1/1 0/0 0/0 .data            action_table$3861 */
 static char* action_table[14] = {
     "WAIT",

src/d/actor/d_a_door_dbdoor00.cpp

@@ -2,6 +2,8 @@
 // d_a_door_dbdoor00
 //
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_dbdoor00.h"
 #include "printf.h"
 #include "SSystem/SComponent/c_math.h"
@@ -52,24 +54,6 @@ char* daDbDoor00_c::getBmdArcName() {
     return "DbDoor0";
 }
 
-/* 8045E664-8045E670 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 8045E670-8045E684 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-#pragma pop
-
 /* 8045E684-8045E688 -00001 0004+00 1/1 0/0 0/0 .data            l_bmd_base_name */
 static char* l_bmd_base_name = "door-pushDouble_";
 

src/d/actor/d_a_door_knob00.cpp

@@ -2,6 +2,8 @@
 // Door Knob
 //
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_knob00.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
@@ -57,24 +59,6 @@ char* daKnob20_c::getDummyBmd() {
     return "door-knobDummy.bmd";
 }
 
-/* 80460874-80460880 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 80460880-80460894 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-#pragma pop
-
 /* 80460894-80460898 -00001 0004+00 1/1 0/0 0/0 .data            l_bmd_base_name */
 static char* l_bmd_base_name = "door-knob_";
 

src/d/actor/d_a_door_mbossL1.cpp

@@ -3,6 +3,8 @@
  * 
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_mbossL1.h"
 #include "d/actor/d_a_obj_stopper.h"
 #include "d/actor/d_a_obj_keyhole.h"
@@ -62,21 +64,6 @@ static u16 const l_stop_heap_size[12] = {
     0x0EA0, 0x0800, 0x0EB0, 0x0800, 0x0800, 0x1BD0,
 };
 
-/* 80677970-8067797C 000000 000C+00 2/2 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 8067797C-80677990 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-
 /* 80677990-806779BC -00001 002C+00 0/1 0/0 0/0 .data            l_door_open_demo */
 static char* l_door_open_demo[11] = {
     NULL,

src/d/actor/d_a_door_push.cpp

@@ -3,6 +3,8 @@
  * Door - Push
 */
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_push.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_bg_w.h"
@@ -74,24 +76,6 @@ void daDoorPush_c::setBaseMtx() {
     }
 }
 
-/* 80678F50-80678F5C 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 80678F5C-80678F70 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-#pragma pop
-
 /* 80678F70-80678F74 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_OsuDoor";
 

src/d/actor/d_a_door_shutter.cpp

@@ -2,6 +2,8 @@
 // Door Shutter
 //
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_shutter.h"
 #include "d/actor/d_a_obj_Lv5Key.h"
 #include "d/actor/d_a_obj_keyhole.h"
@@ -34,24 +36,6 @@ char* daDoor20_c::getAlwaysArcName() {
     return "static";
 }
 
-/* 80466E7C-80466E88 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 80466E88-80466E9C 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-#pragma pop
-
 /* 80460BA4-80460C40 0000E4 009C+00 9/8 0/0 0/0 .text            getArcName__10daDoor20_cFv */
 char* daDoor20_c::getArcName() {
     switch (door_param2_c::getKind(this)) {

src/d/actor/d_a_door_spiral.cpp

@@ -2,6 +2,8 @@
 // Door Spiral
 //
 
+#include "d/dolzel_rel.h"
+
 #include "d/actor/d_a_door_spiral.h"
 #include "f_op/f_op_actor.h"