diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-10-08 01:32:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-07 15:32:29 -0700 |
| commit | 1f3948e40ef095bb758914cce6fc652091cf4f4a (patch) | |
| tree | a7d2c024e62d8824b13d20c6d4bebea57f2205b9 /include/Z2AudioLib | |
| parent | 24b6124609b03acc800b2b8231567f13b3f0b0c8 (diff) | |
d_map_path_dmap OK (#2201)
* d_map_path_dmap work
* d_map_path_dmap OK
* Probable inheritance for dalv4CandleDemoTag_c
* daObjFuta_c OK
* daObjHHASHI_c OK
Diffstat (limited to 'include/Z2AudioLib')
| -rw-r--r-- | include/Z2AudioLib/Z2DebugSys.h | 10 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2Instances.h | 36 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SpeechMgr2.h | 4 |
3 files changed, 50 insertions, 0 deletions
diff --git a/include/Z2AudioLib/Z2DebugSys.h b/include/Z2AudioLib/Z2DebugSys.h new file mode 100644 index 0000000000..285228d3e1 --- /dev/null +++ b/include/Z2AudioLib/Z2DebugSys.h @@ -0,0 +1,10 @@ +#ifndef Z2DEBUGSYS_H +#define Z2DEBUGSYS_H + +#include "JSystem/JAudio2/JASGadget.h" + +// Only here for instance sub. No known code. +struct Z2DebugSys : public JASGlobalInstance<Z2DebugSys> { +}; + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2Instances.h b/include/Z2AudioLib/Z2Instances.h new file mode 100644 index 0000000000..71e2fa7433 --- /dev/null +++ b/include/Z2AudioLib/Z2Instances.h @@ -0,0 +1,36 @@ +#ifndef Z2INSTANCES_H +#define Z2INSTANCES_H + +#include "Z2AudioLib/Z2WolfHowlMgr.h" +#include "Z2AudioLib/Z2DebugSys.h" +#include "JSystem/JAudio2/JASAudioThread.h" +#include "JSystem/JAudio2/JAUSoundTable.h" + +#define AUDIO_INSTANCES \ + JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance; \ + JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance; \ + Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance; \ + Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance; \ + Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance; \ + Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance; \ + Z2DebugSys* JASGlobalInstance<Z2DebugSys>::sInstance; \ + JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance; \ + Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance; \ + Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance; \ + JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance; \ + JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance; \ + JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance; \ + Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance; \ + JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance; \ + JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance; \ + JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance; \ + JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance; \ + Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance; \ + Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance; \ + Z2Audience* JASGlobalInstance<Z2Audience>::sInstance; \ + Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance; \ + Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance; \ + Z2SpeechMgr* JASGlobalInstance<Z2SpeechMgr>::sInstance; \ + Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance; + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2.h index c776a468e6..515ebb69b2 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2.h +++ b/include/Z2AudioLib/Z2SpeechMgr2.h @@ -14,6 +14,10 @@ struct Z2SpeechStarter : public Z2SoundStarter { f32, u32); }; +// Only here for instance sub. No known code. +struct Z2SpeechMgr : public JASGlobalInstance<Z2SpeechMgr> { +}; + struct Z2SpeechMgr2 : public JASGlobalInstance<Z2SpeechMgr2> { /* 802CBC60 */ Z2SpeechMgr2(); /* 802CBD88 */ void setString(u16 const*, s16, u8, u16); |