more misc. cleanup (#2232)

1 files changed, 29 insertions, 421 deletions

diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp
index addf8d716b..ffc3ad07f6 100644
--- a/src/d/actor/d_a_dshutter.cpp
+++ b/src/d/actor/d_a_dshutter.cpp
@@ -5,150 +5,27 @@
 
 #include "d/actor/d_a_dshutter.h"
 #include "SSystem/SComponent/c_math.h"
+#include "Z2AudioLib/Z2Instances.h"
 #include "dol2asm.h"
 
-//
-// Forward References:
-//
-
-extern "C" void callInit__7daDsh_cFv();
-extern "C" void callExecute__7daDsh_cFv();
-extern "C" void initOpenWait__7daDsh_cFv();
-extern "C" void executeOpenWait__7daDsh_cFv();
-extern "C" void initOpen__7daDsh_cFv();
-extern "C" void executeOpen__7daDsh_cFv();
-extern "C" void initCloseWait__7daDsh_cFv();
-extern "C" void executeCloseWait__7daDsh_cFv();
-extern "C" void initClose__7daDsh_cFv();
-extern "C" void executeClose__7daDsh_cFv();
-extern "C" s16 func_80467DF8(s16*);
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-
-/* 80467F5C-80467F68 000000 000C+00 1/1 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,
-};
-
-/* 80467F68-80467F7C 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
+UNK_REL_DATA
 
 /* 80467F7C-80467F88 -00001 000C+00 2/2 0/0 0/0 .data            l_arcName */
-SECTION_DATA static char* l_arcName[] = {
+static char* l_arcName[] = {
     "K_tetd",
     "S_bsaku00",
     "S_lv7saku",
 };
 
-/* 80467F88-80467F94 -00001 000C+00 0/1 0/0 0/0 .data            @3631 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3631[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)initOpenWait__7daDsh_cFv,
-};
-#pragma pop
-
-/* 80467F94-80467FA0 -00001 000C+00 0/1 0/0 0/0 .data            @3632 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3632[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)executeOpenWait__7daDsh_cFv,
-};
-#pragma pop
-
-/* 80467FA0-80467FAC -00001 000C+00 0/1 0/0 0/0 .data            @3635 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3635[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)initOpen__7daDsh_cFv,
-};
-#pragma pop
-
-/* 80467FAC-80467FB8 -00001 000C+00 0/1 0/0 0/0 .data            @3636 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3636[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)executeOpen__7daDsh_cFv,
-};
-#pragma pop
-
-/* 80467FB8-80467FC4 -00001 000C+00 0/1 0/0 0/0 .data            @3639 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3639[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)initCloseWait__7daDsh_cFv,
-};
-#pragma pop
-
-/* 80467FC4-80467FD0 -00001 000C+00 0/1 0/0 0/0 .data            @3640 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3640[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)executeCloseWait__7daDsh_cFv,
-};
-#pragma pop
-
-/* 80467FD0-80467FDC -00001 000C+00 0/1 0/0 0/0 .data            @3643 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3643[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)initClose__7daDsh_cFv,
-};
-#pragma pop
-
-/* 80467FDC-80467FE8 -00001 000C+00 0/1 0/0 0/0 .data            @3644 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3644[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)executeClose__7daDsh_cFv,
-};
-#pragma pop
-
 /* 80467498-8046751C 000078 0084+00 1/1 0/0 0/0 .text            __dt__7daDsh_cFv */
 daDsh_c::~daDsh_c() {}
 
-/* ############################################################################################## */
 /* 80467F04-80467F10 000000 000C+00 2/2 0/0 0/0 .rodata          l_bmd */
-SECTION_RODATA static int const l_bmd[] = {
+static int const l_bmd[] = {
     4,
     4,
     4,
 };
-COMPILER_STRIP_GATE(0x80467F04, &l_bmd);
 
 /* 8046751C-8046759C 0000FC 0080+00 1/0 0/0 0/0 .text            CreateHeap__7daDsh_cFv */
 int daDsh_c::CreateHeap() {
@@ -178,7 +55,7 @@ int daDsh_c::Execute(f32 (**param_0)[3][4]) {
     callExecute();
     setMtx();
     *param_0 = &mBgMtx;
-    func_80467DF8(&mTiltTime);
+    cLib_calcTimer(&mTiltTime);
     return 1;
 }
 
@@ -221,105 +98,28 @@ int daDsh_c::initOpenWait() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80468070-80468074 000000 0001+03 1/1 0/0 0/0 .bss             @1109 */
-static u8 lit_1109[1 + 3 /* padding */];
-
-/* 80468074-80468078 000004 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
-
-/* 80468078-8046807C 000008 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
-
-/* 8046807C-80468080 00000C 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
-
-/* 80468080-80468084 000010 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
-
-/* 80468084-80468088 000014 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
-
-/* 80468088-8046808C 000018 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
-
-/* 8046808C-80468090 00001C 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
-
-/* 80468090-80468094 000020 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
-
-/* 80468094-80468098 000024 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
-
-/* 80468098-8046809C 000028 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
-
-/* 8046809C-804680A0 00002C 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
-
-/* 804680A0-804680A4 000030 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
-
-/* 804680A4-804680A8 000034 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
-
-/* 804680A8-804680AC 000038 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
-
-/* 804680AC-804680B0 00003C 0001+03 0/0 0/0 0/0 .bss             @1009 */
-#pragma push
-#pragma force_active on
-static u8 lit_1009[1 + 3 /* padding */];
-#pragma pop
+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)
 
 /* 804680B0-804680C8 000040 0018+00 2/3 0/0 0/0 .bss             l_openWaitAction */
-static daDsh_c::action_c l_openWaitAction /* (&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait) */;
+static daDsh_c::action_c l_openWaitAction(&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait);
 
 /* 804680C8-804680E0 000058 0018+00 1/2 0/0 0/0 .bss             l_openAction */
-static daDsh_c::action_c l_openAction /* (&daDsh_c::initOpen, &daDsh_c::executeOpen) */;
+static daDsh_c::action_c l_openAction(&daDsh_c::initOpen, &daDsh_c::executeOpen);
 
 /* 804677E4-80467840 0003C4 005C+00 1/0 0/0 0/0 .text            executeOpenWait__7daDsh_cFv */
 int daDsh_c::executeOpenWait() {
@@ -330,14 +130,11 @@ int daDsh_c::executeOpenWait() {
     return 1;
 }
 
-/* ############################################################################################## */
 /* 80467F10-80467F1C 00000C 000C+00 1/1 0/0 0/0 .rodata          l_dzb */
-SECTION_RODATA static int const l_dzb[] = {7, 7, 7};
-COMPILER_STRIP_GATE(0x80467F10, &l_dzb);
+static int const l_dzb[] = {7, 7, 7};
 
 /* 80467F1C-80467F28 000018 000C+00 1/1 0/0 0/0 .rodata          l_heap_size */
-SECTION_RODATA static u32 const l_heap_size[] = {0xC10, 0xC10, 0x3D60};
-COMPILER_STRIP_GATE(0x80467F1C, &l_heap_size);
+static u32 const l_heap_size[] = {0xC10, 0xC10, 0x3D60};
 
 /* 80467840-80467988 000420 0148+00 1/0 0/0 0/0 .text            initOpen__7daDsh_cFv */
 int daDsh_c::initOpen() {
@@ -359,8 +156,7 @@ int daDsh_c::initOpen() {
 }
 
 /* 804680E0-804680F8 000070 0018+00 2/3 0/0 0/0 .bss             l_closeWaitAction */
-static daDsh_c::action_c
-    l_closeWaitAction /* (&daDsh_c::initCloseWait, &daDsh_c::executeCloseWait) */;
+static daDsh_c::action_c l_closeWaitAction(&daDsh_c::initCloseWait, &daDsh_c::executeCloseWait);
 
 /* 80467988-80467A64 000568 00DC+00 1/0 0/0 0/0 .text            executeOpen__7daDsh_cFv */
 int daDsh_c::executeOpen() {
@@ -392,9 +188,8 @@ int daDsh_c::initCloseWait() {
     return 1;
 }
 
-/* ############################################################################################## */
 /* 804680F8-80468110 000088 0018+00 1/2 0/0 0/0 .bss             l_closeAction */
-static daDsh_c::action_c l_closeAction /* (&daDsh_c::initClose, &daDsh_c::executeClose) */;
+static daDsh_c::action_c l_closeAction(&daDsh_c::initClose, &daDsh_c::executeClose);
 
 /* 80467A80-80467ADC 000660 005C+00 1/0 0/0 0/0 .text            executeCloseWait__7daDsh_cFv */
 int daDsh_c::executeCloseWait() {
@@ -459,180 +254,7 @@ static int daDsh_Delete(daDsh_c* i_this) {
     return ret;
 }
 
-/* ############################################################################################## */
-/* 80468110-80468114 0000A0 0004+00 0/0 0/0 0/0 .bss
- * sInstance__40JASGlobalInstance<19JASDefaultBankTable>        */
-#pragma push
-#pragma force_active on
-static u8 data_80468110[4];
-#pragma pop
-
-/* 80468114-80468118 0000A4 0004+00 0/0 0/0 0/0 .bss
- * sInstance__35JASGlobalInstance<14JASAudioThread>             */
-#pragma push
-#pragma force_active on
-static u8 data_80468114[4];
-#pragma pop
-
-/* 80468118-8046811C 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_80468118[4];
-#pragma pop
-
-/* 8046811C-80468120 0000AC 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_8046811C[4];
-#pragma pop
-
-/* 80468120-80468124 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_80468120[4];
-#pragma pop
-
-/* 80468124-80468128 0000B4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_80468124[4];
-#pragma pop
-
-/* 80468128-8046812C 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
- */
-#pragma push
-#pragma force_active on
-static u8 data_80468128[4];
-#pragma pop
-
-/* 8046812C-80468130 0000BC 0004+00 0/0 0/0 0/0 .bss
- * sInstance__36JASGlobalInstance<15JAISoundStarter>            */
-#pragma push
-#pragma force_active on
-static u8 data_8046812C[4];
-#pragma pop
-
-/* 80468130-80468134 0000C0 0004+00 0/0 0/0 0/0 .bss
- * sInstance__35JASGlobalInstance<14Z2SoundStarter>             */
-#pragma push
-#pragma force_active on
-static u8 data_80468130[4];
-#pragma pop
-
-/* 80468134-80468138 0000C4 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12Z2SpeechMgr2>               */
-#pragma push
-#pragma force_active on
-static u8 data_80468134[4];
-#pragma pop
-
-/* 80468138-8046813C 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_80468138[4];
-#pragma pop
-
-/* 8046813C-80468140 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_8046813C[4];
-#pragma pop
-
-/* 80468140-80468144 0000D0 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAIStreamMgr>               */
-#pragma push
-#pragma force_active on
-static u8 data_80468140[4];
-#pragma pop
-
-/* 80468144-80468148 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_80468144[4];
-#pragma pop
-
-/* 80468148-8046814C 0000D8 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAISoundInfo>               */
-#pragma push
-#pragma force_active on
-static u8 data_80468148[4];
-#pragma pop
-
-/* 8046814C-80468150 0000DC 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13JAUSoundTable>              */
-#pragma push
-#pragma force_active on
-static u8 data_8046814C[4];
-#pragma pop
-
-/* 80468150-80468154 0000E0 0004+00 0/0 0/0 0/0 .bss
- * sInstance__38JASGlobalInstance<17JAUSoundNameTable>          */
-#pragma push
-#pragma force_active on
-static u8 data_80468150[4];
-#pragma pop
-
-/* 80468154-80468158 0000E4 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAUSoundInfo>               */
-#pragma push
-#pragma force_active on
-static u8 data_80468154[4];
-#pragma pop
-
-/* 80468158-8046815C 0000E8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
- */
-#pragma push
-#pragma force_active on
-static u8 data_80468158[4];
-#pragma pop
-
-/* 8046815C-80468160 0000EC 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13Z2SoundObjMgr>              */
-#pragma push
-#pragma force_active on
-static u8 data_8046815C[4];
-#pragma pop
-
-/* 80468160-80468164 0000F0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
- */
-#pragma push
-#pragma force_active on
-static u8 data_80468160[4];
-#pragma pop
-
-/* 80468164-80468168 0000F4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_80468164[4];
-#pragma pop
-
-/* 80468168-8046816C 0000F8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_80468168[4];
-#pragma pop
-
-/* 8046816C-80468170 0000FC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_8046816C[4];
-#pragma pop
-
-/* 80468170-80468174 000100 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr>              */
-#pragma push
-#pragma force_active on
-static u8 data_80468170[4];
-#pragma pop
-
-/* 80468174-80468178 000104 0004+00 1/1 0/0 0/0 .bss             None */
-static s8 data_80468174[4];
+AUDIO_INSTANCES;
 
 /* 80467C7C-80467DF8 00085C 017C+00 1/0 0/0 0/0 .text            daDsh_Create__FP10fopAc_ac_c */
 int daDsh_c::create() {
@@ -664,20 +286,6 @@ static int daDsh_Create(fopAc_ac_c* i_this) {
     return static_cast<daDsh_c*>(i_this)->create();
 }
 
-/* 80467DF8-80467E14 0009D8 001C+00 1/1 0/0 0/0 .text            cLib_calcTimer<s>__FPs */
-extern "C" s16 func_80467DF8(s16* param_0) {
-    // NONMATCHING
-}
-
-/* 80467E14-80467EF8 0009F4 00E4+00 0/0 1/0 0/0 .text            __sinit_d_a_dshutter_cpp */
-void __sinit_d_a_dshutter_cpp(){// NONMATCHING
-}
-
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x80467E14, __sinit_d_a_dshutter_cpp);
-#pragma pop
-
 /* 80467FF0-80468010 -00001 0020+00 1/0 0/0 0/0 .data            l_daDsh_Method */
 static actor_method_class l_daDsh_Method = {
     (process_method_func)daDsh_Create,  (process_method_func)daDsh_Delete,
@@ -704,4 +312,4 @@ extern actor_process_profile_definition2 g_profile_DSHUTTER = {
         fopAc_CULLBOX_0_e,      // cullType
     },
     0,
-};
\ No newline at end of file
+};