Z2AudioLib: Migrate declarations out of functions.h to respective files (#96)

Removes the strong dependency on a single header file and moves
declarations to their respective header file.

This allows for making dependencies explicit in cpp files and other
headers, and also makes it much easier to track where everything related
to a particular component is.

This change also creates a few header files that previously didn't
exist, making it much nicer for people implementing things, as they
won't need to create the header file, it'll just be there ready to go.

Ideally functions.h wouldn't even be a thing, as this header adds a lot
of preprocessing overhead due to its size, and will continue to grow
significantly larger over the lifespan of the project, which can also
impact the performance of editors that do dependency lookups and
context-aware syntax highlighting.

include/Z2AudioLib/Z2Audible/Z2Audible.h

@@ -0,0 +1,11 @@
+#ifndef Z2AUDIBLE_H_
+#define Z2AUDIBLE_H_
+
+extern "C" {
+void Z2Audible(void);
+void Z2Audible_NS_getChannel(void);
+void Z2Audible_NS_getDistVolBit(void);
+void Z2Audible_NS_setOuterParams(void);
+}
+
+#endif  // Z2AUDIBLE_H_

include/Z2AudioLib/Z2AudibleAbsPos/Z2AudibleAbsPos.h

@@ -0,0 +1,9 @@
+#ifndef Z2AUDIBLEABSPOS_H_
+#define Z2AUDIBLEABSPOS_H_
+
+extern "C" {
+void Z2AudibleAbsPos_NS_calc(void);
+void Z2AudibleAbsPos_NS_init(void);
+}
+
+#endif  // Z2AUDIBLEABSPOS_H_

include/Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h

@@ -0,0 +1,8 @@
+#ifndef Z2AUDIBLECHANNEL_H_
+#define Z2AUDIBLECHANNEL_H_
+
+extern "C" {
+void Z2AudibleChannel(void);
+}
+
+#endif  // Z2AUDIBLECHANNEL_H_

include/Z2AudioLib/Z2Audience/Z2Audience.h

@@ -0,0 +1,37 @@
+#ifndef Z2AUDIENCE_H_
+#define Z2AUDIENCE_H_
+
+extern "C" {
+void Z2Audience(void);
+void Z2Audience_NS_dtor(void);
+void Z2Audience_NS_calcDeltaPriority_(void);
+void Z2Audience_NS_calcFxMix_(void);
+void Z2Audience_NS_calcOffMicSound(void);
+void Z2Audience_NS_calcPitch_(void);
+void Z2Audience_NS_calcPitchDoppler_(void);
+void Z2Audience_NS_calcRelPosDolby(void);
+void Z2Audience_NS_calcRelPosPan(void);
+void Z2Audience_NS_calcRelPosVolume(void);
+void Z2Audience_NS_calcVolume_(void);
+void Z2Audience_NS_convertAbsToRel(void);
+void Z2Audience_NS_setTargetVolume(void);
+
+void Z2Audience3DSetting(void);
+void Z2Audience3DSetting_NS_init(void);
+void Z2Audience3DSetting_NS_initDolbyDist(void);
+void Z2Audience3DSetting_NS_initVolumeDist(void);
+void Z2Audience3DSetting_NS_updateDolbyDist(void);
+void Z2Audience3DSetting_NS_updateVolumeDist(void);
+
+void func_802BBE98(void);
+void func_802BDEDC(void);
+void func_802BD4D4(void);
+void func_802BD71C(void);
+void func_802BBED0(void);
+void func_802BD338(void);
+void func_802BDED4(void);
+void func_802BD5B8(void);
+void func_802BD510(void);
+}
+
+#endif  // Z2AUDIENCE_H_

include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h

@@ -1,8 +1,9 @@
 #ifndef Z2AUDIOARCLOADER_H_
 #define Z2AUDIOARCLOADER_H_
 
+#include "JSystem/JAudio2/JAUAudioArcInterpreter.h"
 #include "JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h"
-#include "global.h"
+#include "dolphin/types.h"
 
 class Z2AudioArcLoader {
     Z2AudioArcLoader(JAUSection*);
@@ -13,4 +14,13 @@ class Z2AudioArcLoader {
     void readBSTN(const void*, u32);
 };
 
+extern "C" {
+void func_802A9B54(void);
+void func_802A9B58(void);
+
+void __ct__16Z2AudioArcLoaderFP10JAUSection(void);
+void readBFCA__16Z2AudioArcLoaderFPCv(void);
+void readCommandMore__16Z2AudioArcLoaderFUl(void);
+}
+
 #endif

include/Z2AudioLib/Z2AudioCamera/Z2AudioCamera.h

@@ -0,0 +1,14 @@
+#ifndef Z2AUDIOCAMERA_H_
+#define Z2AUDIOCAMERA_H_
+
+extern "C" {
+void Z2AudioCamera(void);
+void Z2AudioCamera_NS_convertAbsToRel(void);
+void Z2AudioCamera_NS_convertAbsToRel_X1_(void);
+void Z2AudioCamera_NS_init(void);
+void Z2AudioCamera_NS_isInSight(void);
+void Z2AudioCamera_NS_setCameraState(void);
+void Z2AudioCamera_NS_setCameraState_X1_(void);
+}
+
+#endif  // Z2AUDIOCAMER_H_

include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h

@@ -1,11 +1,14 @@
 #ifndef Z2AUDIOMGR_H_
 #define Z2AUDIOMGR_H_
+
 #include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
 #include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
 #include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
+
 struct Z2AudioMgr {
     Z2AudioMgr();
     ~Z2AudioMgr();
+
     void gframeProcess(void);
     Z2AudioMgr* setOutputMode(unsigned long outputMode);
     u32 resetProcess(u32 param_1, bool param_2);
@@ -18,12 +21,25 @@ struct Z2AudioMgr {
     u8 unk_2[0xdad];
 };
 
-extern "C" {
-void setOutputMode__10Z2AudioMgrFUl(void);
-void setOutputMode__9JASDriverFUl(void);
-}
-
 extern Z2AudioMgr lbl_803DBF4C;
 extern Z2AudioMgr* lbl_80451368;
 
-#endif
+extern "C" {
+void func_802CDCEC(void);
+void func_8036679C(void);
+void func_80362ABC(void);
+void func_802CD7F8(void);
+void func_802CDB1C(void);
+void func_802CDB68(void);
+void func_802CDC08(void);
+
+void resetProcess__10Z2AudioMgrFUlb(void);
+void setOutputMode__10Z2AudioMgrFUl(void);
+
+void Z2AudioMgr_NS_gframeProcess(void);
+void Z2AudioMgr_NS_init(void);
+void Z2AudioMgr_NS_resetRecover(void);
+void Z2AudioMgr_NS_zeldaGFrameWork(void);
+}
+
+#endif  // Z2AUDIOMGR_H_

include/Z2AudioLib/Z2Calc/Z2Calc.h

@@ -1,3 +1,6 @@
+#ifndef Z2CALC_H_
+#define Z2CALC_H_
+
 #include "JSystem/JMath/random.h"
 #include "global.h"
 
@@ -23,3 +26,16 @@ float getParamByExp(float, float, float, float, float, float, Z2Calc::CurveSign)
 float getRandom(float, float, float);
 float getRandom_0_1(void);
 }  // namespace Z2Calc
+
+extern "C" {
+void calcNoise1f__Q26Z2Calc8FNoise1fFv(void);
+void getRandom__6Z2CalcFfff(void);
+void getRandom_0_1__6Z2CalcFv(void);
+void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(void);
+void linearTransform__6Z2CalcFfffffb(void);
+void setParam__Q26Z2Calc8FNoise1fFfff(void);
+
+void Z2Calc_NS_linearTransform(void);
+}
+
+#endif  // Z2CALC_H_

include/Z2AudioLib/Z2Creature/Z2Creature.h

@@ -19,4 +19,81 @@ public:
 
 class Z2CreatureEnemy : public Z2Creature {};
 
+extern "C" {
+void __ct__10Z2CreatureFv(void);
+
+void Z2Creature_NS_deleteObject(void);
+void Z2Creature_NS_dtor(void);
+void Z2Creature_NS_framework(void);
+void Z2Creature_NS_init(void);
+void Z2Creature_NS_init_X1_(void);
+void Z2Creature_NS_startCreatureVoice(void);
+
+void Z2CreatureCitizen_NS_init(void);
+void Z2CreatureCitizen_NS_setMdlType(void);
+
+void Z2CreatureEnemy_NS_deleteObject(void);
+
+void Z2CreatureLink_NS_startLinkSound(void);
+void Z2CreatureLink_NS_startLinkSoundLevel(void);
+void deleteKantera__14Z2CreatureLinkFv(void);
+void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(void);
+void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(void);
+
+void Z2CreatureRide_NS_setLinkRiding(void);
+
+void func_802C1B7C(void);
+void func_802C2C84(void);
+void func_802C110C(void);
+void func_802C0C6C(void);
+void func_802C0B70(void);
+void func_802C29D4(void);
+void func_802C1F54(void);
+void func_802C25EC(void);
+void func_802C0720(void);
+void func_802C24B0(void);
+void func_802C3040(void);
+void func_802C1D6C(void);
+void func_802C2290(void);
+void func_802C2CD4(void);
+void func_802C0BE8(void);
+void func_802C10B4(void);
+void func_802C1C24(void);
+void func_802C199C(void);
+void func_802C20E8(void);
+void func_802C1BE8(void);
+void func_802C168C(void);
+void func_802C0BAC(void);
+void func_802C0E18(void);
+void func_802C1CA0(void);
+void func_802C2864(void);
+void func_802C087C(void);
+void func_802C06F4(void);
+void func_802C1A14(void);
+void func_802C1D10(void);
+void func_802C0AF8(void);
+void func_802C10D4(void);
+void func_802C1094(void);
+void func_802C0ED8(void);
+void func_802C1B90(void);
+void func_802C136C(void);
+void func_802C1D4C(void);
+void func_802C2578(void);
+void func_802C1FB0(void);
+void func_802C2670(void);
+void func_802C2194(void);
+void func_802C1948(void);
+void func_802C0C10(void);
+void func_802C0D04(void);
+void func_802C0618(void);
+void func_802C1FFC(void);
+void func_802C24D0(void);
+void func_802C19D8(void);
+
+void Z2_B_zan_modPitch(void);
+void Z2_E_mm_modPitch(void);
+void Z2_E_ms_modVol(void);
+void Z2_E_sw_modPitch(void);
+}
+
 #endif  // Z2CREATURE_H_

include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h

@@ -3,4 +3,52 @@
 
 extern void* lbl_80450B3C;  // Z2EnvSeMgr sInstance
 
+extern "C" {
+void Z2EnvSeAutoPan(void);
+void Z2EnvSeAutoPan_NS_calcPan(void);
+void Z2EnvSeAutoPan_NS_dtor(void);
+void Z2EnvSeAutoPan_NS_setPanParam(void);
+void Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel(void);
+
+void Z2EnvSeBase(void);
+void Z2EnvSeBase_NS_dtor(void);
+void Z2EnvSeBase_NS_startEnvSe(void);
+void Z2EnvSeBase_NS_startEnvSeLevel(void);
+
+void Z2EnvSeDir(void);
+void Z2EnvSeDir_NS_calcPan(void);
+void Z2EnvSeDir_NS_dtor(void);
+void Z2EnvSeDir_NS_setPanDir(void);
+void Z2EnvSeDir_NS_startEnvSeDirLevel(void);
+
+void Z2EnvSeMgr_NS_getFogDensity(void);
+void Z2EnvSeMgr_NS_framework(void);
+void Z2EnvSeMgr_NS_initEtcSe(void);
+void Z2EnvSeMgr_NS_initFallSe(void);
+void Z2EnvSeMgr_NS_initLv3WaterSe(void);
+void Z2EnvSeMgr_NS_initRiverSe(void);
+void Z2EnvSeMgr_NS_initSceneEnvSe(void);
+void Z2EnvSeMgr_NS_initStaticEnvSe(void);
+void Z2EnvSeMgr_NS_playSceneEnvSe(void);
+void Z2EnvSeMgr_NS_registEtcSePos(void);
+void Z2EnvSeMgr_NS_registFallSePos(void);
+void Z2EnvSeMgr_NS_registLv3WaterSePos(void);
+void Z2EnvSeMgr_NS_registRiverSePos(void);
+void Z2EnvSeMgr_NS_registWindowPos(void);
+void Z2EnvSeMgr_NS_resetSceneInner(void);
+void Z2EnvSeMgr_NS_startEtcSe(void);
+void Z2EnvSeMgr_NS_startFallSe(void);
+void Z2EnvSeMgr_NS_startFarThunderSe(void);
+void Z2EnvSeMgr_NS_startLv3WaterSe(void);
+void Z2EnvSeMgr_NS_startRiverSe(void);
+void Z2EnvSeMgr_NS_startStaticEnvSe(void);
+
+void func_802C93A0(void);
+void func_802C8258(void);
+void func_802C7FB4(void);
+void func_802C92C8(void);
+void func_802C9400(void);
+void func_802C92EC(void);
+}
+
 #endif

include/Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h

@@ -0,0 +1,14 @@
+#ifndef Z2FXLINEMGR_H_
+#define Z2FXLINEMGR_H_
+
+extern "C" {
+void Z2FxLineMgr(void);
+void Z2FxLineMgr_NS_initDataArc(void);
+void Z2FxLineMgr_NS_setFxForceOff(void);
+void Z2FxLineMgr_NS_setLine(void);
+void Z2FxLineMgr_NS_setLineID(void);
+void Z2FxLineMgr_NS_setSceneFx(void);
+void Z2FxLineMgr_NS_setUnderWaterFx(void);
+}
+
+#endif  // Z2FXLINEMGR_H_

include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h

@@ -1,18 +1,23 @@
+#ifndef Z2LINKMGR_H_
+#define Z2LINKMGR_H_
+
 #include "JSystem/JAudio2/JAISe/JAISe.h"
 #include "JSystem/JAudio2/JAISound/JAISound.h"
 #include "global.h"
 
-struct Z2SoundObjBase {};
+class Z2SoundObjBase;
+
+class Z2CreatureLink {
+public:
+    Z2CreatureLink(void);
+    ~Z2CreatureLink();
 
-struct Z2CreatureLink {
     void setLinkState(u8);
     void setLinkGroupInfo(u8);
     void setLinkHp(s32, s32);
     void setLinkSwordType(s32, s32);
     void setLinkShieldType(s32, s32);
     void setLinkBootsType(s32);
-    Z2CreatureLink(void);
-    ~Z2CreatureLink();
     void deleteObject();
     void init(Vec*, Vec*, Vec*);
     void initKantera(Vec*);
@@ -32,6 +37,7 @@ struct Z2CreatureLink {
     int startHitItemSE(u32, u32, Z2SoundObjBase*, float);
     void setResumeAttack(bool);
 
+private:
     u8 unk0[179];
     u8 unk179;
     float unk180;
@@ -57,4 +63,28 @@ struct Z2LinkSoundStarter {
     ~Z2LinkSoundStarter();
     // u32 startSound(JAISoundID, JAISoundHandle, TVec3<float>*, u32, float, float, float, float,
     // float, u32);
-};
+};
+
+extern "C" {
+void Z2CreatureRide_NS_dtor(void);
+
+void func_802C5078(void);
+void func_802C57C0(void);
+void func_802C551C(void);
+void func_802C5284(void);
+void func_802C4FFC(void);
+void func_802C5894(void);
+void func_802C4928(void);
+void func_802C588C(void);
+void func_802C54FC(void);
+void func_802C54B8(void);
+void func_802C56C0(void);
+void func_802C51EC(void);
+void func_802C520C(void);
+
+void Z2LinkSoundStarter_NS_ctor(void);
+
+void Z2RideSoundStarter(void);
+}
+
+#endif  // Z2LINKMGR_H_

include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h

@@ -1,5 +1,6 @@
-#ifndef __Z2SCENEMGR_H_
-#define __Z2SCENEMGR_H_
+#ifndef Z2SCENEMGR_H_
+#define Z2SCENEMGR_H_
+
 #include "JSystem/JAudio2/JAISe/JAISe.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "global.h"
@@ -16,7 +17,19 @@ struct Z2SoundMgr {
     JAISoundParamsMove* JAISoundParamsMove;
 };
 
-struct Z2SceneMgr {
+class Z2SceneMgr {
+public:
+    Z2SceneMgr(void);
+
+    void setInDarkness(bool param_1);
+    void setSceneExist(bool param_1);
+    void setFadeOutStart(u8 param_1);
+    void setFadeInStart(u8 param_1);
+    void setSceneName(char* stageName, long roomNum, long layerNum);
+    int checkFirstWaves(void);
+    void load1stDynamicWave(void);
+
+private:
     long BGM_ID;
     int sceneNum;
     int timer;
@@ -39,14 +52,25 @@ struct Z2SceneMgr {
     bool inGame;
     bool sceneExist;
     bool inDarkness;
-
-    Z2SceneMgr(void);
-    void setInDarkness(bool param_1);
-    void setSceneExist(bool param_1);
-    void setFadeOutStart(u8 param_1);
-    void setFadeInStart(u8 param_1);
-    void setSceneName(char* stageName, long roomNum, long layerNum);
-    int checkFirstWaves(void);
-    void load1stDynamicWave(void);
 };
-#endif
+
+extern "C" {
+void __ct__10Z2SceneMgrFv(void);
+void setSceneExist__10Z2SceneMgrFb(void);
+
+void Z2SceneMgr_NS_check1stDynamicWave(void);
+void Z2SceneMgr_NS_checkFirstWaves(void);
+void Z2SceneMgr_NS_eraseBgmWave(void);
+void Z2SceneMgr_NS_eraseSeWave(void);
+void Z2SceneMgr_NS_framework(void);
+void Z2SceneMgr_NS_getWaveLoadStatus(void);
+void Z2SceneMgr_NS__load1stWaveInner_1(void);
+void Z2SceneMgr_NS__load1stWaveInner_2(void);
+void Z2SceneMgr_NS_loadBgmWave(void);
+void Z2SceneMgr_NS_loadSeWave(void);
+void Z2SceneMgr_NS_loadStaticWaves(void);
+void Z2SceneMgr_NS_sceneBgmStart(void);
+void Z2SceneMgr_NS_sceneChange(void);
+}
+
+#endif  // Z2SCENEMGR_H_

include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h

@@ -16,8 +16,10 @@ struct Z2MultiSeObj {
     u8 unk1[4];
 };
 
-struct Z2SeMgr {
+class Z2SeMgr {
+public:
     Z2SeMgr(void);
+
     void initSe(void);
     void resetModY(void);
     void modHeightAtCamera(Vec const**);
@@ -38,6 +40,7 @@ struct Z2SeMgr {
     bool isLevelSe(JAISoundID);
     bool isSoundCulling(JAISoundID);
 
+private:
     JAISoundHandles sound_handles;
     Z2SeMgr* se_mgr;
     u32 field_0x64;
@@ -60,14 +63,17 @@ struct Z2SeMgr {
     u8 unk2[3];
 };
 
-struct Z2MultiSeMgr {
+class Z2MultiSeMgr {
+public:
     Z2MultiSeMgr();
     ~Z2MultiSeMgr();
+
     u32 registMultiSePos(Vec*);
     void resetMultiSePos(void);
     float getPanPower(void);
     float getDolbyPower(void);
 
+private:
     u8 field_0x0;
     u8 field_0x1;
     u8 field_0x2;
@@ -83,40 +89,37 @@ struct Z2MultiSeMgr {
 extern "C" {
 void Z2MultiSeObj(void);
 void __ct__12Z2MultiSeObjFv(void);
+
+void __ct__12Z2MultiSeMgrFv(void);
+void __dt__12Z2MultiSeMgrFv(void);
+void resetMultiSePos__12Z2MultiSeMgrFv(void);
+
+void __ct__7Z2SeMgrFv(void);
+void decrCrowdSize__7Z2SeMgrFv(void);
+void incrCrowdSize__7Z2SeMgrFv(void);
+void initSe__7Z2SeMgrFv(void);
+void isLevelSe__7Z2SeMgrF10JAISoundID(JAISoundID);
+void isSoundCulling__7Z2SeMgrF10JAISoundID(JAISoundID);
+void modHeightAtCamera__7Z2SeMgrFPPC3Vec(Vec const**);
+void processSeFramework__7Z2SeMgrFv(void);
 void resetModY__7Z2SeMgrFv(void);
-void JAISoundHandles_NS_getFreeHandle(void);
-void JAISoundHandles_NS_getHandleSoundID(void);
+void seMoveVolumeAll__7Z2SeMgrFfUl(float, u32);
 void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float,
                                                     float, float, u8);
-void JAISoundParamsMove_NS_moveDolby(void);
-void JAISoundParamsMove_NS_movePan(void);
-void JAISoundParamsMove_NS_moveFxMix(void);
-void Z2Audience_NS_calcOffMicSound(void);
-void modHeightAtCamera__7Z2SeMgrFPPC3Vec(Vec const**);
 void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float,
                                                          float, float, float, u8);
-void releaseSound__14JAISoundHandleFv(void);
 void seStop__7Z2SeMgrF10JAISoundIDUl(JAISoundID, u32);
-void JAISeCategoryMgr_NS_stop(void);
-void seMoveVolumeAll__7Z2SeMgrFfUl(float, u32);
-void Z2SpeechMgr2_NS_playOneShotVoice(void);
+void seStopAll__7Z2SeMgrFUl(void);
 void setLevObjSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
 void setMultiTriggerSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
-void isLevelSe__7Z2SeMgrF10JAISoundID(JAISoundID);
-void Z2SoundMgr_NS_stopSoundID(void);
-void Z2SoundMgr_NS_multiVolumeSoundID(void);
-void isSoundCulling__7Z2SeMgrF10JAISoundID(JAISoundID);
+
 void __ct__12Z2MultiSeMgrFv(void);
-void Z2Audience_NS_calcRelPosDolby(void);
-void Z2Audience_NS_calcRelPosPan(void);
-void Z2Audience_NS_calcRelPosVolume(void);
-void Z2Audience_NS_convertAbsToRel(void);
 void registMultiSePos__12Z2MultiSeMgrFP3Vec(Vec*);
 void resetMultiSePos__12Z2MultiSeMgrFv(void);
 float getPanPower__12Z2MultiSeMgrFv(void);
 float getDolbyPower__12Z2MultiSeMgrFv(void);
 
-void __ct__14JAISoundHandleFv(void);
+void Z2SeMgr_NS_resetCrowdSize(void);
 }
 
 extern Z2SeMgr* lbl_80450B88;  // Z2SeMgr sInstance

include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h

@@ -6,8 +6,10 @@
 #include "Z2AudioLib/Z2Param/Z2Param.h"
 #include "global.h"
 
-struct Z2SeqMgr {
+class Z2SeqMgr {
+public:
     Z2SeqMgr(void);
+
     void bgmStart(u32, u32, s32);
     void bgmStop(u32, s32);
     void subBgmStart(u32);
@@ -56,32 +58,63 @@ struct Z2SeqMgr {
     void taktModelMuteOff(void);
     void setFieldBgmPlay(bool);
 
+private:
     u8 p1[0xD0];
     u8 unk_1;
 };
 
+// Additional symbols needed for _Z2SeqMgr.cpp
+// autogenerated by split.py v0.3 at 2021-01-05 01:50:57.147580
 extern "C" {
-void Z2SeqMgr_NS_fieldBgmStart(void);
-void JAIStreamMgr_NS_stop_X1_(void);
-void JAISeqMgr_NS_stop_X1_(void);
+void __ct__8Z2SeqMgrFv(void);
 void bgmStart__8Z2SeqMgrFUlUll(u32, u32, s32);
 void bgmStop__8Z2SeqMgrFUll(u32, s32);
 void bgmStreamCheckReady__8Z2SeqMgrFv(void);
-void releaseSound__14JAISoundHandleFv(void);
-void Z2SeqMgr_NS_subBgmStop(void);
-void subBgmStop__8Z2SeqMgrFv(void);
-void subBgmStopInner__8Z2SeqMgrFv(void);
-void JAISoundStatus__NS_lockWhenPrepared();
-void bgmStreamPrepare__8Z2SeqMgrFUl(u32);
-void JAISoundStatus__NS_unlockIfLocked(void);
 void bgmStreamPlay__8Z2SeqMgrFv(void);
+void bgmStreamPrepare__8Z2SeqMgrFUl(u32);
 void bgmStreamStop__8Z2SeqMgrFUl(u32);
-void subBgmStart__8Z2SeqMgrFUl(u32);
-void Z2SeqMgr_NS_setChildTrackVolume(void);
 void changeBgmStatus__8Z2SeqMgrFl(s32);
 // void changeSubBgmStatus__8Z2SeqMgrFl(s32);
-void JAISeqMgr_NS_mixOut(void);
-void JAISeqMgr_NS_calc(void);
+void changeFishingBgm__8Z2SeqMgrFl(void);
+void changeSubBgmStatus__8Z2SeqMgrFl(void);
+void checkDayTime__11Z2StatusMgrFv(void);
+void onVariantBgmJumpEnd__8Z2SeqMgrFb(void);
+void setBattleGhostMute__8Z2SeqMgrFb(void);
+void setFieldBgmPlay__8Z2SeqMgrFb(void);
+void subBgmStopInner__8Z2SeqMgrFv(void);
+void subBgmStart__8Z2SeqMgrFUl(u32);
+void subBgmStop__8Z2SeqMgrFv(void);
+void subBgmStopInner__8Z2SeqMgrFv(void);
+
+void Z2SeqMgr_NS_battleBgmFramework(void);
+void Z2SeqMgr_NS_checkBgmIDPlaying(void);
+void Z2SeqMgr_NS_fanfareFramework(void);
+void Z2SeqMgr_NS_fieldBgmFramework(void);
+void Z2SeqMgr_NS_fieldBgmStart(void);
+void Z2SeqMgr_NS_fieldRidingMute(void);
+void Z2SeqMgr_NS_getChildTrackVolume(void);
+void Z2SeqMgr_NS_mbossBgmMuteProcess(void);
+void Z2SeqMgr_NS_muteSceneBgm(void);
+void Z2SeqMgr_NS_onFieldBgmJumpEnd(void);
+void Z2SeqMgr_NS_onFieldBgmJumpStart(void);
+void Z2SeqMgr_NS_processBgmFramework(void);
+void Z2SeqMgr_NS_resetBattleBgmParams(void);
+void Z2SeqMgr_NS_setBattleBgmOff(void);
+void Z2SeqMgr_NS_setBattleDistIgnore(void);
+void Z2SeqMgr_NS_setBattleDistState(void);
+void Z2SeqMgr_NS_setBattleLastHit(void);
+void Z2SeqMgr_NS_setBattleSearched(void);
+void Z2SeqMgr_NS_setBattleSeqState(void);
+void Z2SeqMgr_NS_setChildTrackVolume(void);
+void Z2SeqMgr_NS_setHeightVolMod(void);
+void Z2SeqMgr_NS_setTimeProcVolMod(void);
+void Z2SeqMgr_NS_setTwilightGateVol(void);
+void Z2SeqMgr_NS_setWindStoneVol(void);
+void Z2SeqMgr_NS_startBattleBgm(void);
+void Z2SeqMgr_NS_stopBattleBgm(void);
+void Z2SeqMgr_NS_stopWolfHowlSong(void);
+void Z2SeqMgr_NS_subBgmStop(void);
+void Z2SeqMgr_NS_unMuteSceneBgm(void);
 }
 
 extern u8 lbl_8039BA08[0x280];  // Z2AudioLib stringBase0

include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h

@@ -31,4 +31,20 @@ private:
     u8 mNumHandles;
 };
 
+extern "C" {
+void __ct__14Z2SoundHandlesFv(void);
+void __dt__14Z2SoundHandlesFv(void);
+void isActive__14Z2SoundHandlesCFv(void);
+void deleteHandlesPool__14Z2SoundHandlesFv(void);
+void getHandleSoundID__14Z2SoundHandlesF10JAISoundID(void);
+void getHandleUserData__14Z2SoundHandlesFUl(void);
+void initHandlesPool__14Z2SoundHandlesFUc(void);
+void stopAllSounds__14Z2SoundHandlesFUl(void);
+
+void Z2SoundHandles_NS_dtor(void);
+void Z2SoundHandles_NS_getFreeHandle(void);
+void Z2SoundHandles_NS_getLowPrioSound(void);
+void Z2SoundHandles_NS_setPos(void);
+}
+
 #endif

include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h

@@ -14,4 +14,26 @@ public:
 
 extern Z2SoundInfo* lbl_80450B4C;
 
+extern "C" {
+void getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID(void);
+void getSwBit__11Z2SoundInfoCF10JAISoundID(void);
+
+void Z2SoundInfo_NS_dtor(void);
+void Z2SoundInfo_NS_getAudibleSwFull(void);
+void Z2SoundInfo_NS_getSoundInfo_(void);
+void Z2SoundInfo_NS_getStreamFileEntry(void);
+void Z2SoundInfo_NS_getStreamFilePath(void);
+
+void func_802BB6DC(void);
+void func_802BBCBC(void);
+void func_802BB0E0(void);
+void func_802BBCD4(void);
+void func_802BBCCC(void);
+void func_802BB8B4(void);
+void func_802BB090(void);
+void func_802BB8E0(void);
+void func_802BBCC4(void);
+void func_802BB0D8(void);
+}
+
 #endif

include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h

@@ -4,7 +4,25 @@
 class Z2SoundMgr;
 
 extern "C" {
+void resetFilterAll__10Z2SoundMgrFv(void);
+
+void func_802A9EE8(void);
+
+void seqCallback(void);
+
+void Z2SoundMgr_NS_calc(void);
+void Z2SoundMgr_NS_ctor(void);
+void Z2SoundMgr_NS_framework(void);
+void Z2SoundMgr_NS_initParams(void);
+void Z2SoundMgr_NS_isPlayingSoundID(void);
+void Z2SoundMgr_NS_mixOut(void);
+void Z2SoundMgr_NS_multiVolumeSoundID(void);
 void Z2SoundMgr_NS_pauseAllGameSound(Z2SoundMgr* p0, bool p1);
+void Z2SoundMgr_NS_setFilterOff(void);
+void Z2SoundMgr_NS_setIIR(void);
+void Z2SoundMgr_NS_stop(void);
+void Z2SoundMgr_NS_stopSoundID(void);
+void Z2SoundMgr_NS_stopSync(void);
 };
 
 #endif

include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h

@@ -39,4 +39,21 @@ private:
 
 extern Z2SoundObjMgr* lbl_80450B48;  // Z2SoundObjMgr sInstance
 
+extern "C" {
+void __ct__13Z2SoundObjMgrFv(void);
+void deleteEnemyAll__13Z2SoundObjMgrFv(void);
+void isTwilightBattle__13Z2SoundObjMgrFv(void);
+void setBattleInit__13Z2SoundObjMgrFv(void);
+void setForceBattleArea__13Z2SoundObjMgrFbUsUsUs(void);
+void setGhostEnemyState__13Z2SoundObjMgrFUc(void);
+
+void Z2SoundObjMgr_NS_checkBattleFinish(void);
+void Z2SoundObjMgr_NS_getEnemyID(void);
+void Z2SoundObjMgr_NS_removeEnemy(void);
+void Z2SoundObjMgr_NS_searchEnemy(void);
+
+// Static initializer
+void func_802C01EC(void);
+}
+
 #endif  // Z2SOUNDOBJMGR_H_

include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h

@@ -47,4 +47,43 @@ public:
 
 class Z2DopplerSoundObjBase : protected Z2SoundHandles {};
 
+extern "C" {
+void __ct__14Z2SoundObjBaseFv(void);
+void __dt__14Z2SoundObjBaseFv(void);
+void deleteObject__14Z2SoundObjBaseFv(void);
+void framework__14Z2SoundObjBaseFUlSc(void);
+void init__14Z2SoundObjBaseFP3VecUc(void);
+void stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool(void);
+
+void Z2SoundObjAnime(void);
+void Z2SoundObjAnime_NS_ageSounds_(void);
+void Z2SoundObjAnime_NS_getSoundID(void);
+void Z2SoundObjAnime_NS_initAnime(void);
+void Z2SoundObjAnime_NS_playsSound(void);
+void Z2SoundObjAnime_NS_startSoundInner(void);
+void Z2SoundObjAnime_NS_updateAnime(void);
+void Z2SoundObjAnime_NS_updateSoundLifeTime_(void);
+
+void Z2SoundObjBase_NS_startCollisionSE(void);
+void Z2SoundObjBase_NS_startLevelSound(void);
+void Z2SoundObjBase_NS_startSound(void);
+
+void Z2SoundObjSimple(void);
+void Z2SoundObjSimple_NS_dtor(void);
+
+void Z2DopplerSoundObjBase(void);
+
+void func_802BE7AC(void);
+void func_802BE714(void);
+void func_802BEB74(void);
+void func_802BE6B8(void);
+void func_802BE880(void);
+void func_802BEB38(void);
+void func_802BE8A0(void);
+void func_802BE9B0(void);
+void func_802BE65C(void);
+void func_802BEBDC(void);
+void func_802BE5FC(void);
+}
+
 #endif