dol2asm OK

1 files changed, 640 insertions, 214 deletions

diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp
index 28198b522b..bafbcdf9f9 100644
--- a/libs/Z2AudioLib/Z2SoundObject.cpp
+++ b/libs/Z2AudioLib/Z2SoundObject.cpp
@@ -1,276 +1,702 @@
-/* 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"
-
-extern "C" {
-void __dl__FPv(void);
-void getNthLink__10JSUPtrListCFUl(void);
-}
+// 
+// Generated By: dol2asm
+// Translation Unit: Z2SoundObject
+// 
 
-// additional symbols needed for Z2SoundObject.cpp
-// autogenerated by split.py v0.3 at 2021-01-04 23:48:52.434158
-extern u8 lbl_80455B58;
-extern u8 lbl_80455B78;
-extern u8 lbl_80455B48;
-extern u8 lbl_80455B7C;
-extern u8 lbl_80455B60;
-extern u8 lbl_8039C230;
-extern u8 lbl_80455B40;
-extern u8 lbl_80455B54;
-extern u8 lbl_80455B70;
-extern u8 lbl_803CACF0;
-extern u8 lbl_80455B68;
-extern u8 lbl_80455B50;
-extern u8 lbl_80455B3C;
-extern u8 lbl_80455B5C;
-extern u8 lbl_803CAD30;
-extern u8 lbl_80455B74;
-extern u8 lbl_80455B38;
-extern u8 lbl_803CAD50;
-extern u8 lbl_80450B60;
-extern u8 lbl_803CAD10;
-extern u8 lbl_803CACD0;
-extern u8 lbl_80450AE8;
-
-Z2SoundObjBase::Z2SoundObjBase() {
-    //! @note initializer list doesn't work since fields were initialized out of
-    //! structure layout order, indicating original code didn't use initializer list.
-    mSoundPos = NULL;
-    mIsInitialized = false;
-    mSoundStarter = lbl_80450B74;
-    field_0x1c = 0;
-    field_0x1e = 0;
-}
+#include "dol2asm.h"
+#include "dolphin/types.h"
+#include "Z2AudioLib/Z2SoundObject.h"
+
+// 
+// Types:
+// 
+
+struct JAISoundHandle {
+	/* 802A2184 */ void releaseSound();
+};
+
+struct Z2SoundStarter {
+	/* 802AAEDC */ void setPortData(JAISoundHandle*, u32, u16, s8);
+};
+
+struct JAISoundID {
+};
+
+struct Vec {
+};
+
+struct Z2SoundObjSimple {
+	/* 802BE844 */ Z2SoundObjSimple();
+	/* 802BE880 */ void init(Vec*, u8);
+	/* 802BE8A0 */ void startSound(JAISoundID, u32, s8);
+	/* 802BE9B0 */ void startLevelSound(JAISoundID, u32, s8);
+};
+
+struct Z2SoundHandlePool {
+};
+
+struct Z2SoundObjBase {
+	/* 802BDEF0 */ Z2SoundObjBase();
+	/* 802BDF48 */ ~Z2SoundObjBase();
+	/* 802BDFB0 */ void init(Vec*, u8);
+	/* 802BDFF8 */ void deleteObject();
+	/* 802BE038 */ void framework(u32, s8);
+	/* 802BE070 */ void dispose();
+	/* 802BE104 */ void stopOK(Z2SoundHandlePool&);
+	/* 802BE144 */ void startSound(JAISoundID, u32, s8);
+	/* 802BE2D4 */ void startLevelSound(JAISoundID, u32, s8);
+	/* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*);
+};
+
+struct Z2SoundObjArrow {
+	/* 802BEB38 */ Z2SoundObjArrow();
+	/* 802BEB74 */ void init(Vec*, u8);
+};
+
+struct JGeometry {
+	template <typename A1>
+	struct TVec3 { };
+	/* TVec3<f32> */
+	struct TVec3__template0 {
+	};
+
+};
+
+struct JAUSoundAnimationSound {
+};
+
+struct Z2SoundObjAnime {
+	/* 802BEB94 */ Z2SoundObjAnime();
+	/* 802BEBDC */ void init(Vec*, u8);
+	/* 802BEBFC */ void initAnime(void*, bool, f32, f32);
+	/* 802BED68 */ void ageSounds_();
+	/* 802BEED4 */ void updateAnime(f32, f32);
+	/* 802BF304 */ void updateSoundLifeTime_(f32, f32);
+	/* 802BF660 */ void startSoundInner(JGeometry::TVec3<f32> const&, f32, Z2SoundStarter*, u32, s8);
+	/* 802BF890 */ void getSoundID(JAUSoundAnimationSound const*, JGeometry::TVec3<f32> const&, f32);
+	/* 802BF898 */ void playsSound(JAUSoundAnimationSound const*, JGeometry::TVec3<f32> const&, f32);
+};
+
+struct Z2SoundInfo {
+	/* 802BBAC8 */ void getSwBit(JAISoundID) const;
+};
+
+struct Z2SoundHandles {
+	/* 802AB07C */ Z2SoundHandles();
+	/* 802AB0B4 */ ~Z2SoundHandles();
+	/* 802AB118 */ void initHandlesPool(u8);
+	/* 802AB120 */ void deleteHandlesPool();
+	/* 802AB254 */ void getHandleSoundID(JAISoundID);
+	/* 802AB2A0 */ void getHandleUserData(u32);
+	/* 802AB2D8 */ void getFreeHandle();
+	/* 802AB3D0 */ void getLowPrioSound(JAISoundID);
+	/* 802AB538 */ void setPos(JGeometry::TVec3<f32> const&);
+};
+
+struct Z2SeMgr {
+	/* 802AE5B0 */ void isSoundCulling(JAISoundID);
+};
+
+struct Z2DopplerSoundObjBase {
+	/* 802BE5A0 */ Z2DopplerSoundObjBase();
+	/* 802BE5FC */ ~Z2DopplerSoundObjBase();
+	/* 802BE65C */ void init(Vec*, u8);
+	/* 802BE6B8 */ void framework(u32, s8);
+	/* 802BE714 */ void startSound(JAISoundID, u32, s8);
+	/* 802BE7AC */ void startLevelSound(JAISoundID, u32, s8);
+};
+
+struct Z2Calc {
+	struct CurveSign {
+	};
+
+	/* 802A96F4 */ void getParamByExp(f32, f32, f32, f32, f32, f32, Z2Calc::CurveSign);
+};
+
+struct JSUPtrList {
+	/* 802DC20C */ void getNthLink(u32) const;
+};
+
+struct JAUSoundAnimation {
+	/* 802A6F70 */ void getStartSoundIndex(f32) const;
+	/* 802A7044 */ void getEndSoundIndex(f32) const;
+};
+
+struct JAISoundParamsMove {
+	/* 802A2DB4 */ void moveVolume(f32, u32);
+	/* 802A2E0C */ void movePitch(f32, u32);
+	/* 802A2E64 */ void moveFxMix(f32, u32);
+};
+
+struct JAIAudience {
+};
+
+struct JAISound {
+	/* 802A244C */ void acceptsNewAudible() const;
+	/* 802A2474 */ void newAudible(JGeometry::TVec3<f32> const&, JGeometry::TVec3<f32> const*, u32, JAIAudience*);
+	/* 802A2598 */ void stop();
+};
+
+// 
+// Forward References:
+// 
+
+extern "C" extern void* __vt__15Z2SoundObjAnime[8];
+extern "C" extern void* __vt__15Z2SoundObjArrow[8];
+extern "C" extern void* __vt__16Z2SoundObjSimple[8];
+
+extern "C" void __ct__14Z2SoundObjBaseFv();
+extern "C" void __dt__14Z2SoundObjBaseFv();
+extern "C" void init__14Z2SoundObjBaseFP3VecUc();
+extern "C" void deleteObject__14Z2SoundObjBaseFv();
+extern "C" void framework__14Z2SoundObjBaseFUlSc();
+extern "C" void dispose__14Z2SoundObjBaseFv();
+extern "C" void stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool();
+extern "C" void startSound__14Z2SoundObjBaseF10JAISoundIDUlSc();
+extern "C" void startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc();
+extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase();
+extern "C" void __ct__21Z2DopplerSoundObjBaseFv();
+extern "C" void __dt__21Z2DopplerSoundObjBaseFv();
+extern "C" void init__21Z2DopplerSoundObjBaseFP3VecUc();
+extern "C" void framework__21Z2DopplerSoundObjBaseFUlSc();
+extern "C" void startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc();
+extern "C" void startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc();
+extern "C" void __ct__16Z2SoundObjSimpleFv();
+extern "C" void init__16Z2SoundObjSimpleFP3VecUc();
+extern "C" void startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc();
+extern "C" void startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc();
+extern "C" void __ct__15Z2SoundObjArrowFv();
+extern "C" void init__15Z2SoundObjArrowFP3VecUc();
+extern "C" void __ct__15Z2SoundObjAnimeFv();
+extern "C" void init__15Z2SoundObjAnimeFP3VecUc();
+extern "C" void initAnime__15Z2SoundObjAnimeFPvbff();
+extern "C" void ageSounds___15Z2SoundObjAnimeFv();
+extern "C" void updateAnime__15Z2SoundObjAnimeFff();
+extern "C" void updateSoundLifeTime___15Z2SoundObjAnimeFff();
+extern "C" void func_802BF660();
+extern "C" void func_802BF890();
+extern "C" void func_802BF898();
+extern "C" extern void* __vt__15Z2SoundObjAnime[8];
+extern "C" extern void* __vt__15Z2SoundObjArrow[8];
+extern "C" extern void* __vt__16Z2SoundObjSimple[8];
+
+// 
+// External References:
+// 
+
+void operator delete(void*);
+extern "C" extern u32 __float_max;
+extern "C" extern u8 data_80450B4C[4];
+extern "C" extern u8 data_80450B60[4];
+extern "C" extern u8 data_80450B74[4];
+extern "C" extern u8 data_80450B88[4];
+
+extern "C" void releaseSound__14JAISoundHandleFv();
+extern "C" void acceptsNewAudible__8JAISoundCFv();
+extern "C" void func_802A2474();
+extern "C" void stop__8JAISoundFv();
+extern "C" void moveVolume__18JAISoundParamsMoveFfUl();
+extern "C" void movePitch__18JAISoundParamsMoveFfUl();
+extern "C" void moveFxMix__18JAISoundParamsMoveFfUl();
+extern "C" void getStartSoundIndex__17JAUSoundAnimationCFf();
+extern "C" void getEndSoundIndex__17JAUSoundAnimationCFf();
+extern "C" void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign();
+extern "C" void setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc();
+extern "C" void __ct__14Z2SoundHandlesFv();
+extern "C" void __dt__14Z2SoundHandlesFv();
+extern "C" void initHandlesPool__14Z2SoundHandlesFUc();
+extern "C" void deleteHandlesPool__14Z2SoundHandlesFv();
+extern "C" void getHandleSoundID__14Z2SoundHandlesF10JAISoundID();
+extern "C" void getHandleUserData__14Z2SoundHandlesFUl();
+extern "C" void getFreeHandle__14Z2SoundHandlesFv();
+extern "C" void getLowPrioSound__14Z2SoundHandlesF10JAISoundID();
+extern "C" void func_802AB538();
+extern "C" void isSoundCulling__7Z2SeMgrF10JAISoundID();
+extern "C" void getSwBit__11Z2SoundInfoCF10JAISoundID();
+extern "C" void __dl__FPv();
+extern "C" void getNthLink__10JSUPtrListCFUl();
+extern "C" void _savegpr_23();
+extern "C" void _savegpr_28();
+extern "C" void _savegpr_29();
+extern "C" void _restgpr_23();
+extern "C" void _restgpr_28();
+extern "C" void _restgpr_29();
+extern "C" extern u32 __float_max;
+extern "C" extern u8 data_80450B4C[4];
+extern "C" extern u8 data_80450B60[4];
+extern "C" extern u8 data_80450B74[4];
+extern "C" extern u8 data_80450B88[4];
+
+// 
+// Declarations:
+// 
+
+/* ############################################################################################## */
+/* 803CACD0-803CACF0 0020+00 s=1 e=1 z=0  None .data      __vt__15Z2SoundObjAnime                                      */
+SECTION_DATA void* __vt__15Z2SoundObjAnime[8] = {
+	(void*)NULL,
+	(void*)NULL,
+	(void*)framework__14Z2SoundObjBaseFUlSc,
+	(void*)dispose__14Z2SoundObjBaseFv,
+	(void*)stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool,
+	(void*)init__15Z2SoundObjAnimeFP3VecUc,
+	(void*)startSound__14Z2SoundObjBaseF10JAISoundIDUlSc,
+	(void*)startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc,
+};
+
+/* 803CACF0-803CAD10 0020+00 s=1 e=0 z=1  None .data      __vt__15Z2SoundObjArrow                                      */
+SECTION_DATA void* __vt__15Z2SoundObjArrow[8] = {
+	(void*)NULL,
+	(void*)NULL,
+	(void*)framework__21Z2DopplerSoundObjBaseFUlSc,
+	(void*)dispose__14Z2SoundObjBaseFv,
+	(void*)stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool,
+	(void*)init__15Z2SoundObjArrowFP3VecUc,
+	(void*)startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc,
+	(void*)startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc,
+};
+
+/* 803CAD10-803CAD30 0020+00 s=1 e=3 z=14  None .data      __vt__16Z2SoundObjSimple                                     */
+SECTION_DATA void* __vt__16Z2SoundObjSimple[8] = {
+	(void*)NULL,
+	(void*)NULL,
+	(void*)framework__14Z2SoundObjBaseFUlSc,
+	(void*)dispose__14Z2SoundObjBaseFv,
+	(void*)stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool,
+	(void*)init__16Z2SoundObjSimpleFP3VecUc,
+	(void*)startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc,
+	(void*)startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc,
+};
+
+/* 803CAD30-803CAD50 0020+00 s=2 e=0 z=0  None .data      __vt__21Z2DopplerSoundObjBase                                */
+SECTION_DATA static void* __vt__21Z2DopplerSoundObjBase[8] = {
+	(void*)NULL,
+	(void*)NULL,
+	(void*)framework__21Z2DopplerSoundObjBaseFUlSc,
+	(void*)dispose__14Z2SoundObjBaseFv,
+	(void*)stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool,
+	(void*)init__21Z2DopplerSoundObjBaseFP3VecUc,
+	(void*)startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc,
+	(void*)startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc,
+};
+
+/* 803CAD50-803CAD70 0020+00 s=2 e=0 z=0  None .data      __vt__14Z2SoundObjBase                                       */
+SECTION_DATA static void* __vt__14Z2SoundObjBase[8] = {
+	(void*)NULL,
+	(void*)NULL,
+	(void*)framework__14Z2SoundObjBaseFUlSc,
+	(void*)dispose__14Z2SoundObjBaseFv,
+	(void*)stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool,
+	(void*)init__14Z2SoundObjBaseFP3VecUc,
+	(void*)startSound__14Z2SoundObjBaseF10JAISoundIDUlSc,
+	(void*)startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc,
+};
 
-Z2SoundObjBase::~Z2SoundObjBase() {
-    deleteObject();
+/* 802BDEF0-802BDF48 0058+00 s=3 e=2 z=0  None .text      __ct__14Z2SoundObjBaseFv                                     */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm Z2SoundObjBase::Z2SoundObjBase() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s"
 }
+#pragma pop
+
 
-void Z2SoundObjBase::init(Vec* pSoundPos, u8 pNumHandles) {
-    initHandlesPool(pNumHandles);
-    mSoundPos = pSoundPos;
-    mIsInitialized = true;
+/* 802BDF48-802BDFB0 0068+00 s=1 e=3 z=15  None .text      __dt__14Z2SoundObjBaseFv                                     */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm Z2SoundObjBase::~Z2SoundObjBase() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s"
 }
+#pragma pop
 
-void Z2SoundObjBase::deleteObject() {
-    this->dispose();
-    this->deleteHandlesPool();
+
+/* 802BDFB0-802BDFF8 0048+00 s=5 e=2 z=0  None .text      init__14Z2SoundObjBaseFP3VecUc                               */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjBase::init(Vec* param_0, u8 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s"
 }
+#pragma pop
+
 
-void Z2SoundObjBase::framework(u32 p1, s8 p2) {
-    if (mIsInitialized) {
-        this->field_0x1c = p1;
-        this->field_0x1e = p2;
-        this->setPos(*(JGeometry::TVec3<f32>*)this->mSoundPos);
-    }
+/* 802BDFF8-802BE038 0040+00 s=1 e=8 z=61  None .text      deleteObject__14Z2SoundObjBaseFv                             */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjBase::deleteObject() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/deleteObject__14Z2SoundObjBaseFv.s"
 }
+#pragma pop
 
-void Z2SoundObjBase::dispose() {
-    JAISoundHandle* handle;
-    JSULink<Z2SoundHandlePool>* link;
-    for (link = this->getFirst(); link != NULL; link = link->getNext()) {
-        handle = link->getObject();
-        if (handle != NULL && (bool)*handle) {
-            u32 swBit = lbl_80450B4C->getSwBit((*handle)->getID());
-            if ((swBit & 0x8000) != 0) {
-                handle->releaseSound();
-            } else {
-                (*handle)->stop();
-            }
-        }
-    }
-
-    this->mIsInitialized = false;
+
+/* 802BE038-802BE070 0038+00 s=4 e=3 z=0  None .text      framework__14Z2SoundObjBaseFUlSc                             */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjBase::framework(u32 param_0, s8 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s"
 }
+#pragma pop
+
 
-bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& pSoundHandlePool) {
-    return !(lbl_80450B4C->getSwBit(pSoundHandlePool->getID()) & 0x8000);
+/* 802BE070-802BE104 0094+00 s=5 e=3 z=0  None .text      dispose__14Z2SoundObjBaseFv                                  */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjBase::dispose() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/dispose__14Z2SoundObjBaseFv.s"
 }
+#pragma pop
+
 
-extern "C" {
-// startSound__14Z2SoundObjBaseF10JAISoundIDUlSc
-// Z2SoundObjBase::startSound(JAISoundID, unsigned long, char)
-asm void startSound__14Z2SoundObjBaseF10JAISoundIDUlSc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE144.s"
+/* 802BE104-802BE144 0040+00 s=5 e=3 z=0  None .text      stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool                */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjBase::stopOK(Z2SoundHandlePool& param_0) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool.s"
 }
+#pragma pop
+
+
+/* ############################################################################################## */
+/* 80455B38-80455B3C 0004+00 s=5 e=0 z=0  None .sdata2    @3559                                                        */
+SECTION_SDATA2 static u32 lit_3559 = 0x42FE0000;
+
+/* 80455B3C-80455B40 0004+00 s=4 e=0 z=0  None .sdata2    @3560                                                        */
+SECTION_SDATA2 static u32 lit_3560 = 0x3F800000;
+
+/* 80455B40-80455B48 0004+04 s=3 e=0 z=0  None .sdata2    @3561                                                        */
+SECTION_SDATA2 static f32 lit_3561[1 + 1 /* padding */] = {
+	-1.0f,
+	/* padding */
+	0.0f,
+};
+
+/* 80455B48-80455B50 0008+00 s=3 e=0 z=0  None .sdata2    @3564                                                        */
+SECTION_SDATA2 static u8 lit_3564[8] = {
+	0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
+};
 
-// startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc
-// Z2SoundObjBase::startLevelSound(JAISoundID, unsigned long, char)
-asm void startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s"
+/* 802BE144-802BE2D4 0190+00 s=5 e=3 z=0  None .text      startSound__14Z2SoundObjBaseF10JAISoundIDUlSc                */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjBase::startSound(JAISoundID param_0, u32 param_1, s8 param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/startSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s"
 }
+#pragma pop
 
-// startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase
-// Z2SoundObjBase::startCollisionSE(unsigned long, unsigned long, Z2SoundObjBase*)
-asm void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s"
+
+/* 802BE2D4-802BE4A4 01D0+00 s=4 e=3 z=0  None .text      startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc           */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjBase::startLevelSound(JAISoundID param_0, u32 param_1, s8 param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s"
 }
+#pragma pop
+
 
-// __ct__21Z2DopplerSoundObjBaseFv
-// Z2DopplerSoundObjBase::Z2DopplerSoundObjBase(void)
-asm void __ct__21Z2DopplerSoundObjBaseFv(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s"
+/* 802BE4A4-802BE5A0 00FC+00 s=0 e=5 z=21  None .text      startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase     */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjBase::startCollisionSE(u32 param_0, u32 param_1, Z2SoundObjBase* param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase.s"
 }
+#pragma pop
 
-// __dt__21Z2DopplerSoundObjBaseFv
-// Z2DopplerSoundObjBase::~Z2DopplerSoundObjBase(void)
-asm void __dt__21Z2DopplerSoundObjBaseFv(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s"
+
+/* ############################################################################################## */
+/* 8039C230-8039C240 000C+04 s=1 e=0 z=0  None .rodata    cNullVec__6Z2Calc                                            */
+SECTION_RODATA static u8 const cNullVec__6Z2Calc[12 + 4 /* padding */] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	/* padding */
+	0x00, 0x00, 0x00, 0x00,
+};
+
+/* 802BE5A0-802BE5FC 005C+00 s=1 e=0 z=0  None .text      __ct__21Z2DopplerSoundObjBaseFv                              */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm Z2DopplerSoundObjBase::Z2DopplerSoundObjBase() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/__ct__21Z2DopplerSoundObjBaseFv.s"
 }
+#pragma pop
+
 
-// init__21Z2DopplerSoundObjBaseFP3VecUc
-// Z2DopplerSoundObjBase::init(Vec*, unsigned char)
-asm void init__21Z2DopplerSoundObjBaseFP3VecUc(Vec* pSoundPos, u8 pNumHandles) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s"
+/* 802BE5FC-802BE65C 0060+00 s=0 e=0 z=1  None .text      __dt__21Z2DopplerSoundObjBaseFv                              */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm Z2DopplerSoundObjBase::~Z2DopplerSoundObjBase() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/__dt__21Z2DopplerSoundObjBaseFv.s"
 }
+#pragma pop
+
 
-// framework__21Z2DopplerSoundObjBaseFUlSc
-// Z2DopplerSoundObjBase::framework(unsigned long, char)
-asm void framework__21Z2DopplerSoundObjBaseFUlSc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s"
+/* 802BE65C-802BE6B8 005C+00 s=1 e=0 z=0  None .text      init__21Z2DopplerSoundObjBaseFP3VecUc                        */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2DopplerSoundObjBase::init(Vec* param_0, u8 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/init__21Z2DopplerSoundObjBaseFP3VecUc.s"
 }
+#pragma pop
 
-// startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc
-// Z2DopplerSoundObjBase::startSound(JAISoundID, unsigned long, char)
-asm void startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE714.s"
+
+/* 802BE6B8-802BE714 005C+00 s=2 e=0 z=0  None .text      framework__21Z2DopplerSoundObjBaseFUlSc                      */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2DopplerSoundObjBase::framework(u32 param_0, s8 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/framework__21Z2DopplerSoundObjBaseFUlSc.s"
 }
+#pragma pop
+
 
-// startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc
-// Z2DopplerSoundObjBase::startLevelSound(JAISoundID, unsigned long, char)
-asm void startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE7AC.s"
+/* 802BE714-802BE7AC 0098+00 s=2 e=0 z=0  None .text      startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc         */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2DopplerSoundObjBase::startSound(JAISoundID param_0, u32 param_1, s8 param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc.s"
 }
+#pragma pop
 
-// __ct__16Z2SoundObjSimpleFv
-// Z2SoundObjSimple::Z2SoundObjSimple(void)
-asm void __ct__16Z2SoundObjSimpleFv(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE844.s"
+
+/* 802BE7AC-802BE844 0098+00 s=2 e=0 z=0  None .text      startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc    */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2DopplerSoundObjBase::startLevelSound(JAISoundID param_0, u32 param_1, s8 param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc.s"
 }
+#pragma pop
+
 
-#ifdef NONMATCHING
-// init__16Z2SoundObjSimpleFP3VecUc
-// Z2SoundObjSimple::init(Vec*, unsigned char)
-void Z2SoundObjSimple::init(Vec* pSoundPos, u8 pNumHandles) {
-    // i would write
-    //   Z2SoundObjBase::init(pSoundPos, pNumHandles);
-    // but MWCC says "illegal use of non-static member"
-    // was calling like this not in C++98?
-
-    // and this doesn't match
-    ((Z2SoundObjBase*)this)->init(pSoundPos, pNumHandles);
+/* 802BE844-802BE880 003C+00 s=0 e=8 z=65  None .text      __ct__16Z2SoundObjSimpleFv                                   */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm Z2SoundObjSimple::Z2SoundObjSimple() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/__ct__16Z2SoundObjSimpleFv.s"
 }
-#else
-asm void Z2SoundObjSimple::init(Vec* pSoundPos, u8 pNumHandles) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE880.s"
+#pragma pop
+
+
+/* 802BE880-802BE8A0 0020+00 s=1 e=0 z=0  None .text      init__16Z2SoundObjSimpleFP3VecUc                             */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjSimple::init(Vec* param_0, u8 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s"
 }
-#endif
+#pragma pop
+
 
-// startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc
-// Z2SoundObjSimple::startSound(JAISoundID, unsigned long, char)
-asm void startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE8A0.s"
+/* ############################################################################################## */
+/* 80455B50-80455B54 0004+00 s=4 e=0 z=0  None .sdata2    @3821                                                        */
+SECTION_SDATA2 static u8 lit_3821[4] = {
+	0x00, 0x00, 0x00, 0x00,
+};
+
+/* 80455B54-80455B58 0004+00 s=2 e=0 z=0  None .sdata2    @3822                                                        */
+SECTION_SDATA2 static u32 lit_3822 = 0x3E4CCCCD;
+
+/* 80455B58-80455B5C 0004+00 s=2 e=0 z=0  None .sdata2    @3823                                                        */
+SECTION_SDATA2 static u32 lit_3823 = 0x3ECCCCCD;
+
+/* 80455B5C-80455B60 0004+00 s=2 e=0 z=0  None .sdata2    @3824                                                        */
+SECTION_SDATA2 static u32 lit_3824 = 0x3F19999A;
+
+/* 80455B60-80455B68 0004+04 s=2 e=0 z=0  None .sdata2    @3825                                                        */
+SECTION_SDATA2 static f32 lit_3825[1 + 1 /* padding */] = {
+	6.0f / 5.0f,
+	/* padding */
+	0.0f,
+};
+
+/* 80455B68-80455B70 0008+00 s=3 e=0 z=0  None .sdata2    @3828                                                        */
+SECTION_SDATA2 static u8 lit_3828[8] = {
+	0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+/* 802BE8A0-802BE9B0 0110+00 s=1 e=0 z=0  None .text      startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc              */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjSimple::startSound(JAISoundID param_0, u32 param_1, s8 param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc.s"
 }
+#pragma pop
+
+
+/* ############################################################################################## */
+/* 80455B70-80455B74 0004+00 s=1 e=0 z=0  None .sdata2    @3859                                                        */
+SECTION_SDATA2 static u32 lit_3859 = 0x40000000;
+
+/* 80455B74-80455B78 0004+00 s=1 e=0 z=0  None .sdata2    @3860                                                        */
+SECTION_SDATA2 static u32 lit_3860 = 0x41B00000;
+
+/* 80455B78-80455B7C 0004+00 s=1 e=0 z=0  None .sdata2    @3861                                                        */
+SECTION_SDATA2 static u32 lit_3861 = 0x42480000;
+
+/* 80455B7C-80455B80 0004+00 s=1 e=0 z=0  None .sdata2    @3862                                                        */
+SECTION_SDATA2 static u32 lit_3862 = 0x3FC00000;
 
-// startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc
-// Z2SoundObjSimple::startLevelSound(JAISoundID, unsigned long, char)
-asm void startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BE9B0.s"
+/* 802BE9B0-802BEB38 0188+00 s=1 e=0 z=0  None .text      startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc         */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjSimple::startLevelSound(JAISoundID param_0, u32 param_1, s8 param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc.s"
 }
+#pragma pop
 
-// __ct__15Z2SoundObjArrowFv
-// Z2SoundObjArrow::Z2SoundObjArrow(void)
-asm void __ct__15Z2SoundObjArrowFv(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BEB38.s"
+
+/* 802BEB38-802BEB74 003C+00 s=0 e=0 z=2  None .text      __ct__15Z2SoundObjArrowFv                                    */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm Z2SoundObjArrow::Z2SoundObjArrow() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/__ct__15Z2SoundObjArrowFv.s"
 }
+#pragma pop
+
 
-// init__15Z2SoundObjArrowFP3VecUc
-// Z2SoundObjArrow::init(Vec*, unsigned char)
-asm void init__15Z2SoundObjArrowFP3VecUc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s"
+/* 802BEB74-802BEB94 0020+00 s=1 e=0 z=0  None .text      init__15Z2SoundObjArrowFP3VecUc                              */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjArrow::init(Vec* param_0, u8 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/init__15Z2SoundObjArrowFP3VecUc.s"
 }
+#pragma pop
 
-// __ct__15Z2SoundObjAnimeFv
-// Z2SoundObjAnime::Z2SoundObjAnime(void)
-asm void __ct__15Z2SoundObjAnimeFv(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s"
+
+/* 802BEB94-802BEBDC 0048+00 s=0 e=2 z=0  None .text      __ct__15Z2SoundObjAnimeFv                                    */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm Z2SoundObjAnime::Z2SoundObjAnime() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/__ct__15Z2SoundObjAnimeFv.s"
 }
+#pragma pop
+
 
-// init__15Z2SoundObjAnimeFP3VecUc
-// Z2SoundObjAnime::init(Vec*, unsigned char)
-asm void init__15Z2SoundObjAnimeFP3VecUc(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s"
+/* 802BEBDC-802BEBFC 0020+00 s=1 e=1 z=0  None .text      init__15Z2SoundObjAnimeFP3VecUc                              */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjAnime::init(Vec* param_0, u8 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/init__15Z2SoundObjAnimeFP3VecUc.s"
 }
+#pragma pop
 
-// initAnime__15Z2SoundObjAnimeFPvbff
-// Z2SoundObjAnime::initAnime(void*, bool, float, float)
-asm void initAnime__15Z2SoundObjAnimeFPvbff(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BEBFC.s"
+
+/* 802BEBFC-802BED68 016C+00 s=0 e=2 z=0  None .text      initAnime__15Z2SoundObjAnimeFPvbff                           */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjAnime::initAnime(void* param_0, bool param_1, f32 param_2, f32 param_3) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/initAnime__15Z2SoundObjAnimeFPvbff.s"
 }
+#pragma pop
+
 
-// ageSounds___15Z2SoundObjAnimeFv
-// Z2SoundObjAnime::ageSounds_(void)
-asm void ageSounds___15Z2SoundObjAnimeFv(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BED68.s"
+/* 802BED68-802BEED4 016C+00 s=1 e=0 z=0  None .text      ageSounds___15Z2SoundObjAnimeFv                              */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjAnime::ageSounds_() {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/ageSounds___15Z2SoundObjAnimeFv.s"
 }
+#pragma pop
+
 
-// updateAnime__15Z2SoundObjAnimeFff
-// Z2SoundObjAnime::updateAnime(float, float)
-asm void updateAnime__15Z2SoundObjAnimeFff(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BEED4.s"
+/* 802BEED4-802BF304 0430+00 s=0 e=2 z=0  None .text      updateAnime__15Z2SoundObjAnimeFff                            */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjAnime::updateAnime(f32 param_0, f32 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/updateAnime__15Z2SoundObjAnimeFff.s"
 }
+#pragma pop
 
-// updateSoundLifeTime___15Z2SoundObjAnimeFff
-// Z2SoundObjAnime::updateSoundLifeTime_(float, float)
-asm void updateSoundLifeTime___15Z2SoundObjAnimeFff(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BF304.s"
+
+/* 802BF304-802BF660 035C+00 s=1 e=0 z=0  None .text      updateSoundLifeTime___15Z2SoundObjAnimeFff                   */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjAnime::updateSoundLifeTime_(f32 param_0, f32 param_1) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/updateSoundLifeTime___15Z2SoundObjAnimeFff.s"
 }
+#pragma pop
+
 
-// startSoundInner__15Z2SoundObjAnimeFRCQ29JGeometry8TVec3<f>fP14Z2SoundStarterUlSc
-// Z2SoundObjAnime::startSoundInner(JGeometry::TVec3<f>, float, Z2SoundStarter*, unsigned long,
-// char)
-asm void Z2SoundObjAnime_NS_startSoundInner(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BF660.s"
+/* 802BF660-802BF890 0230+00 s=1 e=0 z=0  None .text      startSoundInner__15Z2SoundObjAnimeFRCQ29JGeometry8TVec3<f>fP14Z2SoundStarterUlSc */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjAnime::startSoundInner(JGeometry::TVec3<f32> const& param_0, f32 param_1, Z2SoundStarter* param_2, u32 param_3, s8 param_4) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/func_802BF660.s"
 }
+#pragma pop
 
-// getSoundID__15Z2SoundObjAnimeFPC22JAUSoundAnimationSoundRCQ29JGeometry8TVec3<f>f
-// Z2SoundObjAnime::getSoundID(const JAUSoundAnimationSound*, JGeometry::TVec3<f>, float)
-asm void Z2SoundObjAnime_NS_getSoundID(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BF890.s"
+
+/* 802BF890-802BF898 0008+00 s=1 e=0 z=0  None .text      getSoundID__15Z2SoundObjAnimeFPC22JAUSoundAnimationSoundRCQ29JGeometry8TVec3<f>f */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjAnime::getSoundID(JAUSoundAnimationSound const* param_0, JGeometry::TVec3<f32> const& param_1, f32 param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/func_802BF890.s"
 }
+#pragma pop
+
 
-// playsSound__15Z2SoundObjAnimeFPC22JAUSoundAnimationSoundRCQ29JGeometry8TVec3<f>f
-// Z2SoundObjAnime::playsSound(const JAUSoundAnimationSound*, JGeometry::TVec3<f>, float)
-asm void Z2SoundObjAnime_NS_playsSound(void) {
-    nofralloc
-#include "Z2AudioLib/Z2SoundObject/asm/func_802BF898.s"
+/* 802BF898-802BF920 0088+00 s=1 e=0 z=0  None .text      playsSound__15Z2SoundObjAnimeFPC22JAUSoundAnimationSoundRCQ29JGeometry8TVec3<f>f */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void Z2SoundObjAnime::playsSound(JAUSoundAnimationSound const* param_0, JGeometry::TVec3<f32> const& param_1, f32 param_2) {
+	nofralloc
+#include "asm/Z2AudioLib/Z2SoundObject/func_802BF898.s"
 }
-};
+#pragma pop
+
+