diff --git a/include/JSystem/JAudio2/JAIAudible.h b/include/JSystem/JAudio2/JAIAudible.h new file mode 100644 index 00000000000..1a7fe7dbb8b --- /dev/null +++ b/include/JSystem/JAudio2/JAIAudible.h @@ -0,0 +1,8 @@ +#ifndef JAIAUDIBLE_H_ +#define JAIAUDIBLE_H_ + +extern "C" { +void JAIAudible_NS_dtor(void); +} + +#endif // JAIAUDIBLE_H_ diff --git a/include/JSystem/JAudio2/JAIAudience/JAIAudience.h b/include/JSystem/JAudio2/JAIAudience/JAIAudience.h index bada24f6493..21eb7e7a3f6 100644 --- a/include/JSystem/JAudio2/JAIAudience/JAIAudience.h +++ b/include/JSystem/JAudio2/JAIAudience/JAIAudience.h @@ -3,4 +3,8 @@ struct JAIAudience {}; +extern "C" { +void JAIAudience_NS_dtor(void); +} + #endif // JAIAUDIENCE_H_ \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAISeCategoryMgr.h b/include/JSystem/JAudio2/JAISeCategoryMgr.h new file mode 100644 index 00000000000..52cd8bdef2d --- /dev/null +++ b/include/JSystem/JAudio2/JAISeCategoryMgr.h @@ -0,0 +1,9 @@ +#ifndef JAISECATEGORYMGR_H_ +#define JAISECATEGORYMGR_H_ + +extern "C" { +void JAISeCategoryMgr_NS_pause(void); +void JAISeCategoryMgr_NS_stop(void); +} + +#endif // JAISECATEGORYMGR_H_ diff --git a/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h index 4e947d74046..a710d6d0ce3 100644 --- a/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h @@ -1,9 +1,23 @@ -#ifndef _JAI_SE_MGR_H -#define _JAI_SE_MGR_H +#ifndef JAI_SE_MGR_H_ +#define JAI_SE_MGR_H_ class JAISeCategoryMgr { public: ~JAISeCategoryMgr(); }; -#endif \ No newline at end of file +extern "C" { +void JAISeMgr_NS_dtor(void); +void JAISeMgr_NS_calc(void); +void JAISeMgr_NS_getNumActiveSe(void); +void JAISeMgr_NS_initParams(void); +void JAISeMgr_NS_mixOut(void); +void JAISeMgr_NS_setAudience(void); +void JAISeMgr_NS_setCategoryArrangement(void); +void JAISeMgr_NS_setSeqDataMgr(void); +void JAISeMgr_NS_startSound(void); +void JAISeMgr_NS_stop(void); +void JAISeMgr_NS_stopSoundID(void); +} + +#endif // JAI_SE_MGR_H_ diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h new file mode 100644 index 00000000000..989df52c356 --- /dev/null +++ b/include/JSystem/JAudio2/JAISeqMgr.h @@ -0,0 +1,14 @@ +#ifndef JAISEQMGR_H_ +#define JAISEQMGR_H_ + +// Additional symbols needed for JAISeqMgr +extern "C" { +void JAISeqMgr_NS_calc(void); +void JAISeqMgr_NS_mixOut(void); +void JAISeqMgr_NS_startSound(void); +void JAISeqMgr_NS_stopSoundID(void); +void JAISeqMgr_NS_stop(void); +void JAISeqMgr_NS_stop_X1_(void); +} + +#endif // JAISEQMGR_H_ diff --git a/include/JSystem/JAudio2/JAISound/JAISound.h b/include/JSystem/JAudio2/JAISound/JAISound.h index 20e28e62759..4a9644ce1fd 100644 --- a/include/JSystem/JAudio2/JAISound/JAISound.h +++ b/include/JSystem/JAudio2/JAISound/JAISound.h @@ -120,11 +120,6 @@ public: u8 field_0x93; }; -extern "C" { -void stop__8JAISoundFUl(JAISound*, u32 fadeout); -void stop__8JAISoundFv(JAISound*); -} - class JAISoundHandle { public: JAISoundHandle(); // noninline in JAUClusterSound.cpp @@ -145,4 +140,22 @@ private: JAISound* mSound; }; +extern "C" { +void __ct__14JAISoundHandleFv(void); +void releaseSound__14JAISoundHandleFv(void); + +void JAISoundHandle_NS_dtor(void); + +void stop__8JAISoundFUl(JAISound*, u32 fadeout); +void stop__8JAISoundFv(JAISound*); + +void JAISoundID_NS___as(void); +void JAISoundID_X1_(void); + +void JAISound_NS_acceptsNewAudible(void); +void JAISound_NS_getID(void); +void JAISound_NS_newAudible(void); +void JAISound_NS_releaseHandle(void); +} + #endif \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h b/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h index 2af4e3d0cbb..43d45d5a816 100644 --- a/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h +++ b/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h @@ -8,4 +8,9 @@ public: JAISoundHandle mHandles[24]; }; -#endif // JAISOUNDHANDLES_H_ \ No newline at end of file +extern "C" { +void JAISoundHandles_NS_getFreeHandle(void); +void JAISoundHandles_NS_getHandleSoundID(void); +} + +#endif // JAISOUNDHANDLES_H_ diff --git a/include/JSystem/JAudio2/JAISoundInfo.h b/include/JSystem/JAudio2/JAISoundInfo.h new file mode 100644 index 00000000000..fe4bc3db44e --- /dev/null +++ b/include/JSystem/JAudio2/JAISoundInfo.h @@ -0,0 +1,9 @@ +#ifndef JAISOUNDINFO_H_ +#define JAISOUNDINFO_H_ + +extern "C" { +void JAISoundInfo(void); +void JAISoundInfo_NS_dtor(void); +} + +#endif // JAISOUNDINFO_H_ diff --git a/include/JSystem/JAudio2/JAISoundParamsMove.h b/include/JSystem/JAudio2/JAISoundParamsMove.h new file mode 100644 index 00000000000..022e7d993db --- /dev/null +++ b/include/JSystem/JAudio2/JAISoundParamsMove.h @@ -0,0 +1,13 @@ +#ifndef JAISOUNDPARAMSMOVE_H_ +#define JAISOUNDPARAMSMOVE_H_ + +extern "C" { +void JAISoundParamsMove_NS_moveDolby(void); +void JAISoundParamsMove_NS_moveFxMix(void); +void JAISoundParamsMove_NS_movePan(void); +void JAISoundParamsMove_NS_movePitch(void); + +void moveVolume__18JAISoundParamsMoveFfUl(void); +} + +#endif // JAISOUNDPARAMSMOVE_H_ diff --git a/include/JSystem/JAudio2/JAISoundStarter.h b/include/JSystem/JAudio2/JAISoundStarter.h new file mode 100644 index 00000000000..cd6789685cc --- /dev/null +++ b/include/JSystem/JAudio2/JAISoundStarter.h @@ -0,0 +1,10 @@ +#ifndef JAISOUNDSTARTER_H_ +#define JAISOUNDSTARTER_H_ + +extern "C" { +void JAISoundStarter_NS_ctor(void); +void JAISoundStarter_NS_dtor(void); +void JAISoundStarter_NS_startLevelSound(void); +} + +#endif // JAISOUNDSTARTER_H_ diff --git a/include/JSystem/JAudio2/JAISoundStatus.h b/include/JSystem/JAudio2/JAISoundStatus.h new file mode 100644 index 00000000000..55f451b7665 --- /dev/null +++ b/include/JSystem/JAudio2/JAISoundStatus.h @@ -0,0 +1,10 @@ +#ifndef JAISOUNDSTATUS_H_ +#define JAISOUNDSTATUS_H_ + +// Additional symbols needed for JAISoundStatus +extern "C" { +void JAISoundStatus__NS_lockWhenPrepared(void); +void JAISoundStatus__NS_unlockIfLocked(void); +} + +#endif // JAISOUNDSTATUS_H_ diff --git a/include/JSystem/JAudio2/JAIStreamAramMgr.h b/include/JSystem/JAudio2/JAIStreamAramMgr.h new file mode 100644 index 00000000000..9a83ba00269 --- /dev/null +++ b/include/JSystem/JAudio2/JAIStreamAramMgr.h @@ -0,0 +1,8 @@ +#ifndef JAISTREAMARAMMGR_H_ +#define JAISTREAMARAMMGR_H_ + +extern "C" { +void JAIStreamAramMgr_NS_dtor(void); +} + +#endif // JAISTREAMARAMMGR_H_ diff --git a/include/JSystem/JAudio2/JAIStreamDataMgr.h b/include/JSystem/JAudio2/JAIStreamDataMgr.h new file mode 100644 index 00000000000..32a24c19351 --- /dev/null +++ b/include/JSystem/JAudio2/JAIStreamDataMgr.h @@ -0,0 +1,8 @@ +#ifndef JAISTREAMDATAMGR_H_ +#define JAISTREAMDATAMGR_H_ + +extern "C" { +void JAIStreamDataMgr_NS_dtor(void); +} + +#endif // JAISTREAMDATAMGR_H_ diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h new file mode 100644 index 00000000000..af262d51a10 --- /dev/null +++ b/include/JSystem/JAudio2/JAIStreamMgr.h @@ -0,0 +1,15 @@ +#ifndef JAISTREAMMGR_H_ +#define JAISTREAMMGR_H_ + +// Additional symbols needed for JAIStreamMgr +extern "C" { +void JAIStreamMgr_NS_calc(void); +void JAIStreamMgr_NS_isActive(void); +void JAIStreamMgr_NS_mixOut(void); +void JAIStreamMgr_NS_startSound(void); +void JAIStreamMgr_NS_stop(void); +void JAIStreamMgr_NS_stop_X1_(void); +void JAIStreamMgr_NS_stopSoundID(void); +} + +#endif // JAISTREAMMGR_H_ diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/include/JSystem/JAudio2/JASAudioReseter.h new file mode 100644 index 00000000000..bcd9cd438c9 --- /dev/null +++ b/include/JSystem/JAudio2/JASAudioReseter.h @@ -0,0 +1,11 @@ +#ifndef JASAUDIORESETER_H_ +#define JASAUDIORESETER_H_ + +extern "C" { +void JASAudioReseter(void); +void JASAudioReseter_NS_checkDone(void); +void JASAudioReseter_NS_resume(void); +void JASAudioReseter_NS_start(void); +} + +#endif // JASAUDIORESETER_H_ diff --git a/include/JSystem/JAudio2/JASDriver.h b/include/JSystem/JAudio2/JASDriver.h new file mode 100644 index 00000000000..a1b5bf2173b --- /dev/null +++ b/include/JSystem/JAudio2/JASDriver.h @@ -0,0 +1,12 @@ +#ifndef JASDRIVER_H_ +#define JASDRIVER_H_ + +extern "C" { +void setOutputMode__9JASDriverFUl(void); + +void JASDriver_NS_getSubFrames(void); +void JASDriver_NS_setOutputMode(void); +void JASDriver_NS_waitSubFrame(void); +} + +#endif // JASDRIVER_H_ diff --git a/include/JSystem/JAudio2/JASDsp.h b/include/JSystem/JAudio2/JASDsp.h new file mode 100644 index 00000000000..d74710ffbed --- /dev/null +++ b/include/JSystem/JAudio2/JASDsp.h @@ -0,0 +1,8 @@ +#ifndef JASDSP_H_ +#define JASDSP_H_ + +extern "C" { +void JASDsp_NS_setFXLine(void); +} + +#endif // JASDSP_H_ diff --git a/include/JSystem/JAudio2/JASGenericMemPool.h b/include/JSystem/JAudio2/JASGenericMemPool.h new file mode 100644 index 00000000000..870ba89a9f5 --- /dev/null +++ b/include/JSystem/JAudio2/JASGenericMemPool.h @@ -0,0 +1,12 @@ +#ifndef JASGENERICMEMPOOL_H_ +#define JASGENERICMEMPOOL_H_ + +extern "C" { +void JASGenericMemPool(void); +void JASGenericMemPool_NS_alloc(void); +void JASGenericMemPool_NS_dtor(void); +void JASGenericMemPool_NS_free(void); +void JASGenericMemPool_NS_newMemPool(void); +} + +#endif // JASGENERICMEMPOOL_H_ diff --git a/include/JSystem/JAudio2/JASHeap.h b/include/JSystem/JAudio2/JASHeap.h new file mode 100644 index 00000000000..a359b1fbd6f --- /dev/null +++ b/include/JSystem/JAudio2/JASHeap.h @@ -0,0 +1,11 @@ +#ifndef JASHEAP_H_ +#define JASHEAP_H_ + +extern "C" { +void JASHeap_NS_alloc(void); +void JASHeap_NS___defctor(void); +void JASHeap_NS_dtor(void); +void JASHeap_NS_free(void); +} + +#endif // JASHEAP_H_ diff --git a/include/JSystem/JAudio2/JASKernel.h b/include/JSystem/JAudio2/JASKernel.h new file mode 100644 index 00000000000..4a18d5ad7d9 --- /dev/null +++ b/include/JSystem/JAudio2/JASKernel.h @@ -0,0 +1,8 @@ +#ifndef JASKERNEL_H_ +#define JASKERNEL_H_ + +extern "C" { +void JASKernel_NS_getAramHeap(void); +} + +#endif // JASKERNEL_H_ diff --git a/include/JSystem/JAudio2/JASMemPool.h b/include/JSystem/JAudio2/JASMemPool.h new file mode 100644 index 00000000000..b882b63a363 --- /dev/null +++ b/include/JSystem/JAudio2/JASMemPool.h @@ -0,0 +1,9 @@ +#ifndef JASMEMPOOL_H_ +#define JASMEMPOOL_H_ + +extern "C" { +void JASMemPool_NS_dtor_X4_(void); +void JASMemPool_NS_dtor_X5_(void); +} + +#endif // JASMEMPOOL_H_ diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/include/JSystem/JAudio2/JASResArcLoader.h new file mode 100644 index 00000000000..3e859e11f72 --- /dev/null +++ b/include/JSystem/JAudio2/JASResArcLoader.h @@ -0,0 +1,8 @@ +#ifndef JASRESARCLOADER_H_ +#define JASRESARCLOADER_H_ + +extern "C" { +void JASResArcLoader_NS_getResMaxSize(void); +} + +#endif // JASRESARCLOADER_H_ diff --git a/include/JSystem/JAudio2/JASSoundParams.h b/include/JSystem/JAudio2/JASSoundParams.h new file mode 100644 index 00000000000..3a750458e75 --- /dev/null +++ b/include/JSystem/JAudio2/JASSoundParams.h @@ -0,0 +1,9 @@ +#ifndef JASSOUNDPARAMS_H_ +#define JASSOUNDPARAMS_H_ + +extern "C" { +void JASSoundParams_NS_clamp(void); +void JASSoundParams_NS_combine(void); +} + +#endif // JASSOUNDPARAMS_H_ diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h new file mode 100644 index 00000000000..a73f59284f2 --- /dev/null +++ b/include/JSystem/JAudio2/JASTrack.h @@ -0,0 +1,12 @@ +#ifndef JASTRACK_H_ +#define JASTRACK_H_ + +extern "C" { +void JASTrack_NS_openChild(void); +void JASTrack_NS_readPort(void); +void JASTrack_NS_setFIR(void); +void JASTrack_NS_setIIR(void); +void JASTrack_NS_writePort(void); +} + +#endif // JASTRACK_H_ diff --git a/include/JSystem/JAudio2/JASWaveArc.h b/include/JSystem/JAudio2/JASWaveArc.h new file mode 100644 index 00000000000..bb274f691ee --- /dev/null +++ b/include/JSystem/JAudio2/JASWaveArc.h @@ -0,0 +1,11 @@ +#ifndef JASWAVEARC_H_ +#define JASWAVEARC_H_ + +// Additional symbols needed for JASWaveArc +extern "C" { +void JASWaveArc_NS_erase(void); +void JASWaveArc_NS_load(void); +void JASWaveArc_NS_loadTail(void); +} + +#endif // JASWAVEARC_H_ diff --git a/include/JSystem/JAudio2/JAU.h b/include/JSystem/JAudio2/JAU.h new file mode 100644 index 00000000000..c69ee24b81f --- /dev/null +++ b/include/JSystem/JAudio2/JAU.h @@ -0,0 +1,11 @@ +#ifndef JAU_H_ +#define JAU_H_ + +extern "C" { +void JAU_JAIInitializer(void); +void JAU_JAIInitializer_NS_initJAInterface(void); +void JAU_JASInitializer(void); +void JAU_JASInitializer_NS_initJASystem(void); +} + +#endif // JAU_H_ diff --git a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h b/include/JSystem/JAudio2/JAUAudioArcInterpreter.h new file mode 100644 index 00000000000..9b6593c9235 --- /dev/null +++ b/include/JSystem/JAudio2/JAUAudioArcInterpreter.h @@ -0,0 +1,8 @@ +#ifndef JAUAUDIOARCINTERPRETER_H_ +#define JAUAUDIOARCINTERPRETER_H_ + +extern "C" { +void JAUAudioArcInterpreter_NS_dtor(void); +} + +#endif // JAUAUDIOARCINTERPRETER_H_ diff --git a/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h b/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h index d87285eb64d..aa801ff4183 100644 --- a/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h +++ b/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h @@ -3,4 +3,10 @@ struct JAUSection; // goes in JAudio2.a JAUAudioArcLoader.o +extern "C" { +void __ct__16Z2AudioArcLoaderFP10JAUSection(void); +void JAUAudioArcLoader(void); // ctor +void JAUAudioArcLoader_NS_load(void); +} + #endif // JAUAUDIOARCLOADER_H_ \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAUNewSectionHeap.h b/include/JSystem/JAudio2/JAUNewSectionHeap.h new file mode 100644 index 00000000000..cf9c7715ac7 --- /dev/null +++ b/include/JSystem/JAudio2/JAUNewSectionHeap.h @@ -0,0 +1,8 @@ +#ifndef JAUNEWSECTIONHEAP_H_ +#define JAUNEWSECTIONHEAP_H_ + +extern "C" { +void JAUNewSectionHeap_X1_(void); +} + +#endif // JAUNEWSECTIONHEAP_H_ diff --git a/include/JSystem/JAudio2/JAUSection.h b/include/JSystem/JAudio2/JAUSection.h new file mode 100644 index 00000000000..c636da1f920 --- /dev/null +++ b/include/JSystem/JAudio2/JAUSection.h @@ -0,0 +1,8 @@ +#ifndef JAUSECTION_H_ +#define JAUSECTION_H_ + +extern "C" { +void JAUSection_NS_finishBuild(void); +} + +#endif // JAUSECTION_H_ diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h new file mode 100644 index 00000000000..823dad609fa --- /dev/null +++ b/include/JSystem/JAudio2/JAUSectionHeap.h @@ -0,0 +1,12 @@ +#ifndef JAUSECTIONHEAP_H_ +#define JAUSECTIONHEAP_H_ + +extern "C" { +void JAUSectionHeap_NS_getOpenSection(void); +void JAUSectionHeap_NS_loadDynamicSeq(void); +void JAUSectionHeap_NS_newDynamicSeqBlock(void); +void JAUSectionHeap_NS_releaseIdleDynamicSeqDataBlock(void); +void JAUSectionHeap_NS_setSeqDataArchive(void); +} + +#endif // JAUSECTIONHEAP_H_ diff --git a/include/JSystem/JAudio2/JAUSoundAnimation.h b/include/JSystem/JAudio2/JAUSoundAnimation.h new file mode 100644 index 00000000000..150e4015ebc --- /dev/null +++ b/include/JSystem/JAudio2/JAUSoundAnimation.h @@ -0,0 +1,9 @@ +#ifndef JAUSOUNDANIMATION_H_ +#define JAUSOUNDANIMATION_H_ + +extern "C" { +void JAUSoundAnimation_NS_getStartSoundIndex(void); +void JAUSoundAnimation_NS_getEndSoundIndex(void); +} + +#endif // JAUSOUNDANIMATION_H_ diff --git a/include/JSystem/JAudio2/JAUSoundTable.h b/include/JSystem/JAudio2/JAUSoundTable.h new file mode 100644 index 00000000000..8b94bbcdd96 --- /dev/null +++ b/include/JSystem/JAudio2/JAUSoundTable.h @@ -0,0 +1,9 @@ +#ifndef JAUSOUNDTABLE_H_ +#define JAUSOUNDTABLE_H_ + +extern "C" { +void JAUSoundTable_NS_getData(void); +void JAUSoundTable_NS_getTypeID(void); +} + +#endif // JAUSOUNDTABLE_H_ diff --git a/include/JSystem/JMath/vector.h b/include/JSystem/JMath/vector.h new file mode 100644 index 00000000000..348fec9c3a1 --- /dev/null +++ b/include/JSystem/JMath/vector.h @@ -0,0 +1,8 @@ +#ifndef JSYSTEM_JMATH_VECTOR_H_ +#define JSYSTEM_JMATH_VECTOR_H_ + +extern "C" { +void JMAFastVECNormalize(void); +} + +#endif // JSYSTEM_JMATH_VECTOR_H_ diff --git a/include/JSystem/JSupport/JSUMemoryInputStream.h b/include/JSystem/JSupport/JSUMemoryInputStream.h new file mode 100644 index 00000000000..16a839dd945 --- /dev/null +++ b/include/JSystem/JSupport/JSUMemoryInputStream.h @@ -0,0 +1,8 @@ +#ifndef JSUMEMORYINPUTSTREAM_H_ +#define JSUMEMORYINPUTSTREAM_H_ + +extern "C" { +void JSUMemoryInputStream_NS_setBuffer(void); +} + +#endif // JSUMEMORYINPUTSTREAM_H_ \ No newline at end of file diff --git a/include/SComponent/c_cc_d/c_cc_d.h b/include/SComponent/c_cc_d/c_cc_d.h index ff091cff81d..dc897238ddd 100644 --- a/include/SComponent/c_cc_d/c_cc_d.h +++ b/include/SComponent/c_cc_d/c_cc_d.h @@ -2,6 +2,7 @@ #define C_CC_D_H_ #include "SComponent/c_m3d/c_m3d.h" +#include "SComponent/c_m3d_g_cyl.h" #include "global.h" class cCcD_ShapeAttr { diff --git a/include/SComponent/c_m3d/c_m3d.h b/include/SComponent/c_m3d/c_m3d.h index 622e68a5b57..d1b028b036f 100644 --- a/include/SComponent/c_m3d/c_m3d.h +++ b/include/SComponent/c_m3d/c_m3d.h @@ -19,15 +19,6 @@ private: float field_0x1c; }; -class cM3dGCyl { /* Cylinder class */ -public: -private: - cXyz center; - float radius; - float height; - void* vtable; -}; - class cM3dGAab { /* Axis-aligned bounding box */ public: private: diff --git a/include/SComponent/c_m3d_g_cyl.h b/include/SComponent/c_m3d_g_cyl.h index 47ba855dbfc..de3300f0e45 100644 --- a/include/SComponent/c_m3d_g_cyl.h +++ b/include/SComponent/c_m3d_g_cyl.h @@ -18,6 +18,12 @@ public: bool cross(const cM3dGSph*, cXyz*) const; bool cross(const cM3dGCyl*, cXyz*) const; void calcMinMax(cXyz*, cXyz*); + +private: + cXyz center; + float radius; + float height; + void* vtable; }; #endif \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_sph.h b/include/SComponent/c_m3d_g_sph.h index 07021ee1d9f..0ee96bfd7b9 100644 --- a/include/SComponent/c_m3d_g_sph.h +++ b/include/SComponent/c_m3d_g_sph.h @@ -18,4 +18,9 @@ public: void GetMinMaxCube(cXyz&, cXyz&) const; }; +// additional symbols needed for cM3dGSph +extern "C" { +void Set__8cM3dGSphFRC4cXyzf(void); +} + #endif \ No newline at end of file diff --git a/include/SComponent/c_sxyz.h b/include/SComponent/c_sxyz.h index 2839bb39ae3..ec0365d7fa3 100644 --- a/include/SComponent/c_sxyz.h +++ b/include/SComponent/c_sxyz.h @@ -17,4 +17,10 @@ public: extern csXyz lbl_80451160; // SComponent::csXyz::Zero +// additional symbols needed for csXyz +extern "C" { +void __pl__FsRC7cSAngle(void); +void __mi__FsRC7cSAngle(void); +} + #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2Audible/Z2Audible.h b/include/Z2AudioLib/Z2Audible/Z2Audible.h new file mode 100644 index 00000000000..fb9d2b80671 --- /dev/null +++ b/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_ diff --git a/include/Z2AudioLib/Z2AudibleAbsPos/Z2AudibleAbsPos.h b/include/Z2AudioLib/Z2AudibleAbsPos/Z2AudibleAbsPos.h new file mode 100644 index 00000000000..6a61c040c1c --- /dev/null +++ b/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_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h b/include/Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h new file mode 100644 index 00000000000..60f59b2aeac --- /dev/null +++ b/include/Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h @@ -0,0 +1,8 @@ +#ifndef Z2AUDIBLECHANNEL_H_ +#define Z2AUDIBLECHANNEL_H_ + +extern "C" { +void Z2AudibleChannel(void); +} + +#endif // Z2AUDIBLECHANNEL_H_ diff --git a/include/Z2AudioLib/Z2Audience/Z2Audience.h b/include/Z2AudioLib/Z2Audience/Z2Audience.h new file mode 100644 index 00000000000..9c5b52ca599 --- /dev/null +++ b/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_ diff --git a/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h b/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h index de83a57545a..6f3c3e981de 100644 --- a/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h +++ b/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 \ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudioCamera/Z2AudioCamera.h b/include/Z2AudioLib/Z2AudioCamera/Z2AudioCamera.h new file mode 100644 index 00000000000..eecd821d71b --- /dev/null +++ b/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_ diff --git a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h index 7d8a89d4e7b..92da30fe0d9 100644 --- a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h +++ b/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 \ No newline at end of file +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_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2Calc/Z2Calc.h b/include/Z2AudioLib/Z2Calc/Z2Calc.h index 99599b29338..3e133f0dd31 100644 --- a/include/Z2AudioLib/Z2Calc/Z2Calc.h +++ b/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_ diff --git a/include/Z2AudioLib/Z2Creature/Z2Creature.h b/include/Z2AudioLib/Z2Creature/Z2Creature.h index d4ebd0e5970..f4029f7db9d 100644 --- a/include/Z2AudioLib/Z2Creature/Z2Creature.h +++ b/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_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h index 7dddeba34ee..398dd625b2a 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h +++ b/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 \ No newline at end of file diff --git a/include/Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h b/include/Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h new file mode 100644 index 00000000000..4d4b18e922a --- /dev/null +++ b/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_ diff --git a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h index 71ee62252ae..10ea23a280f 100644 --- a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h +++ b/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*, u32, float, float, float, float, // float, u32); -}; \ No newline at end of file +}; + +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_ diff --git a/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h index f9007f5e3aa..d723407e432 100644 --- a/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h +++ b/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 \ No newline at end of file + +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_ diff --git a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h index aaa5c147896..90b4b6b6c24 100644 --- a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h +++ b/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 diff --git a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h index 08508124c9a..8bf7529393c 100644 --- a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h +++ b/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 diff --git a/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h index 2edc4bf2e92..8976015fc7e 100644 --- a/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h +++ b/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 \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h index ce6e15f7008..a306bb110f1 100644 --- a/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h +++ b/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 \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h index dd0a79327a9..69a9c7f332e 100644 --- a/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h +++ b/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 \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h index 92fcb6dd070..211a3382344 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h +++ b/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_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h index f7aed0b1e1b..93a24d963d6 100644 --- a/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h +++ b/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 \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h b/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h index aaebddf148b..456763c0438 100644 --- a/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h +++ b/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h @@ -28,4 +28,14 @@ struct Z2SoundStarter { extern Z2SoundStarter* lbl_80450B74; +extern "C" { +void __ct__14Z2SoundStarterFb(void); +void __dt__14Z2SoundStarterFv(void); + +void getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc(void); +void setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc(void); +void startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl( + void); +} + #endif // Z2SOUNDSTARTER_H_ diff --git a/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h index 4c592210ae7..e1e7ec82c12 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h +++ b/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h @@ -39,4 +39,23 @@ private: //! const placement is fixed. extern Z2SpeechMgr2* lbl_80450B70; // m_Do_main::JASGlobalInstance::sInstance +// Additional symbols needed for Z2SpeechMgr2.cpp +extern "C" { +void __ct__15Z2SpeechStarterFv(void); + +void __ct__12Z2SpeechMgr2Fv(void); +void Z2SpeechMgr2_NS_framework(void); +void Z2SpeechMgr2_NS_isMidnaSpeak(void); +void Z2SpeechMgr2_NS_isNonVerbal(void); +void Z2SpeechMgr2_NS_playOneShotVoice(void); +void Z2SpeechMgr2_NS_selectTail(void); +void Z2SpeechMgr2_NS_selectUnit(void); +void Z2SpeechMgr2_NS_setString(void); +void Z2SpeechMgr2_NS_setTextCount(void); +void Z2SpeechMgr2_NS_speakOneWord(void); + +void func_802CCFF8(void); +void func_802CBCEC(void); +} + #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SpotMic/Z2SpotMic.h b/include/Z2AudioLib/Z2SpotMic/Z2SpotMic.h new file mode 100644 index 00000000000..6d63da23874 --- /dev/null +++ b/include/Z2AudioLib/Z2SpotMic/Z2SpotMic.h @@ -0,0 +1,14 @@ +#ifndef Z2SPOTMIC_H_ +#define Z2SPOTMIC_H_ + +extern "C" { +void Z2SpotMic(void); +void Z2SpotMic_NS_calcMicDist(void); +void Z2SpotMic_NS_calcMicPriority(void); +void Z2SpotMic_NS_calcMicVolume(void); +void Z2SpotMic_NS_calcVolumeFactor(void); +void Z2SpotMic_NS_clearMicState(void); +void Z2SpotMic_NS_setMicState(void); +} + +#endif // Z2SPOTMIC_H_ diff --git a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h index 69607e5aec5..33a5852b57c 100644 --- a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h @@ -42,15 +42,19 @@ struct Z2StatusMgr { }; extern "C" { +void __ct__11Z2StatusMgrFv(void); + +bool isMovieDemo__11Z2StatusMgrFv(void); void menuIn__11Z2StatusMgrFv(void); void menuOut__11Z2StatusMgrFv(void); -bool isMovieDemo__11Z2StatusMgrFv(void); -void Z2SceneMgr_NS_sceneBgmStart(void); -void setDemoName__11Z2StatusMgrFPc(char*); -// bool checkDayTime__11Z2StatusMgrFv(void); +void processHeartGaugeSound__11Z2StatusMgrFv(void); void processTime__11Z2StatusMgrFv(void); +void setCameraGroupInfo__11Z2StatusMgrFUc(u8); +void setCameraPolygonPos__11Z2StatusMgrFP3Vec(Vec*); +void setDemoName__11Z2StatusMgrFPc(char*); void setEventBit__11Z2StatusMgrFPv(void*); -void Z2FxLineMgr_NS_setUnderWaterFx(void); + +void Z2SceneMgr_NS_sceneBgmStart(void); } extern Z2StatusMgr* lbl_80450B7C; // Z2StatusMgr sInstance diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h index 7ee62684255..11ae5ae5cf7 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h +++ b/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h @@ -22,4 +22,20 @@ class Z2WolfHowlMgr { void skipCorrectDemo(); }; +extern "C" { +void calcPitchMod__13Z2WolfHowlMgrFff(void); +void calcVolumeMod__13Z2WolfHowlMgrFf(void); +void checkLine__13Z2WolfHowlMgrFv(void); +void getCorrectLine__13Z2WolfHowlMgrFUc(void); +void getCorrectLineNum__13Z2WolfHowlMgrFv(void); +void getNowInputValue__13Z2WolfHowlMgrFv(void); +void getNowPitch__13Z2WolfHowlMgrFv(void); +void getOnLineNum__13Z2WolfHowlMgrFv(void); +void resetState__13Z2WolfHowlMgrFv(void); +void startGuideMelody__13Z2WolfHowlMgrFb(void); + +void func_802CBB7C(void); +void func_802CB6EC(void); +} + #endif // Z2WOLFHOWLMGR_H_ \ No newline at end of file diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index 16acdf25219..686726727f9 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -480,4 +480,8 @@ inline u32 dComIfGp_getNowVibration(void) { return g_dComIfG_gameInfo.getPlay().getNowVibration(); } +extern "C" { +void dComIfGs_staffroll_next_go(void); +} + #endif \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index 530db6fedcd..7f86fcd9f68 100644 --- a/include/functions.h +++ b/include/functions.h @@ -497,82 +497,25 @@ void mDoMch_HeapCheckAll(void); // Z2SoundMgr extern "C" { -void resetFilterAll__10Z2SoundMgrFv(void); -void moveVolume__18JAISoundParamsMoveFfUl(void); -void Z2SeqMgr_NS_setBattleBgmOff(void); -void setSceneExist__10Z2SceneMgrFb(void); - -void Z2SceneMgr_NS_sceneChange(void); void __ct__10JAISoundIDFRC10JAISoundID(void); -void Z2EnvSeMgr_NS_initSceneEnvSe(void); -void setFieldBgmPlay__8Z2SeqMgrFb(void); -void Z2SeqMgr_NS_setTimeProcVolMod(void); -void Z2SeqMgr_NS_setHeightVolMod(void); -void JAUSoundTable_NS_getTypeID(void); -void JAIStreamMgr_NS_isActive(void); -void JAISound_NS_getID(void); void JSUList_X1_(void); void dComIfGs_isStageSwitch(void); void dComIfGs_getStartPoint(void); void isSwitch__10dSv_info_cCFii(void); -void setForceBattleArea__13Z2SoundObjMgrFbUsUsUs(void); -void Z2SeqMgr_NS_unMuteSceneBgm(void); -void Z2SeqMgr_NS_muteSceneBgm(void); void dComIfGs_isEventBit(void); -void JAISoundID_NS___as(void); void dComIfGs_isSaveSwitch(void); -void setGhostEnemyState__13Z2SoundObjMgrFUc(void); -void Z2SeMgr_NS_resetCrowdSize(void); -void Z2SeqMgr_NS_setTwilightGateVol(void); -void Z2SeqMgr_NS_setWindStoneVol(void); -void Z2SeqMgr_NS_resetBattleBgmParams(void); -void JAISoundID_X1_(void); - -void moveVolume__18JAISoundParamsMoveFfUl(void); -} -// Z2LinkMgr -extern "C" { -void __ct__10Z2CreatureFv(void); -void Z2CreatureLink_NS_startLinkSound(void); -void Z2SoundObjSimple(void); -void JAISoundStarter_NS_dtor(void); -void Z2Creature_NS_dtor(void); -void __dt__14Z2SoundObjBaseFv(void); -void Z2Creature_NS_deleteObject(void); -void deleteKantera__14Z2CreatureLinkFv(void); -void Z2Creature_NS_init_X1_(void); -void deleteObject__14Z2SoundObjBaseFv(void); -void moveVolume__18JAISoundParamsMoveFfUl(void); -void Z2CreatureLink_NS_startLinkSoundLevel(void); -void Z2Creature_NS_framework(void); -void Z2Audience_NS_setTargetVolume(void); -void setGhostEnemyState__13Z2SoundObjMgrFUc(void); -void Z2FxLineMgr_NS_setFxForceOff(void); -void JAISoundParamsMove_NS_movePitch(void); -void Z2Calc_NS_linearTransform(void); -void getHandleSoundID__14Z2SoundHandlesF10JAISoundID(void); -void Z2SeqMgr_NS_setBattleSeqState(void); -void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(void); -void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(void); -void setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc(void); -void Z2SoundObjBase_NS_startCollisionSE(void); -void Z2SeqMgr_NS_setBattleLastHit(void); } // Z2Calc extern "C" { -void linearTransform__6Z2CalcFfffffb(void); // MSL_C.PPCEABI.bare.H::exp double func_8036C740(double); // MSL_C.PPCEABI.bare.H::pow double func_8036C780(double, double); -void getRandom_0_1__6Z2CalcFv(void); -void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(void); } // d_a_horse_static extern "C" { -void Z2CreatureRide_NS_setLinkRiding(void); void checkDownDamage__10e_wb_classFv(void); } @@ -5562,569 +5505,6 @@ void __ct__7cSGlobeFRC7cSGlobe(void); void __ct__7cSGlobeFv(void); void mDoMtx_stack_c_NS_transM(float, float, float); - -void setCameraPolygonPos__11Z2StatusMgrFP3Vec(Vec*); -void setCameraGroupInfo__11Z2StatusMgrFUc(u8); -} - -// additional symbols needed for Z2SpeechMgr2.cpp -// autogenerated by split.py v0.3 at 2021-01-04 22:36:24.804435 -extern "C" { -void Z2EnvSeMgr_NS_getFogDensity(void); -void Z2SpeechMgr2_NS_isNonVerbal(void); -void __ct__12Z2SpeechMgr2Fv(void); -void _savegpr_29(void); -void __ct__15Z2SpeechStarterFv(void); -void Z2SpeechMgr2_NS_setString(void); -void Z2SpeechMgr2_NS_speakOneWord(void); -void JAISoundParamsMove_NS_moveDolby(void); -void Z2SpeechMgr2_NS_isMidnaSpeak(void); -void Z2SpeechMgr2_NS_setTextCount(void); -void func_802CCFF8(void); -void _savegpr_28(void); -void _restgpr_28(void); -void JAISoundParamsMove_NS_movePan(void); -void Z2SpeechMgr2_NS_framework(void); -// void subBgmStart__8Z2SeqMgrFUl(void); -void Z2SpeechMgr2_NS_playOneShotVoice(void); -void JAISoundParamsMove_NS_moveFxMix(void); -void _restgpr_29(void); -void func_802CBCEC(void); -void Z2SpeechMgr2_NS_selectTail(void); -void _savegpr_26(void); -void _restgpr_26(void); -void Z2SpeechMgr2_NS_selectUnit(void); -void __ct__14Z2SoundStarterFb(void); -} - -// additional symbols needed for Z2Audience.cpp -// autogenerated by split.py v0.3 at 2021-01-04 22:46:19.894195 -extern "C" { -void Z2Audience_NS_calcOffMicSound(void); -void Z2Audience_NS_convertAbsToRel(void); -void JAIAudience_NS_dtor(void); -void Z2Audience3DSetting_NS_updateVolumeDist(void); -void Z2Audience_NS_calcRelPosVolume(void); -void Z2Audience3DSetting(void); -void Z2Audience_NS_dtor(void); -void Z2Audience_NS_calcPitch_(void); -void func_802BBE98(void); -void _restgpr_27(void); -void func_802BDEDC(void); -void func_802BD4D4(void); -void Z2Audible(void); -void func_802BD71C(void); -void _restgpr_25(void); -void JASGenericMemPool_NS_dtor(void); -void Z2SpotMic_NS_calcMicVolume(void); -void _savegpr_27(void); -void Z2Audience3DSetting_NS_initVolumeDist(void); -void Z2Audience_NS_calcFxMix_(void); -void Z2Audible_NS_getDistVolBit(void); -void Z2AudibleAbsPos_NS_init(void); -void Z2AudioCamera_NS_setCameraState_X1_(void); -void Z2Audience3DSetting_NS_initDolbyDist(void); -void func_802BD5B8(void); -void Z2SoundInfo_NS_getAudibleSwFull(void); -void Z2AudioCamera_NS_convertAbsToRel(void); -void func_802BDED4(void); -void Z2Audible_NS_getChannel(void); -void JASMemPool_NS_dtor_X5_(void); -void Z2SpotMic_NS_calcVolumeFactor(void); -void Z2SpotMic_NS_clearMicState(void); -void Z2AudibleChannel(void); -void JASSoundParams_NS_clamp(void); -void Z2Audible_NS_setOuterParams(void); -void func_802BD510(void); -void Z2AudibleAbsPos_NS_calc(void); -void Z2Audience_NS_calcRelPosDolby(void); -void func_802BD338(void); -void Z2Audience3DSetting_NS_init(void); -void Z2AudioCamera_NS_isInSight(void); -void Z2Audience3DSetting_NS_updateDolbyDist(void); -void _savegpr_25(void); -void JAIAudible_NS_dtor(void); -void Z2AudioCamera(void); -void Z2Audience_NS_calcVolume_(void); -void Z2AudioCamera_NS_convertAbsToRel_X1_(void); -void JASGenericMemPool(void); -void Z2AudioCamera_NS_setCameraState(void); -void Z2SpotMic_NS_calcMicPriority(void); -void JASSoundParams_NS_combine(void); -void Z2AudioCamera_NS_init(void); -void JASGenericMemPool_NS_alloc(void); -void Z2Audience_NS_calcPitchDoppler_(void); -void Z2SpotMic(void); -void Z2SpotMic_NS_calcMicDist(void); -void Z2Audience_NS_calcRelPosPan(void); -void Z2Audience_NS_calcDeltaPriority_(void); -void func_802BBED0(void); -void JASGenericMemPool_NS_free(void); -void Z2SpotMic_NS_setMicState(void); -} - -// additional symbols needed for Z2EnvSeMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-04 22:52:26.199108 -extern "C" { -void Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel(void); -void Z2EnvSeMgr_NS_startStaticEnvSe(void); -void JAISound_NS_releaseHandle(void); -void Z2EnvSeDir_NS_dtor(void); -void Z2EnvSeMgr_NS_startFallSe(void); -void Z2EnvSeMgr_NS_initLv3WaterSe(void); -void Z2EnvSeMgr_NS_startEtcSe(void); -void Z2EnvSeAutoPan_NS_setPanParam(void); -void Z2EnvSeMgr_NS_registLv3WaterSePos(void); -void func_802C93A0(void); -void Z2EnvSeMgr_NS_initFallSe(void); -void func_802C8258(void); -void Z2EnvSeDir_NS_calcPan(void); -void Z2EnvSeAutoPan(void); -void Z2EnvSeMgr_NS_initStaticEnvSe(void); -void JAISoundStarter_NS_startLevelSound(void); -void func_802C7FB4(void); -void Z2EnvSeMgr_NS_registRiverSePos(void); -void func_802C92C8(void); -void Z2EnvSeBase(void); -void calcNoise1f__Q26Z2Calc8FNoise1fFv(void); -void func_802C9400(void); -void Z2EnvSeAutoPan_NS_calcPan(void); -void Z2EnvSeBase_NS_dtor(void); -void Z2EnvSeMgr_NS_registWindowPos(void); -// void getPanPower__12Z2MultiSeMgrFv(void); -void Z2EnvSeBase_NS_startEnvSe(void); -void Z2SoundMgr_NS_setIIR(void); -void Z2EnvSeMgr_NS_registEtcSePos(void); -void Z2EnvSeMgr_NS_startFarThunderSe(void); -void getRandom__6Z2CalcFfff(void); -void Z2EnvSeMgr_NS_startLv3WaterSe(void); -void func_802C92EC(void); -void __dt__12Z2MultiSeMgrFv(void); -void resetMultiSePos__12Z2MultiSeMgrFv(void); -void Z2EnvSeBase_NS_startEnvSeLevel(void); -void Z2EnvSeMgr_NS_startRiverSe(void); -void JMAFastVECNormalize(void); -void Z2EnvSeDir(void); -// void registMultiSePos__12Z2MultiSeMgrFP3Vec(void); -void Z2EnvSeMgr_NS_resetSceneInner(void); -// void getDolbyPower__12Z2MultiSeMgrFv(void); -void Z2EnvSeMgr_NS_framework(void); -void Z2EnvSeMgr_NS_registFallSePos(void); -void __ct__12Z2MultiSeMgrFv(void); -void setParam__Q26Z2Calc8FNoise1fFfff(void); -void Z2EnvSeMgr_NS_playSceneEnvSe(void); -void Z2EnvSeAutoPan_NS_dtor(void); -void Z2EnvSeDir_NS_setPanDir(void); -void Z2EnvSeMgr_NS_initRiverSe(void); -void Z2EnvSeMgr_NS_initEtcSe(void); -void Z2EnvSeDir_NS_startEnvSeDirLevel(void); -} - -// additional symbols needed for Z2SoundMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-04 22:59:50.707044 -extern "C" { -void Z2SoundMgr_NS_stop(void); -void JAISeqMgr_NS_stop(void); -void JAIStreamMgr_NS_stopSoundID(void); -void JAIStreamMgr_NS_stop(void); -// void changeBgmStatus__8Z2SeqMgrFl(void); -void JASDriver_NS_waitSubFrame(void); -void JAIStreamMgr_NS_calc(void); -void Z2SeqMgr_NS_onFieldBgmJumpStart(void); -void seqCallback(void); -void Z2SoundMgr_NS_stopSoundID(void); -void JAIStreamMgr_NS_startSound(void); -void JAISeMgr_NS_startSound(void); -void JAIStreamMgr_NS_mixOut(void); -void onVariantBgmJumpEnd__8Z2SeqMgrFb(void); -// void seMoveVolumeAll__7Z2SeMgrFfUl(void); -void JAISeMgr_NS_stopSoundID(void); -void JAUSectionHeap_NS_loadDynamicSeq(void); -void JASTrack_NS_writePort(void); -void dComIfGs_staffroll_next_go(void); -// void bgmStart__8Z2SeqMgrFUlUll(void); -void Z2SoundMgr_NS_calc(void); -void Z2SoundMgr_NS_framework(void); -void JAUSectionHeap_NS_releaseIdleDynamicSeqDataBlock(void); -void func_802A9EE8(void); -void Z2SoundMgr_NS_initParams(void); -void JAISeqMgr_NS_calc(void); -void JAISeMgr_NS_mixOut(void); -void JAISeMgr_NS_getNumActiveSe(void); -void Z2SoundMgr_NS_stopSync(void); -void _savegpr_24(void); -void JAISeCategoryMgr_NS_pause(void); -void Z2SeqMgr_NS_setChildTrackVolume(void); -void Z2SeqMgr_NS_onFieldBgmJumpEnd(void); -void Z2SoundMgr_NS_mixOut(void); -void JAISeqMgr_NS_startSound(void); -void JASTrack_NS_setIIR(void); -void _restgpr_24(void); -void Z2SoundMgr_NS_setFilterOff(void); -void JAISeMgr_NS_stop(void); -void JAISeMgr_NS_initParams(void); -void JASTrack_NS_setFIR(void); -void Z2SoundMgr_NS_isPlayingSoundID(void); -void getSwBit__11Z2SoundInfoCF10JAISoundID(void); -void JAISeMgr_NS_calc(void); -void JAISeqMgr_NS_stopSoundID(void); -void Z2SoundMgr_NS_multiVolumeSoundID(void); -void JAIStreamMgr_NS_stop_X1_(void); -void JAISeqMgr_NS_mixOut(void); -} - -// additional symbols needed for Z2AudioMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-04 23:11:48.333599 -extern "C" { -void JASAudioReseter_NS_resume(void); -void Z2SeqMgr_NS_processBgmFramework(void); -void processHeartGaugeSound__11Z2StatusMgrFv(void); -void JASResArcLoader_NS_getResMaxSize(void); -void JAISoundInfo(void); -void JAISeMgr_NS_setCategoryArrangement(void); -void JASDriver_NS_setOutputMode(void); -void func_802CDCEC(void); -void JAU_JASInitializer(void); -void __ct__7Z2SeMgrFv(void); -void JASHeap_NS_free(void); -void Z2AudioMgr_NS_init(void); -void __ct__16Z2AudioArcLoaderFP10JAUSection(void); -void JAUAudioArcLoader_NS_load(void); -void __ct__10Z2SceneMgrFv(void); -void func_8036679C(void); -void JASHeap_NS_alloc(void); -void JAIStreamAramMgr_NS_dtor(void); -void JAUSectionHeap_NS_setSeqDataArchive(void); -void menuOut__11Z2StatusMgrFv(void); -void processTime__11Z2StatusMgrFv(void); -void initSe__7Z2SeMgrFv(void); -void __ct__8Z2SeqMgrFv(void); -void JAUNewSectionHeap_X1_(void); -void Z2AudioMgr_NS_gframeProcess(void); -void JAUAudioArcInterpreter_NS_dtor(void); -void JAUSection_NS_finishBuild(void); -void processSeFramework__7Z2SeMgrFv(void); -void JAUSectionHeap_NS_newDynamicSeqBlock(void); -void JAU_JAIInitializer(void); -void Z2AudioMgr_NS_resetRecover(void); -void JAU_JASInitializer_NS_initJASystem(void); -void __ct__11Z2StatusMgrFv(void); -void JAISeMgr_NS_setAudience(void); -void Z2AudioMgr_NS_zeldaGFrameWork(void); -void func_80362ABC(void); -void func_802CD7F8(void); -void resetProcess__10Z2AudioMgrFUlb(void); -void JAISeMgr_NS_setSeqDataMgr(void); -void JASKernel_NS_getAramHeap(void); -void func_802CDB1C(void); -void Z2SceneMgr_NS_framework(void); -void JASGenericMemPool_NS_newMemPool(void); -void JASAudioReseter(void); -void JASAudioReseter_NS_start(void); -void func_802CDB68(void); -void Z2SoundMgr_NS_ctor(void); -void JASAudioReseter_NS_checkDone(void); -void func_802CDC08(void); -void JAU_JAIInitializer_NS_initJAInterface(void); -void JASDriver_NS_getSubFrames(void); - -// manual -// ctors -void Z2FxLineMgr(void); -void Z2Audience(void); -void __ct__13Z2SoundObjMgrFv(void); -void JASHeap_NS___defctor(); -void JASHeap_NS_dtor(); -void JASMemPool_NS_dtor_X4_(); -} - -// additional symbols needed for Z2Creature.cpp -// autogenerated by split.py v0.3 at 2021-01-04 23:26:27.773263 -extern "C" { -void func_802C1B7C(void); -void func_802C2C84(void); -void func_802C110C(void); -void func_802C0C6C(void); -void func_802C0B70(void); -void Z2SoundObjMgr_NS_getEnemyID(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 Z2_E_mm_modPitch(void); -void func_802C2CD4(void); -void func_802C0BE8(void); -void func_802C10B4(void); -void func_802C1C24(void); -void _savegpr_20(void); -void func_802C199C(void); -void func_802C20E8(void); -void _restgpr_20(void); -void Z2Creature_NS_startCreatureVoice(void); -void _restgpr_23(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 Z2SoundObjAnime_NS_initAnime(void); -void func_802C06F4(void); -void func_802C1A14(void); -void Z2CreatureCitizen_NS_setMdlType(void); -void func_802C1D10(void); -void init__14Z2SoundObjBaseFP3VecUc(void); -void Z2CreatureCitizen_NS_init(void); -void func_802C0AF8(void); -void func_802C10D4(void); -void func_802C1094(void); -void func_802C0ED8(void); -void Z2_E_sw_modPitch(void); -void func_802C1B90(void); -void Z2_B_zan_modPitch(void); -void func_802C136C(void); -void Z2SoundObjAnime(void); -void Z2CreatureEnemy_NS_deleteObject(void); -void func_802C1D4C(void); -void incrCrowdSize__7Z2SeMgrFv(void); -void func_802C2578(void); -void func_802C1FB0(void); -void decrCrowdSize__7Z2SeMgrFv(void); -void Z2SoundObjAnime_NS_updateAnime(void); -void func_802C2670(void); -void func_802C2194(void); -void func_802C1948(void); -void func_802C0C10(void); -void _savegpr_23(void); -void func_802C0D04(void); -void Z2SoundObjMgr_NS_removeEnemy(void); -void func_802C0618(void); -void func_802C1FFC(void); -void func_802C24D0(void); -void func_802C19D8(void); -void Z2_E_ms_modVol(void); - -// manual -void __ct__14Z2SoundObjBaseFv(void); -void Z2SoundObjSimple_NS_dtor(void); -} - -// additional symbols needed for Z2SoundStarter.cpp -// autogenerated by split.py v0.3 at 2021-01-04 23:38:28.244547 -extern "C" { -void JASTrack_NS_readPort(void); -void JASTrack_NS_openChild(void); -void getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc(void); -void startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl( - void); -void __dt__14Z2SoundStarterFv(void); -void JAISoundStarter_NS_ctor(void); -} - -// additional symbols needed for Z2WolfHowlMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-04 23:43:51.357906 -extern "C" { -void getCorrectLineNum__13Z2WolfHowlMgrFv(void); -void getNowPitch__13Z2WolfHowlMgrFv(void); -void getCorrectLine__13Z2WolfHowlMgrFUc(void); -void calcPitchMod__13Z2WolfHowlMgrFff(void); -void func_802CBB7C(void); -void calcVolumeMod__13Z2WolfHowlMgrFf(void); -void startGuideMelody__13Z2WolfHowlMgrFb(void); -void func_802CB6EC(void); -void Z2SeqMgr_NS_stopWolfHowlSong(void); -void getNowInputValue__13Z2WolfHowlMgrFv(void); -void resetState__13Z2WolfHowlMgrFv(void); -void getOnLineNum__13Z2WolfHowlMgrFv(void); -void checkLine__13Z2WolfHowlMgrFv(void); -} - -// additional symbols needed for Z2SoundObject.cpp -// autogenerated by split.py v0.3 at 2021-01-04 23:48:52.466894 -extern "C" { -void Z2SoundObjAnime_NS_updateSoundLifeTime_(void); -void Z2DopplerSoundObjBase(void); -void JAUSoundAnimation_NS_getStartSoundIndex(void); -void JAISound_NS_acceptsNewAudible(void); -void func_802BE714(void); -void func_802BEB74(void); -void func_802BE6B8(void); -void Z2SoundObjAnime_NS_startSoundInner(void); -void Z2SoundObjAnime_NS_getSoundID(void); -void func_802BE7AC(void); -void Z2SoundHandles_NS_dtor(void); -void Z2SoundObjAnime_NS_ageSounds_(void); -void Z2SoundObjBase_NS_startSound(void); -void framework__14Z2SoundObjBaseFUlSc(void); -void JAISound_NS_newAudible(void); -void Z2SoundObjAnime_NS_playsSound(void); -void func_802BE880(void); -void func_802BEB38(void); -void func_802BE8A0(void); -void deleteHandlesPool__14Z2SoundHandlesFv(void); -// void isSoundCulling__7Z2SeMgrF10JAISoundID(void); -void Z2SoundHandles_NS_getLowPrioSound(void); -void Z2SoundHandles_NS_setPos(void); -void JAUSoundAnimation_NS_getEndSoundIndex(void); -void func_802BE9B0(void); -void func_802BE65C(void); -void Z2SoundHandles_NS_getFreeHandle(void); -void func_802BEBDC(void); -void initHandlesPool__14Z2SoundHandlesFUc(void); -void getHandleUserData__14Z2SoundHandlesFUl(void); -void func_802BE5FC(void); -void Z2SoundObjBase_NS_startLevelSound(void); -void stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool(void); - -// manual -void __ct__14Z2SoundHandlesFv(void); -void __dt__14Z2SoundHandlesFv(void); -} - -// additional symbols needed for Z2SoundObjMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-05 00:01:40.089391 -extern "C" { -void Z2SeqMgr_NS_setBattleDistState(void); -void Z2SeqMgr_NS_stopBattleBgm(void); -void isTwilightBattle__13Z2SoundObjMgrFv(void); -void Z2SoundObjMgr_NS_checkBattleFinish(void); -void Z2SoundObjMgr_NS_searchEnemy(void); -void setBattleGhostMute__8Z2SeqMgrFb(void); -void func_802C01EC(void); -void deleteEnemyAll__13Z2SoundObjMgrFv(void); -void setBattleInit__13Z2SoundObjMgrFv(void); -void Z2SeqMgr_NS_setBattleSearched(void); -} - -// additional symbols needed for Z2SoundInfo.cpp -// autogenerated by split.py v0.3 at 2021-01-05 00:36:00.060736 -extern "C" { -void Z2SoundInfo_NS_getStreamFilePath(void); -void func_802BB6DC(void); -void func_802BBCBC(void); -void func_802BB0E0(void); -void getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID(void); -void Z2SoundInfo_NS_getSoundInfo_(void); -void func_802BBCD4(void); -void func_802BBCCC(void); -void func_802BB8B4(void); -void Z2SoundInfo_NS_dtor(void); -void Z2SoundInfo_NS_getStreamFileEntry(void); -void func_802BB090(void); -void func_802BB8E0(void); -void JAISoundInfo_NS_dtor(void); -void JAIStreamDataMgr_NS_dtor(void); -void func_802BBCC4(void); -void JAUSoundTable_NS_getData(void); -void func_802BB0D8(void); -} - -// additional symbols needed for Z2AudioArcLoader.cpp -// autogenerated by split.py v0.3 at 2021-01-05 01:13:20.339246 -extern "C" { -void JAUSectionHeap_NS_getOpenSection(void); -void func_802A9B54(void); -void readCommandMore__16Z2AudioArcLoaderFUl(void); -void Z2FxLineMgr_NS_initDataArc(void); -void readBFCA__16Z2AudioArcLoaderFPCv(void); -void func_802A9B58(void); - -// manual -void JAUAudioArcLoader(void); // ctor -} - -// additional symbols needed for Z2FxLineMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-05 01:17:25.439509 -extern "C" { -void Z2FxLineMgr_NS_setLineID(void); -void _restgpr_22(void); -void Z2FxLineMgr_NS_setUnderWaterFx(void); -void _savegpr_22(void); -void Z2FxLineMgr_NS_setSceneFx(void); -void Z2FxLineMgr_NS_setLine(void); -void JSUMemoryInputStream_NS_setBuffer(void); -void JASDsp_NS_setFXLine(void); -} - -// additional symbols needed for Z2SoundHandles.cpp -// autogenerated by split.py v0.3 at 2021-01-05 01:21:30.657314 -extern "C" { -void isActive__14Z2SoundHandlesCFv(void); -void stopAllSounds__14Z2SoundHandlesFUl(void); -} - -// additional symbols needed for _Z2LinkMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-05 01:30:23.453804 -extern "C" { -void func_802C5078(void); -void Z2CreatureRide_NS_dtor(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 Z2RideSoundStarter(void); -void func_802C54B8(void); -void func_802C56C0(void); -void func_802C51EC(void); -void func_802C520C(void); - -// manual -void Z2Creature_NS_init(void); -void Z2LinkSoundStarter_NS_ctor(void); -} - -// additional symbols needed for _Z2SceneMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-05 01:44:53.434327 -extern "C" { -void JASWaveArc_NS_erase(void); -void Z2SceneMgr_NS_check1stDynamicWave(void); -void Z2SceneMgr_NS_eraseSeWave(void); -void Z2SeqMgr_NS_checkBgmIDPlaying(void); -void Z2SceneMgr_NS_checkFirstWaves(void); -void Z2SceneMgr_NS_loadBgmWave(void); -void Z2SceneMgr_NS__load1stWaveInner_2(void); -void Z2SceneMgr_NS_loadStaticWaves(void); -void Z2SceneMgr_NS_eraseBgmWave(void); -void Z2SceneMgr_NS_sceneBgmStart(void); -// void bgmStreamPrepare__8Z2SeqMgrFUl(void); -void Z2SceneMgr_NS_getWaveLoadStatus(void); -void seStopAll__7Z2SeMgrFUl(void); -void Z2SceneMgr_NS_loadSeWave(void); -void Z2SceneMgr_NS__load1stWaveInner_1(void); -// void bgmStreamPlay__8Z2SeqMgrFv(void); -void JASWaveArc_NS_load(void); -// void bgmStop__8Z2SeqMgrFUll(void); -void JASWaveArc_NS_loadTail(void); -} - -// additional symbols needed for _Z2SeqMgr.cpp -// autogenerated by split.py v0.3 at 2021-01-05 01:50:57.147580 -extern "C" { -void checkDayTime__11Z2StatusMgrFv(void); -void Z2SeqMgr_NS_fanfareFramework(void); -void Z2SeqMgr_NS_setBattleDistIgnore(void); -void Z2SeqMgr_NS_fieldBgmStart(void); -void Z2SeqMgr_NS_startBattleBgm(void); -void changeFishingBgm__8Z2SeqMgrFl(void); -void Z2SeqMgr_NS_mbossBgmMuteProcess(void); -void Z2SeqMgr_NS_fieldBgmFramework(void); -void Z2SeqMgr_NS_getChildTrackVolume(void); -void subBgmStopInner__8Z2SeqMgrFv(void); -void Z2SeqMgr_NS_battleBgmFramework(void); -void changeSubBgmStatus__8Z2SeqMgrFl(void); -void Z2SeqMgr_NS_fieldRidingMute(void); -void Set__8cM3dGSphFRC4cXyzf(void); -void __pl__FsRC7cSAngle(void); -void __mi__FsRC7cSAngle(void); } // additional symbols needed for d_stage.cpp diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index 8133055b01c..294fb74cf94 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -1,6 +1,15 @@ /* Z2Audience.cpp autogenerated by split.py v0.3 at 2021-01-04 22:46:19.894499 */ +#include "Z2AudioLib/Z2Audience/Z2Audience.h" +#include "JSystem/JAudio2/JAIAudible.h" +#include "JSystem/JAudio2/JAIAudience/JAIAudience.h" +#include "JSystem/JAudio2/JASGenericMemPool.h" +#include "JSystem/JAudio2/JASSoundParams.h" +#include "Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h" +#include "Z2AudioLib/Z2AudioCamera/Z2AudioCamera.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" #include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" +#include "Z2AudioLib/Z2SpotMic/Z2SpotMic.h" #include "global.h" extern "C" { diff --git a/libs/Z2AudioLib/Z2AudioArcLoader.cpp b/libs/Z2AudioLib/Z2AudioArcLoader.cpp index eb2b48fd057..a116bd0c3a2 100644 --- a/libs/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/libs/Z2AudioLib/Z2AudioArcLoader.cpp @@ -1,6 +1,9 @@ /* Z2AudioArcLoader.cpp autogenerated by split.py v0.3 at 2021-01-05 01:13:20.339487 */ #include "Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h" +#include "JSystem/JAudio2/JAUSectionHeap.h" +#include "Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h" +#include "global.h" extern "C" { // __ct__16Z2AudioArcLoaderFP10JAUSection diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 52b9647b2b2..d9fe9fb6c1c 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -1,9 +1,33 @@ /* Z2AudioMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 23:11:48.333955 */ #include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h" +#include "JSystem/JAudio2/JAISeMgr/JAISeMgr.h" +#include "JSystem/JAudio2/JAISoundInfo.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAIStreamAramMgr.h" +#include "JSystem/JAudio2/JASAudioReseter.h" +#include "JSystem/JAudio2/JASDriver.h" +#include "JSystem/JAudio2/JASGenericMemPool.h" +#include "JSystem/JAudio2/JASHeap.h" +#include "JSystem/JAudio2/JASKernel.h" +#include "JSystem/JAudio2/JASMemPool.h" +#include "JSystem/JAudio2/JASResArcLoader.h" +#include "JSystem/JAudio2/JAU.h" +#include "JSystem/JAudio2/JAUAudioArcInterpreter.h" +#include "JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h" +#include "JSystem/JAudio2/JAUNewSectionHeap.h" +#include "JSystem/JAudio2/JAUSection.h" +#include "JSystem/JAudio2/JAUSectionHeap.h" +#include "Z2AudioLib/Z2Audience/Z2Audience.h" +#include "Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h" #include "Z2AudioLib/Z2Param/Z2Param.h" +#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" -#include "global.h" +#include "Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h" +#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" +#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" +#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "m_Do/m_Do_audio/m_Do_audio.h" extern "C" { diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index e82e8af1975..c07d4805e5d 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -1,9 +1,13 @@ /* Z2Creature.cpp autogenerated by split.py v0.3 at 2021-01-04 23:26:27.773541 */ #include "Z2AudioLib/Z2Creature/Z2Creature.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "Z2AudioLib/Z2Audience/Z2Audience.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" #include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h" #include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "global.h" diff --git a/libs/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp index f52eb5ee107..9a73a2fd2e6 100644 --- a/libs/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/libs/Z2AudioLib/Z2EnvSeMgr.cpp @@ -1,7 +1,13 @@ /* Z2EnvSeMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 22:52:26.199317 */ #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAISoundStarter.h" +#include "JSystem/JMath/vector.h" +#include "Z2AudioLib/Z2Audience/Z2Audience.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" +#include "Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h" #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" diff --git a/libs/Z2AudioLib/Z2FxLineMgr.cpp b/libs/Z2AudioLib/Z2FxLineMgr.cpp index 399b325a7ff..134bbf6c57e 100644 --- a/libs/Z2AudioLib/Z2FxLineMgr.cpp +++ b/libs/Z2AudioLib/Z2FxLineMgr.cpp @@ -1,5 +1,8 @@ /* Z2FxLineMgr.cpp autogenerated by split.py v0.3 at 2021-01-05 01:17:25.439819 */ +#include "Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h" +#include "JSystem/JAudio2/JASDsp.h" +#include "JSystem/JSupport/JSUMemoryInputStream.h" #include "global.h" extern "C" { diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index 11bff4cc9c8..cce1e8478e1 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -1,6 +1,13 @@ #include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAISoundStarter.h" +#include "Z2AudioLib/Z2Audience/Z2Audience.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" +#include "Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" +#include "Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h" #include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h" #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 8d91eb9cdd8..43724f053e4 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -1,5 +1,10 @@ #include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAIStreamMgr.h" +#include "JSystem/JAudio2/JASWaveArc.h" +#include "JSystem/JAudio2/JAUSoundTable.h" #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h" +#include "Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index d4c2b8dce3a..6a43745c5f5 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -1,15 +1,16 @@ #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" +#include "JSystem/JAudio2/JAISeCategoryMgr.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAIStreamMgr.h" +#include "Z2AudioLib/Z2Audience/Z2Audience.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" +#include "Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h" #include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "m_Do/m_Do_audio/m_Do_audio.h" -extern "C" { -void JAISoundHandle(void); -void JAISoundHandle_NS_dtor(void); -} - asm Z2SeMgr::Z2SeMgr(void) { nofralloc #include "Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s" diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index 135a6e4113c..1a8cbe8971b 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -1,4 +1,10 @@ #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" +#include "JSystem/JAudio2/JAISeqMgr.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAISoundStatus.h" +#include "JSystem/JAudio2/JAIStreamMgr.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" +#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h" #include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index 0a1378bfbf3..7372185f6c1 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -1,6 +1,8 @@ /* Z2SoundHandles.cpp autogenerated by split.py v0.3 at 2021-01-05 01:21:30.657620 */ #include "Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h" +#include "JSystem/JAudio2/JASGenericMemPool.h" +#include "JSystem/JAudio2/JASMemPool.h" #include "global.h" Z2SoundHandles::Z2SoundHandles() { diff --git a/libs/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp index e1a8b7005e7..c7474310120 100644 --- a/libs/Z2AudioLib/Z2SoundInfo.cpp +++ b/libs/Z2AudioLib/Z2SoundInfo.cpp @@ -1,6 +1,10 @@ /* Z2SoundInfo.cpp autogenerated by split.py v0.3 at 2021-01-05 00:36:00.060978 */ #include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" +#include "JSystem/JAudio2/JAISoundInfo.h" +#include "JSystem/JAudio2/JAIStreamDataMgr.h" +#include "JSystem/JAudio2/JAUSoundTable.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" #include "dvd/dvd.h" #include "global.h" diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp index 152f6159320..058c10a91c5 100644 --- a/libs/Z2AudioLib/Z2SoundMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundMgr.cpp @@ -1,11 +1,19 @@ /* Z2SoundMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 23:01:21.950031 */ #include "Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h" +#include "JSystem/JAudio2/JAISeCategoryMgr.h" +#include "JSystem/JAudio2/JAISeMgr/JAISeMgr.h" +#include "JSystem/JAudio2/JAISeqMgr.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAIStreamMgr.h" +#include "JSystem/JAudio2/JASDriver.h" +#include "JSystem/JAudio2/JASTrack.h" +#include "JSystem/JAudio2/JAUSectionHeap.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" #include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" #include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" -#include "global.h" +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "m_Do/m_Do_audio/m_Do_audio.h" extern "C" { diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index b060dec0193..c90d666e315 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -1,6 +1,7 @@ /* Z2SoundObjMgr.cpp autogenerated by split.py v0.3 at 2021-01-05 00:01:40.089663 */ #include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" #ifdef NONMATCHING diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index 3eeb3f0b013..8f30f7aac58 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -1,6 +1,9 @@ /* Z2SoundObject.cpp autogenerated by split.py v0.3 at 2021-01-04 23:48:52.467160 */ #include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAUSoundAnimation.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp index 1ce8081f839..dde5cd0dd69 100644 --- a/libs/Z2AudioLib/Z2SoundStarter.cpp +++ b/libs/Z2AudioLib/Z2SoundStarter.cpp @@ -1,9 +1,11 @@ /* Z2SoundStarter.cpp autogenerated by split.py v0.3 at 2021-01-04 23:38:28.244752 */ #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAISoundStarter.h" +#include "JSystem/JAudio2/JASTrack.h" #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" -#include "global.h" #include "m_Do/m_Do_audio/m_Do_audio.h" extern "C" { diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index 558d7a8d7d5..9a2d3990bec 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp @@ -1,6 +1,8 @@ /* Z2SpeechMgr2.cpp autogenerated by split.py v0.3 at 2021-01-04 22:38:34.026034 */ #include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAISoundStarter.h" #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index 2817c907bba..b23e2233b6c 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -1,4 +1,7 @@ #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" +#include "Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h" #include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index 5ebb5b0acf3..26d38fa847e 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -2,6 +2,9 @@ #include "global.h" +#include "JSystem/JAudio2/JAISoundParamsMove.h" +#include "JSystem/JAudio2/JAISoundStarter.h" +#include "Z2AudioLib/Z2Calc/Z2Calc.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp index 4d10187418c..deb024a7939 100644 --- a/src/d/d_a/d_a_alink.cpp +++ b/src/d/d_a/d_a_alink.cpp @@ -1,9 +1,11 @@ #include "d/d_a/d_a_alink/d_a_alink.h" #include "SComponent/c_bg_w.h" #include "SComponent/c_phase.h" +#include "Z2AudioLib/Z2Creature/Z2Creature.h" #include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" +#include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h" #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h" #include "f/f_pc/f_pc_manager.h" #include "f/f_pc/f_pc_searcher.h" diff --git a/src/d/d_a/d_a_horse_static.cpp b/src/d/d_a/d_a_horse_static.cpp index 2c2ae7017f3..33e8ae43003 100644 --- a/src/d/d_a/d_a_horse_static.cpp +++ b/src/d/d_a/d_a_horse_static.cpp @@ -1,4 +1,5 @@ #include "d/d_a/d_a_horse_static/d_a_horse_static.h" +#include "Z2AudioLib/Z2Creature/Z2Creature.h" #include "global.h" u32 e_wb_class::checkWait(void) { diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index f37fd1b88bf..cf44a8ecfb9 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -1,12 +1,15 @@ /* d_camera.cpp autogenerated by split.py v0.3 at 2021-01-02 08:13:10.853821 */ #include "SComponent/c_bg_w.h" +#include "SComponent/c_m3d_g_cyl.h" +#include "SComponent/c_m3d_g_sph.h" +#include "SComponent/c_sxyz.h" #include "SComponent/c_xyz.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" +#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "f/f_pc/f_pc_searcher.h" -#include "global.h" #include "m_Do/m_Do_audio/m_Do_audio.h" #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h" diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index bf7cf719f69..aeb72f253b4 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -1,5 +1,7 @@ #include "m_Do/m_Do_audio/m_Do_audio.h" #include "JSystem/JAudio2/JAISeMgr/JAISeMgr.h" +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "JSystem/JAudio2/JAISoundStarter.h" #include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h" #include "Z2AudioLib/Z2AudioLib.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h"