dol2asm OK

include/JSystem/JAudio2/JAIAudible.h

@@ -1,8 +1,7 @@
-#ifndef JAIAUDIBLE_H_
-#define JAIAUDIBLE_H_
+#ifndef JAIAUDIBLE_H
+#define JAIAUDIBLE_H
 
-extern "C" {
-void __dt__10JAIAudibleFv(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAIAUDIBLE_H_
+
+#endif /* JAIAUDIBLE_H */

include/JSystem/JAudio2/JAIAudience.h

@@ -0,0 +1,7 @@
+#ifndef JAIAUDIENCE_H
+#define JAIAUDIENCE_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAIAUDIENCE_H */

include/JSystem/JAudio2/JAIAudience/JAIAudience.h

@@ -1,10 +0,0 @@
-#ifndef JAIAUDIENCE_H_
-#define JAIAUDIENCE_H_
-
-struct JAIAudience {};
-
-extern "C" {
-void __dt__11JAIAudienceFv(void);
-}
-
-#endif  // JAIAUDIENCE_H_

include/JSystem/JAudio2/JAISe.h

@@ -0,0 +1,7 @@
+#ifndef JAISE_H
+#define JAISE_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISE_H */

include/JSystem/JAudio2/JAISe/JAISe.h

@@ -1,6 +0,0 @@
-#ifndef JAISE_H_
-#define JAISE_H_
-
-#include "global.h"
-
-#endif

include/JSystem/JAudio2/JAISeCategoryMgr.h

@@ -1,9 +0,0 @@
-#ifndef JAISECATEGORYMGR_H_
-#define JAISECATEGORYMGR_H_
-
-extern "C" {
-void pause__16JAISeCategoryMgrFb(void);
-void stop__16JAISeCategoryMgrFUl(void);
-}
-
-#endif  // JAISECATEGORYMGR_H_

include/JSystem/JAudio2/JAISeMgr.h

@@ -0,0 +1,7 @@
+#ifndef JAISEMGR_H
+#define JAISEMGR_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISEMGR_H */

include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h

@@ -1,23 +0,0 @@
-#ifndef JAI_SE_MGR_H_
-#define JAI_SE_MGR_H_
-
-class JAISeCategoryMgr {
-public:
-    ~JAISeCategoryMgr();
-};
-
-extern "C" {
-void JAISeMgr_NS_dtor(void);
-void calc__8JAISeMgrFv(void);
-void getNumActiveSe__8JAISeMgrCFv(void);
-void initParams__8JAISeMgrFv(void);
-void mixOut__8JAISeMgrFv(void);
-void setAudience__8JAISeMgrFP11JAIAudience(void);
-void setCategoryArrangement__8JAISeMgrFRC24JAISeCategoryArrangement(void);
-void setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr(void);
-void JAISeMgr_NS_startSound(void);
-void stop__8JAISeMgrFv(void);
-void stopSoundID__8JAISeMgrF10JAISoundID(void);
-}
-
-#endif  // JAI_SE_MGR_H_

include/JSystem/JAudio2/JAISeq.h

@@ -0,0 +1,7 @@
+#ifndef JAISEQ_H
+#define JAISEQ_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISEQ_H */

include/JSystem/JAudio2/JAISeqDataMgr.h

@@ -0,0 +1,7 @@
+#ifndef JAISEQDATAMGR_H
+#define JAISEQDATAMGR_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISEQDATAMGR_H */

include/JSystem/JAudio2/JAISeqMgr.h

@@ -1,14 +1,7 @@
-#ifndef JAISEQMGR_H_
-#define JAISEQMGR_H_
+#ifndef JAISEQMGR_H
+#define JAISEQMGR_H
 
-// Additional symbols needed for JAISeqMgr
-extern "C" {
-void calc__9JAISeqMgrFv(void);
-void mixOut__9JAISeqMgrFv(void);
-void JAISeqMgr_NS_startSound(void);
-void stopSoundID__9JAISeqMgrF10JAISoundID(void);
-void stop__9JAISeqMgrFv(void);
-void stop__9JAISeqMgrFUl(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAISEQMGR_H_
+
+#endif /* JAISEQMGR_H */

include/JSystem/JAudio2/JAISound.h

@@ -0,0 +1,7 @@
+#ifndef JAISOUND_H
+#define JAISOUND_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISOUND_H */

include/JSystem/JAudio2/JAISound/JAISound.h

@@ -1,161 +0,0 @@
-#ifndef __JAISOUND_H__
-#define __JAISOUND_H__
-
-#include "global.h"
-
-class JAISoundID {
-public:
-    operator u32() const { return this->mId; }
-
-    JAISoundID(u32 pId) : mId(pId) {}
-
-    JAISoundID(JAISoundID const& other);
-
-private:
-    u32 mId;
-};
-
-struct JAISoundParams {
-    float field_0x0;
-    float field_0x4;
-    float field_0x8;
-    float field_0xc;
-    float field_0x10;
-    float field_0x14;
-    float field_0x18;
-    float field_0x1c;
-};
-
-class JAISoundHandle;
-class JAIAudible;
-class JAIAudience;
-class JAISound {
-public:
-    JAISoundID getID() const { return JAISoundID((u32)this->sound_id); }
-
-    void stop(u32 fadeout);
-    void stop();
-
-    u32 getUserData() const { return user_data; }
-
-    // TODO: do proper struct later
-    void* __vt;
-    struct JAISoundHandle* handle;
-    struct JAIAudible* audible;
-    struct JAIAudience* audience;
-    s32 field_0xc;
-    s32 num_prepare_steps;
-    struct JAISoundID sound_id;
-    u8 field_0x18;
-    u8 field_0x19;
-    u8 field_0x1a;
-    u8 field_0x1b;
-    u32 user_data;
-    float field_0x20;
-    float field_0x24;
-    float field_0x28;
-    s32 field_0x2c;
-    s32 audience_priority;
-    s32 field_0x34;
-    struct JAISoundParams params;
-    u8 field_0x58;
-    u8 field_0x59;
-    u8 field_0x5a;
-    u8 field_0x5b;
-    u8 field_0x5c;
-    u8 field_0x5d;
-    u8 field_0x5e;
-    u8 field_0x5f;
-    u8 field_0x60;
-    u8 field_0x61;
-    u8 field_0x62;
-    u8 field_0x63;
-    u8 field_0x64;
-    u8 field_0x65;
-    u8 field_0x66;
-    u8 field_0x67;
-    u8 field_0x68;
-    u8 field_0x69;
-    u8 field_0x6a;
-    u8 field_0x6b;
-    u8 field_0x6c;
-    u8 field_0x6d;
-    u8 field_0x6e;
-    u8 field_0x6f;
-    u8 field_0x70;
-    u8 field_0x71;
-    u8 field_0x72;
-    u8 field_0x73;
-    u8 field_0x74;
-    u8 field_0x75;
-    u8 field_0x76;
-    u8 field_0x77;
-    u8 field_0x78;
-    u8 field_0x79;
-    u8 field_0x7a;
-    u8 field_0x7b;
-    u8 field_0x7c;
-    u8 field_0x7d;
-    u8 field_0x7e;
-    u8 field_0x7f;
-    u8 field_0x80;
-    u8 field_0x81;
-    u8 field_0x82;
-    u8 field_0x83;
-    u8 field_0x84;
-    u8 field_0x85;
-    u8 field_0x86;
-    u8 field_0x87;
-    u8 field_0x88;
-    u8 field_0x89;
-    u8 field_0x8a;
-    u8 field_0x8b;
-    u8 field_0x8c;
-    u8 field_0x8d;
-    u8 field_0x8e;
-    u8 field_0x8f;
-    u8 field_0x90;
-    u8 field_0x91;
-    u8 field_0x92;
-    u8 field_0x93;
-};
-
-class JAISoundHandle {
-public:
-    JAISoundHandle();  // noninline in JAUClusterSound.cpp
-    ~JAISoundHandle();
-
-    bool isSoundAttached() const { return mSound != NULL; }
-
-    JAISound* operator->() const {
-        JUT_ASSERT(mSound != NULL);
-        return mSound;
-    }
-
-    operator bool() const { return isSoundAttached(); }
-
-    void releaseSound();
-
-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 __as__10JAISoundIDFRC10JAISoundID(void);
-void __ct__10JAISoundIDFUl(void);
-
-void acceptsNewAudible__8JAISoundCFv(void);
-void getID__8JAISoundCFv(void);
-void JAISound_NS_newAudible(void);
-void releaseHandle__8JAISoundFv(void);
-}
-
-#endif

include/JSystem/JAudio2/JAISoundChild.h

@@ -0,0 +1,7 @@
+#ifndef JAISOUNDCHILD_H
+#define JAISOUNDCHILD_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISOUNDCHILD_H */

include/JSystem/JAudio2/JAISoundHandles.h

@@ -0,0 +1,7 @@
+#ifndef JAISOUNDHANDLES_H
+#define JAISOUNDHANDLES_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISOUNDHANDLES_H */

include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h

@@ -1,16 +0,0 @@
-#ifndef JAISOUNDHANDLES_H_
-#define JAISOUNDHANDLES_H_
-
-#include "JSystem/JAudio2/JAISound/JAISound.h"
-
-class JAISoundHandles {
-public:
-    JAISoundHandle mHandles[24];
-};
-
-extern "C" {
-void getFreeHandle__15JAISoundHandlesFv(void);
-void getHandleSoundID__15JAISoundHandlesF10JAISoundID(void);
-}
-
-#endif  // JAISOUNDHANDLES_H_

include/JSystem/JAudio2/JAISoundInfo.h

@@ -1,9 +1,7 @@
-#ifndef JAISOUNDINFO_H_
-#define JAISOUNDINFO_H_
+#ifndef JAISOUNDINFO_H
+#define JAISOUNDINFO_H
 
-extern "C" {
-void __ct__12JAISoundInfoFb(void);
-void __dt__12JAISoundInfoFv(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAISOUNDINFO_H_
+
+#endif /* JAISOUNDINFO_H */

include/JSystem/JAudio2/JAISoundParams.h

@@ -0,0 +1,7 @@
+#ifndef JAISOUNDPARAMS_H
+#define JAISOUNDPARAMS_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISOUNDPARAMS_H */

include/JSystem/JAudio2/JAISoundParamsMove.h

@@ -1,13 +0,0 @@
-#ifndef JAISOUNDPARAMSMOVE_H_
-#define JAISOUNDPARAMSMOVE_H_
-
-extern "C" {
-void moveDolby__18JAISoundParamsMoveFfUl(void);
-void moveFxMix__18JAISoundParamsMoveFfUl(void);
-void movePan__18JAISoundParamsMoveFfUl(void);
-void movePitch__18JAISoundParamsMoveFfUl(void);
-
-void moveVolume__18JAISoundParamsMoveFfUl(void);
-}
-
-#endif  // JAISOUNDPARAMSMOVE_H_

include/JSystem/JAudio2/JAISoundStarter.h

@@ -1,10 +1,7 @@
-#ifndef JAISOUNDSTARTER_H_
-#define JAISOUNDSTARTER_H_
+#ifndef JAISOUNDSTARTER_H
+#define JAISOUNDSTARTER_H
 
-extern "C" {
-void __ct__15JAISoundStarterFb(void);
-void __dt__15JAISoundStarterFv(void);
-void JAISoundStarter_NS_startLevelSound(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAISOUNDSTARTER_H_
+
+#endif /* JAISOUNDSTARTER_H */

include/JSystem/JAudio2/JAISoundStatus.h

@@ -1,10 +0,0 @@
-#ifndef JAISOUNDSTATUS_H_
-#define JAISOUNDSTATUS_H_
-
-// Additional symbols needed for JAISoundStatus
-extern "C" {
-void lockWhenPrepared__15JAISoundStatus_Fv(void);
-void unlockIfLocked__15JAISoundStatus_Fv(void);
-}
-
-#endif  // JAISOUNDSTATUS_H_

include/JSystem/JAudio2/JAIStream.h

@@ -0,0 +1,7 @@
+#ifndef JAISTREAM_H
+#define JAISTREAM_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAISTREAM_H */

include/JSystem/JAudio2/JAIStreamAramMgr.h

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

include/JSystem/JAudio2/JAIStreamDataMgr.h

@@ -1,8 +1,7 @@
-#ifndef JAISTREAMDATAMGR_H_
-#define JAISTREAMDATAMGR_H_
+#ifndef JAISTREAMDATAMGR_H
+#define JAISTREAMDATAMGR_H
 
-extern "C" {
-void __dt__16JAIStreamDataMgrFv(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAISTREAMDATAMGR_H_
+
+#endif /* JAISTREAMDATAMGR_H */

include/JSystem/JAudio2/JAIStreamMgr.h

@@ -1,15 +1,7 @@
-#ifndef JAISTREAMMGR_H_
-#define JAISTREAMMGR_H_
+#ifndef JAISTREAMMGR_H
+#define JAISTREAMMGR_H
 
-// Additional symbols needed for JAIStreamMgr
-extern "C" {
-void calc__12JAIStreamMgrFv(void);
-void isActive__12JAIStreamMgrCFv(void);
-void mixOut__12JAIStreamMgrFv(void);
-void JAIStreamMgr_NS_startSound(void);
-void stop__12JAIStreamMgrFv(void);
-void stop__12JAIStreamMgrFUl(void);
-void stopSoundID__12JAIStreamMgrF10JAISoundID(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAISTREAMMGR_H_
+
+#endif /* JAISTREAMMGR_H */

include/JSystem/JAudio2/JASAiCtrl.h

@@ -0,0 +1,7 @@
+#ifndef JASAICTRL_H
+#define JASAICTRL_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASAICTRL_H */

include/JSystem/JAudio2/JASAramStream.h

@@ -0,0 +1,7 @@
+#ifndef JASARAMSTREAM_H
+#define JASARAMSTREAM_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASARAMSTREAM_H */

include/JSystem/JAudio2/JASAudioReseter.h

@@ -1,11 +1,7 @@
-#ifndef JASAUDIORESETER_H_
-#define JASAUDIORESETER_H_
+#ifndef JASAUDIORESETER_H
+#define JASAUDIORESETER_H
 
-extern "C" {
-void __ct__15JASAudioReseterFv(void);
-void checkDone__15JASAudioReseterCFv(void);
-void resume__15JASAudioReseterFv(void);
-void start__15JASAudioReseterFUlb(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JASAUDIORESETER_H_
+
+#endif /* JASAUDIORESETER_H */

include/JSystem/JAudio2/JASAudioThread.h

@@ -0,0 +1,7 @@
+#ifndef JASAUDIOTHREAD_H
+#define JASAUDIOTHREAD_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASAUDIOTHREAD_H */

include/JSystem/JAudio2/JASBNKParser.h

@@ -0,0 +1,7 @@
+#ifndef JASBNKPARSER_H
+#define JASBNKPARSER_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASBNKPARSER_H */

include/JSystem/JAudio2/JASBank.h

@@ -0,0 +1,7 @@
+#ifndef JASBANK_H
+#define JASBANK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASBANK_H */

include/JSystem/JAudio2/JASBasicBank.h

@@ -0,0 +1,7 @@
+#ifndef JASBASICBANK_H
+#define JASBASICBANK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASBASICBANK_H */

include/JSystem/JAudio2/JASBasicInst.h

@@ -0,0 +1,7 @@
+#ifndef JASBASICINST_H
+#define JASBASICINST_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASBASICINST_H */

include/JSystem/JAudio2/JASBasicWaveBank.h

@@ -0,0 +1,7 @@
+#ifndef JASBASICWAVEBANK_H
+#define JASBASICWAVEBANK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASBASICWAVEBANK_H */

include/JSystem/JAudio2/JASCalc.h

@@ -0,0 +1,7 @@
+#ifndef JASCALC_H
+#define JASCALC_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASCALC_H */

include/JSystem/JAudio2/JASCallback.h

@@ -0,0 +1,7 @@
+#ifndef JASCALLBACK_H
+#define JASCALLBACK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASCALLBACK_H */

include/JSystem/JAudio2/JASChannel.h

@@ -0,0 +1,7 @@
+#ifndef JASCHANNEL_H
+#define JASCHANNEL_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASCHANNEL_H */

include/JSystem/JAudio2/JASCmdStack.h

@@ -0,0 +1,7 @@
+#ifndef JASCMDSTACK_H
+#define JASCMDSTACK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASCMDSTACK_H */

include/JSystem/JAudio2/JASDSPChannel.h

@@ -0,0 +1,7 @@
+#ifndef JASDSPCHANNEL_H
+#define JASDSPCHANNEL_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASDSPCHANNEL_H */

include/JSystem/JAudio2/JASDSPInterface.h

@@ -0,0 +1,7 @@
+#ifndef JASDSPINTERFACE_H
+#define JASDSPINTERFACE_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASDSPINTERFACE_H */

include/JSystem/JAudio2/JASDriver.h

@@ -1,12 +0,0 @@
-#ifndef JASDRIVER_H_
-#define JASDRIVER_H_
-
-extern "C" {
-void setOutputMode__9JASDriverFUl(void);
-
-void getSubFrames__9JASDriverFv(void);
-void JASDriver_NS_setOutputMode(void);
-void waitSubFrame__9JASDriverFv(void);
-}
-
-#endif  // JASDRIVER_H_

include/JSystem/JAudio2/JASDriverIF.h

@@ -0,0 +1,7 @@
+#ifndef JASDRIVERIF_H
+#define JASDRIVERIF_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASDRIVERIF_H */

include/JSystem/JAudio2/JASDrumSet.h

@@ -0,0 +1,7 @@
+#ifndef JASDRUMSET_H
+#define JASDRUMSET_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASDRUMSET_H */

include/JSystem/JAudio2/JASDsp.h

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

include/JSystem/JAudio2/JASDvdThread.h

@@ -0,0 +1,7 @@
+#ifndef JASDVDTHREAD_H
+#define JASDVDTHREAD_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASDVDTHREAD_H */

include/JSystem/JAudio2/JASGadget/JASGadget.h

@@ -1,22 +0,0 @@
-#ifndef __JASGADGET_H__
-#define __JASGADGET_H__
-
-//! @todo figure out *GlobalInstance singleton handlers once we can properly place statics.
-/*
-template <typename T>
-class JASGlobalInstance {
-public:
-    JASGlobalInstance(bool p1) {
-        JASGlobalInstance<T> pJVar1;
-        if ((p1 == true) && (sInstance != NULL)) {
-            // assert
-            pJVar1 = this;
-        }
-        sInstance = pJVar1;
-    }
-
-private:
-    static T sInstance;
-}; */
-
-#endif

include/JSystem/JAudio2/JASGenericMemPool.h

@@ -1,12 +0,0 @@
-#ifndef JASGENERICMEMPOOL_H_
-#define JASGENERICMEMPOOL_H_
-
-extern "C" {
-void __ct__17JASGenericMemPoolFv(void);
-void alloc__17JASGenericMemPoolFUl(void);
-void __dt__17JASGenericMemPoolFv(void);
-void free__17JASGenericMemPoolFPvUl(void);
-void newMemPool__17JASGenericMemPoolFUli(void);
-}
-
-#endif  // JASGENERICMEMPOOL_H_

include/JSystem/JAudio2/JASHeap.h

@@ -1,11 +0,0 @@
-#ifndef JASHEAP_H_
-#define JASHEAP_H_
-
-extern "C" {
-void alloc__7JASHeapFP7JASHeapUl(void);
-void __defctor__7JASHeapFv(void);
-void __dt__7JASHeapFv(void);
-void free__7JASHeapFv(void);
-}
-
-#endif  // JASHEAP_H_

include/JSystem/JAudio2/JASHeapCtrl.h

@@ -0,0 +1,7 @@
+#ifndef JASHEAPCTRL_H
+#define JASHEAPCTRL_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASHEAPCTRL_H */

include/JSystem/JAudio2/JASKernel.h

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

include/JSystem/JAudio2/JASLfo.h

@@ -0,0 +1,7 @@
+#ifndef JASLFO_H
+#define JASLFO_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASLFO_H */

include/JSystem/JAudio2/JASMemPool.h

@@ -1,9 +0,0 @@
-#ifndef JASMEMPOOL_H_
-#define JASMEMPOOL_H_
-
-extern "C" {
-void JASMemPool_NS_dtor_X4_(void);
-void JASMemPool_NS_dtor_X5_(void);
-}
-
-#endif  // JASMEMPOOL_H_

include/JSystem/JAudio2/JASOscillator.h

@@ -0,0 +1,7 @@
+#ifndef JASOSCILLATOR_H
+#define JASOSCILLATOR_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASOSCILLATOR_H */

include/JSystem/JAudio2/JASProbe.h

@@ -0,0 +1,7 @@
+#ifndef JASPROBE_H
+#define JASPROBE_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASPROBE_H */

include/JSystem/JAudio2/JASRegisterParam.h

@@ -0,0 +1,7 @@
+#ifndef JASREGISTERPARAM_H
+#define JASREGISTERPARAM_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASREGISTERPARAM_H */

include/JSystem/JAudio2/JASReport.h

@@ -0,0 +1,7 @@
+#ifndef JASREPORT_H
+#define JASREPORT_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASREPORT_H */

include/JSystem/JAudio2/JASResArcLoader.h

@@ -1,8 +1,7 @@
-#ifndef JASRESARCLOADER_H_
-#define JASRESARCLOADER_H_
+#ifndef JASRESARCLOADER_H
+#define JASRESARCLOADER_H
 
-extern "C" {
-void getResMaxSize__15JASResArcLoaderFPC10JKRArchive(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JASRESARCLOADER_H_
+
+#endif /* JASRESARCLOADER_H */

include/JSystem/JAudio2/JASSeqCtrl.h

@@ -0,0 +1,7 @@
+#ifndef JASSEQCTRL_H
+#define JASSEQCTRL_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASSEQCTRL_H */

include/JSystem/JAudio2/JASSeqParser.h

@@ -0,0 +1,7 @@
+#ifndef JASSEQPARSER_H
+#define JASSEQPARSER_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASSEQPARSER_H */

include/JSystem/JAudio2/JASSeqReader.h

@@ -0,0 +1,7 @@
+#ifndef JASSEQREADER_H
+#define JASSEQREADER_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASSEQREADER_H */

include/JSystem/JAudio2/JASSimpleWaveBank.h

@@ -0,0 +1,7 @@
+#ifndef JASSIMPLEWAVEBANK_H
+#define JASSIMPLEWAVEBANK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASSIMPLEWAVEBANK_H */

include/JSystem/JAudio2/JASSoundParams.h

@@ -1,9 +1,7 @@
-#ifndef JASSOUNDPARAMS_H_
-#define JASSOUNDPARAMS_H_
+#ifndef JASSOUNDPARAMS_H
+#define JASSOUNDPARAMS_H
 
-extern "C" {
-void clamp__14JASSoundParamsFv(void);
-void combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JASSOUNDPARAMS_H_
+
+#endif /* JASSOUNDPARAMS_H */

include/JSystem/JAudio2/JASTaskThread.h

@@ -0,0 +1,7 @@
+#ifndef JASTASKTHREAD_H
+#define JASTASKTHREAD_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASTASKTHREAD_H */

include/JSystem/JAudio2/JASTrack.h

@@ -1,12 +1,7 @@
-#ifndef JASTRACK_H_
-#define JASTRACK_H_
+#ifndef JASTRACK_H
+#define JASTRACK_H
 
-extern "C" {
-void openChild__8JASTrackFUl(void);
-void readPort__8JASTrackFUl(void);
-void setFIR__8JASTrackFPCs(void);
-void setIIR__8JASTrackFPCs(void);
-void writePort__8JASTrackFUlUs(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JASTRACK_H_
+
+#endif /* JASTRACK_H */

include/JSystem/JAudio2/JASTrackPort.h

@@ -0,0 +1,7 @@
+#ifndef JASTRACKPORT_H
+#define JASTRACKPORT_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASTRACKPORT_H */

include/JSystem/JAudio2/JASVoiceBank.h

@@ -0,0 +1,7 @@
+#ifndef JASVOICEBANK_H
+#define JASVOICEBANK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASVOICEBANK_H */

include/JSystem/JAudio2/JASWSParser.h

@@ -0,0 +1,7 @@
+#ifndef JASWSPARSER_H
+#define JASWSPARSER_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASWSPARSER_H */

include/JSystem/JAudio2/JASWaveArc.h

@@ -1,11 +0,0 @@
-#ifndef JASWAVEARC_H_
-#define JASWAVEARC_H_
-
-// Additional symbols needed for JASWaveArc
-extern "C" {
-void erase__10JASWaveArcFv(void);
-void load__10JASWaveArcFP7JASHeap(void);
-void loadTail__10JASWaveArcFP7JASHeap(void);
-}
-
-#endif  // JASWAVEARC_H_

include/JSystem/JAudio2/JASWaveArcLoader.h

@@ -0,0 +1,7 @@
+#ifndef JASWAVEARCLOADER_H
+#define JASWAVEARCLOADER_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JASWAVEARCLOADER_H */

include/JSystem/JAudio2/JAU.h

@@ -1,11 +0,0 @@
-#ifndef JAU_H_
-#define JAU_H_
-
-extern "C" {
-void __ct__18JAU_JAIInitializerFv(void);
-void initJAInterface__18JAU_JAIInitializerFv(void);
-void __ct__18JAU_JASInitializerFv(void);
-void initJASystem__18JAU_JASInitializerFP12JKRSolidHeap(void);
-}
-
-#endif  // JAU_H_

include/JSystem/JAudio2/JAUAudioArcInterpreter.h

@@ -1,8 +1,7 @@
-#ifndef JAUAUDIOARCINTERPRETER_H_
-#define JAUAUDIOARCINTERPRETER_H_
+#ifndef JAUAUDIOARCINTERPRETER_H
+#define JAUAUDIOARCINTERPRETER_H
 
-extern "C" {
-void __dt__22JAUAudioArcInterpreterFv(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAUAUDIOARCINTERPRETER_H_
+
+#endif /* JAUAUDIOARCINTERPRETER_H */

include/JSystem/JAudio2/JAUAudioArcLoader.h

@@ -0,0 +1,7 @@
+#ifndef JAUAUDIOARCLOADER_H
+#define JAUAUDIOARCLOADER_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUAUDIOARCLOADER_H */

include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h

@@ -1,12 +0,0 @@
-#ifndef JAUAUDIOARCLOADER_H_
-#define JAUAUDIOARCLOADER_H_
-
-struct JAUSection;  // goes in JAudio2.a JAUAudioArcLoader.o
-
-extern "C" {
-void __ct__16Z2AudioArcLoaderFP10JAUSection(void);
-void __ct__17JAUAudioArcLoaderFP10JAUSection(void);  // ctor
-void load__17JAUAudioArcLoaderFPCv(void);
-}
-
-#endif  // JAUAUDIOARCLOADER_H_

include/JSystem/JAudio2/JAUAudioMgr.h

@@ -0,0 +1,7 @@
+#ifndef JAUAUDIOMGR_H
+#define JAUAUDIOMGR_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUAUDIOMGR_H */

include/JSystem/JAudio2/JAUBankTable.h

@@ -0,0 +1,7 @@
+#ifndef JAUBANKTABLE_H
+#define JAUBANKTABLE_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUBANKTABLE_H */

include/JSystem/JAudio2/JAUClusterSound.h

@@ -0,0 +1,7 @@
+#ifndef JAUCLUSTERSOUND_H
+#define JAUCLUSTERSOUND_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUCLUSTERSOUND_H */

include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h

@@ -1,6 +0,0 @@
-#ifndef JAUCLUSTERSOUND_H_
-#define JAUCLUSTERSOUND_H_
-
-#include "dolphin/types.h"
-
-#endif

include/JSystem/JAudio2/JAUInitializer.h

@@ -0,0 +1,7 @@
+#ifndef JAUINITIALIZER_H
+#define JAUINITIALIZER_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUINITIALIZER_H */

include/JSystem/JAudio2/JAUNewSectionHeap.h

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

include/JSystem/JAudio2/JAUSection.h

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

include/JSystem/JAudio2/JAUSectionHeap.h

@@ -1,12 +1,7 @@
-#ifndef JAUSECTIONHEAP_H_
-#define JAUSECTIONHEAP_H_
+#ifndef JAUSECTIONHEAP_H
+#define JAUSECTIONHEAP_H
 
-extern "C" {
-void getOpenSection__14JAUSectionHeapFv(void);
-void loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb(void);
-void newDynamicSeqBlock__14JAUSectionHeapFUl(void);
-void releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv(void);
-void setSeqDataArchive__14JAUSectionHeapFP10JKRArchive(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAUSECTIONHEAP_H_
+
+#endif /* JAUSECTIONHEAP_H */

include/JSystem/JAudio2/JAUSeqCollection.h

@@ -0,0 +1,7 @@
+#ifndef JAUSEQCOLLECTION_H
+#define JAUSEQCOLLECTION_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUSEQCOLLECTION_H */

include/JSystem/JAudio2/JAUSeqDataBlockMgr.h

@@ -0,0 +1,7 @@
+#ifndef JAUSEQDATABLOCKMGR_H
+#define JAUSEQDATABLOCKMGR_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUSEQDATABLOCKMGR_H */

include/JSystem/JAudio2/JAUSoundAnimation.h

@@ -1,9 +0,0 @@
-#ifndef JAUSOUNDANIMATION_H_
-#define JAUSOUNDANIMATION_H_
-
-extern "C" {
-void getStartSoundIndex__17JAUSoundAnimationCFf(void);
-void getEndSoundIndex__17JAUSoundAnimationCFf(void);
-}
-
-#endif  // JAUSOUNDANIMATION_H_

include/JSystem/JAudio2/JAUSoundAnimator.h

@@ -0,0 +1,7 @@
+#ifndef JAUSOUNDANIMATOR_H
+#define JAUSOUNDANIMATOR_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUSOUNDANIMATOR_H */

include/JSystem/JAudio2/JAUSoundTable.h

@@ -1,9 +1,7 @@
-#ifndef JAUSOUNDTABLE_H_
-#define JAUSOUNDTABLE_H_
+#ifndef JAUSOUNDTABLE_H
+#define JAUSOUNDTABLE_H
 
-extern "C" {
-void getData__13JAUSoundTableCF10JAISoundID(void);
-void getTypeID__13JAUSoundTableCF10JAISoundID(void);
-}
+#include "dolphin/types.h"
 
-#endif  // JAUSOUNDTABLE_H_
+
+#endif /* JAUSOUNDTABLE_H */

include/JSystem/JAudio2/JAUStreamFileTable.h

@@ -0,0 +1,7 @@
+#ifndef JAUSTREAMFILETABLE_H
+#define JAUSTREAMFILETABLE_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JAUSTREAMFILETABLE_H */

include/JSystem/JAudio2/dspproc.h

@@ -0,0 +1,7 @@
+#ifndef DSPPROC_H
+#define DSPPROC_H
+
+#include "dolphin/types.h"
+
+
+#endif /* DSPPROC_H */

include/JSystem/JAudio2/dsptask.h

@@ -0,0 +1,7 @@
+#ifndef DSPTASK_H
+#define DSPTASK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* DSPTASK_H */

include/JSystem/JAudio2/osdsp.h

@@ -0,0 +1,7 @@
+#ifndef OSDSP_H
+#define OSDSP_H
+
+#include "dolphin/types.h"
+
+
+#endif /* OSDSP_H */

include/JSystem/JAudio2/osdsp_task.h

@@ -0,0 +1,7 @@
+#ifndef OSDSP_TASK_H
+#define OSDSP_TASK_H
+
+#include "dolphin/types.h"
+
+
+#endif /* OSDSP_TASK_H */