auto decompile more functions

13 files changed, 57 insertions, 58 deletions

diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp
index 425048ffe5..245678698b 100644
--- a/libs/Z2AudioLib/Z2Audience.cpp
+++ b/libs/Z2AudioLib/Z2Audience.cpp
@@ -88,14 +88,14 @@ struct Z2Audience3DSetting {
     /* 802BC6F8 */ void updateDolbyDist(f32, f32);
 };
 
-struct Z2AudibleChannel {
-    /* 802BBE74 */ Z2AudibleChannel();
-};
-
 struct JAIAudible {
     /* 8029EFAC */ ~JAIAudible();
 };
 
+struct Z2AudibleChannel {
+    /* 802BBE74 */ Z2AudibleChannel();
+};
+
 struct Z2Audience {
     /* 802BD130 */ Z2Audience();
     /* 802BD1FC */ ~Z2Audience();
diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp
index 2ca4d22043..a1ce62d2e7 100644
--- a/libs/Z2AudioLib/Z2AudioMgr.cpp
+++ b/libs/Z2AudioLib/Z2AudioMgr.cpp
@@ -70,14 +70,6 @@ struct Z2FxLineMgr {
     /* 802BA7DC */ Z2FxLineMgr();
 };
 
-struct JAISoundHandle {};
-
-struct JKRSolidHeap {};
-
-struct JKRArchive {};
-
-struct JAISoundID {};
-
 struct JGeometry {
     template <typename A1>
     struct TVec3 {};
@@ -85,6 +77,14 @@ struct JGeometry {
     struct TVec3__template0 {};
 };
 
+struct JAISoundID {};
+
+struct JKRArchive {};
+
+struct JKRSolidHeap {};
+
+struct JAISoundHandle {};
+
 struct Z2AudioMgr {
     /* 802CD248 */ Z2AudioMgr();
     /* 802CD34C */ void init(JKRSolidHeap*, u32, void*, JKRArchive*);
@@ -191,7 +191,6 @@ struct JASGenericMemPool {
 };
 
 struct JASDriver {
-    /* 8029C9F0 */ void getSubFrames();
     /* 8029E178 */ void setOutputMode(u32);
 };
 
diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp
index 0f7196ba95..ddb087dc9d 100644
--- a/libs/Z2AudioLib/Z2Creature.cpp
+++ b/libs/Z2AudioLib/Z2Creature.cpp
@@ -22,15 +22,10 @@ struct Z2SoundObjSimple {
     /* 802BE844 */ Z2SoundObjSimple();
 };
 
-template <typename A0>
-struct JSULink {};
-/* JSULink<Z2CreatureEnemy> */
-struct JSULink__template2 {};
+struct JAISoundID {};
 
 struct Vec {};
 
-struct JAISoundID {};
-
 struct Z2CreatureEnemy {
     /* 802C0F64 */ Z2CreatureEnemy();
     /* 802C0FC4 */ void deleteObject();
@@ -48,6 +43,11 @@ struct Z2CreatureEnemy {
     /* 802C1B90 */ void setEnemyName(char const*);
 };
 
+template <typename A0>
+struct JSULink {};
+/* JSULink<Z2CreatureEnemy> */
+struct JSULink__template2 {};
+
 struct Z2SoundObjMgr {
     /* 802C0074 */ void getEnemyID(char const*, JSULink<Z2CreatureEnemy>*);
     /* 802C0190 */ void removeEnemy(JSULink<Z2CreatureEnemy>*);
diff --git a/libs/Z2AudioLib/Z2FxLineMgr.cpp b/libs/Z2AudioLib/Z2FxLineMgr.cpp
index 595981c31f..f9124a09b7 100644
--- a/libs/Z2AudioLib/Z2FxLineMgr.cpp
+++ b/libs/Z2AudioLib/Z2FxLineMgr.cpp
@@ -11,15 +11,15 @@
 // Types:
 //
 
-struct JKRArchive {
-    /* 802D5D38 */ void getResource(u16);
-    /* 802D610C */ void countResource() const;
+struct JKRHeap {
+    /* 802CE500 */ void free(void*, JKRHeap*);
 };
 
 struct Z2FxLineConfig {};
 
-struct JKRHeap {
-    /* 802CE500 */ void free(void*, JKRHeap*);
+struct JKRArchive {
+    /* 802D5D38 */ void getResource(u16);
+    /* 802D610C */ void countResource() const;
 };
 
 struct Z2FxLineMgr {
diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp
index 9a54c459f5..a980dd11c1 100644
--- a/libs/Z2AudioLib/Z2LinkMgr.cpp
+++ b/libs/Z2AudioLib/Z2LinkMgr.cpp
@@ -19,10 +19,6 @@ struct dSv_event_c {
     /* 800349BC */ void isEventBit(u16) const;
 };
 
-struct JAISoundHandle {};
-
-struct JAISoundID {};
-
 struct JGeometry {
     template <typename A1>
     struct TVec3 {};
@@ -30,6 +26,10 @@ struct JGeometry {
     struct TVec3__template0 {};
 };
 
+struct JAISoundID {};
+
+struct JAISoundHandle {};
+
 struct Z2SoundStarter {
     /* 802AAB94 */ Z2SoundStarter(bool);
     /* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*, u32,
diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp
index 0aa5523701..92f0bca968 100644
--- a/libs/Z2AudioLib/Z2SoundHandles.cpp
+++ b/libs/Z2AudioLib/Z2SoundHandles.cpp
@@ -11,8 +11,6 @@
 // Types:
 //
 
-struct JAISoundID {};
-
 struct JGeometry {
     template <typename A1>
     struct TVec3 {};
@@ -20,6 +18,8 @@ struct JGeometry {
     struct TVec3__template0 {};
 };
 
+struct JAISoundID {};
+
 struct Z2SoundHandles {
     /* 802AB07C */ Z2SoundHandles();
     /* 802AB0B4 */ ~Z2SoundHandles();
diff --git a/libs/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp
index 39fe74f38d..032484bba0 100644
--- a/libs/Z2AudioLib/Z2SoundInfo.cpp
+++ b/libs/Z2AudioLib/Z2SoundInfo.cpp
@@ -11,16 +11,16 @@
 // Types:
 //
 
-struct JAISound {};
-
-struct JAISeq {};
+struct JAISe {};
 
 struct JAISoundID {};
 
-struct JAISe {};
+struct JAISeq {};
 
 struct JAIStream {};
 
+struct JAISound {};
+
 struct Z2SoundInfo {
     /* 802BB00C */ void getBgmSeqResourceID(JAISoundID) const;
     /* 802BB090 */ void getSoundType(JAISoundID) const;
diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp
index 4ecefbfebd..27e5d363e2 100644
--- a/libs/Z2AudioLib/Z2SoundMgr.cpp
+++ b/libs/Z2AudioLib/Z2SoundMgr.cpp
@@ -15,12 +15,6 @@ struct Z2SpeechMgr2 {
     /* 802CC190 */ void speakOneWord(bool);
 };
 
-struct JAISound {};
-
-struct JAISoundHandle {};
-
-struct JAISoundID {};
-
 struct JGeometry {
     template <typename A1>
     struct TVec3 {};
@@ -28,6 +22,12 @@ struct JGeometry {
     struct TVec3__template0 {};
 };
 
+struct JAISound {};
+
+struct JAISoundID {};
+
+struct JAISoundHandle {};
+
 struct Z2SoundMgr {
     /* 802A9E80 */ Z2SoundMgr();
     /* 802A9EE8 */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp
index 8248d7878e..5820dc5131 100644
--- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp
+++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp
@@ -11,13 +11,13 @@
 // Types:
 //
 
+struct Z2CreatureEnemy {};
+
 template <typename A0>
 struct JSULink {};
 /* JSULink<Z2CreatureEnemy> */
 struct JSULink__template2 {};
 
-struct Z2CreatureEnemy {};
-
 struct Z2SoundObjMgr {
     /* 802BF920 */ Z2SoundObjMgr();
     /* 802BF980 */ void setForceBattleArea(bool, u16, u16, u16);
diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp
index be926d5585..b8644dd3c2 100644
--- a/libs/Z2AudioLib/Z2SoundObject.cpp
+++ b/libs/Z2AudioLib/Z2SoundObject.cpp
@@ -19,10 +19,10 @@ struct Z2SoundStarter {
     /* 802AAEDC */ void setPortData(JAISoundHandle*, u32, u16, s8);
 };
 
-struct Vec {};
-
 struct JAISoundID {};
 
+struct Vec {};
+
 struct Z2SoundObjSimple {
     /* 802BE844 */ Z2SoundObjSimple();
     /* 802BE880 */ void init(Vec*, u8);
@@ -50,8 +50,6 @@ struct Z2SoundObjArrow {
     /* 802BEB74 */ void init(Vec*, u8);
 };
 
-struct JAUSoundAnimationSound {};
-
 struct JGeometry {
     template <typename A1>
     struct TVec3 {};
@@ -59,6 +57,8 @@ struct JGeometry {
     struct TVec3__template0 {};
 };
 
+struct JAUSoundAnimationSound {};
+
 struct Z2SoundObjAnime {
     /* 802BEB94 */ Z2SoundObjAnime();
     /* 802BEBDC */ void init(Vec*, u8);
diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp
index 82e63bb6ef..e449e19b81 100644
--- a/libs/Z2AudioLib/Z2SoundStarter.cpp
+++ b/libs/Z2AudioLib/Z2SoundStarter.cpp
@@ -11,10 +11,6 @@
 // Types:
 //
 
-struct JAISoundHandle {};
-
-struct JAISoundID {};
-
 struct JGeometry {
     template <typename A1>
     struct TVec3 {};
@@ -22,6 +18,10 @@ struct JGeometry {
     struct TVec3__template0 {};
 };
 
+struct JAISoundID {};
+
+struct JAISoundHandle {};
+
 struct Z2SoundStarter {
     /* 802AAB94 */ Z2SoundStarter(bool);
     /* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*, u32,
diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp
index d22fe8d8f3..6a6733264a 100644
--- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp
+++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp
@@ -11,12 +11,6 @@
 // Types:
 //
 
-struct JAISoundHandle {
-    /* 802A2184 */ void releaseSound();
-};
-
-struct JAISoundID {};
-
 struct JGeometry {
     template <typename A1>
     struct TVec3 {};
@@ -24,6 +18,12 @@ struct JGeometry {
     struct TVec3__template0 {};
 };
 
+struct JAISoundID {};
+
+struct JAISoundHandle {
+    /* 802A2184 */ void releaseSound();
+};
+
 struct Z2SpeechStarter {
     /* 802CBCEC */ ~Z2SpeechStarter();
     /* 802CCFB8 */ Z2SpeechStarter();
diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp
index 2be8f8d270..b3a96186da 100644
--- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp
+++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp
@@ -11,10 +11,10 @@
 // Types:
 //
 
-struct Vec {};
-
 struct Z2WolfHowlData {};
 
+struct Vec {};
+
 struct Z2WolfHowlMgr {
     /* 802CAAC0 */ Z2WolfHowlMgr();
     /* 802CAB8C */ void resetState();