summaryrefslogtreecommitdiff
path: root/libs/Z2AudioLib/Z2AudioArcLoader.cpp
diff options
context:
space:
mode:
authorErin Moon <erin@hecke.rs>2021-01-21 22:16:51 -0600
committerGitHub <noreply@github.com>2021-01-21 23:16:51 -0500
commita072e71c33dc4f78f20f7b4ba8645346af66fd9c (patch)
treee4caf9392e0672fceccfd11beed6eb45a10b0bac /libs/Z2AudioLib/Z2AudioArcLoader.cpp
parentafb426c60ca87472063b9b58b1a6b6a9db4fc127 (diff)
Z2AudioLib misc decomp (#75)
* Z2SoundHandles: decomp portions * start decomping: Z2SpeechMgr2, Z2SoundHandles * Z2SoundHandles::stopAllSounds(): ok * Z2SoundHandles::getHandleUserData(): ok * Z2SoundInfo: header * Z2SoundObjBase::framework(): ok * Z2SoundObjBase::Z2SoundObjBase(), Z2SoundObjBase::init(): ok * Z2SoundObjBase::~Z2SoundObjBase(): ok * Z2SoundObjBase::stopOK(): ok * Z2SoundObjBase::stopOK, incomplete Z2SoundObjBase::dispose() * clang-format * Z2SoundObjBase::dispose(): ok * JAISound::operator->(): null assert * JAIAudience: stub * Z2SoundObject::{init, deleteObject, isAlive}: ok * Z2SeMgr: elaborate struct (and decl JAISoundHandles to support this) * start subclassing Z2SoundObjBase; nonmatching Z2SoundObjSimple::init() * Z2SeMGr::{incrCrowdSize, decrCrowdSize}: ok * Z2MultiSeMgr::resetMultiSePos(): ok * Z2WolfHowlMgr.h: decls * Z2SoundStarter: move to decls and fix postprocess.py symbol pass * Z2AudioArcLoader: decls * Z2SoundObjMgr: ok some fns - deleteEnemyAll() - isTwilightBattle() - setGhostEnemyState() additionally elaborates parts of the Z2Creature hierarchy * delete unused .s files and add tool to find them (only runs on linux) * run clang-format * postprocess.py: comment out debugging * add python step to ok-check workflow * address review comments * address review comments Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com> Co-authored-by: Pheenoh <pheenoh@gmail.com> Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>
Diffstat (limited to 'libs/Z2AudioLib/Z2AudioArcLoader.cpp')
-rw-r--r--libs/Z2AudioLib/Z2AudioArcLoader.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/Z2AudioLib/Z2AudioArcLoader.cpp b/libs/Z2AudioLib/Z2AudioArcLoader.cpp
index d0365b297f..eb2b48fd05 100644
--- a/libs/Z2AudioLib/Z2AudioArcLoader.cpp
+++ b/libs/Z2AudioLib/Z2AudioArcLoader.cpp
@@ -1,39 +1,39 @@
/* Z2AudioArcLoader.cpp autogenerated by split.py v0.3 at 2021-01-05 01:13:20.339487 */
-#include "global.h"
+#include "Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h"
extern "C" {
// __ct__16Z2AudioArcLoaderFP10JAUSection
// Z2AudioArcLoader::Z2AudioArcLoader(JAUSection*)
-asm void Z2AudioArcLoader(void) {
+asm Z2AudioArcLoader::Z2AudioArcLoader(JAUSection*) {
nofralloc
#include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A34.s"
}
// readCommandMore__16Z2AudioArcLoaderFUl
// Z2AudioArcLoader::readCommandMore(unsigned long)
-asm void func_802A9A70(void) {
+asm void Z2AudioArcLoader::readCommandMore(u32) {
nofralloc
#include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s"
}
// readBFCA__16Z2AudioArcLoaderFPCv
// Z2AudioArcLoader::readBFCA(const void*)
-asm void Z2AudioArcLoader_NS_readBFCA(void) {
+asm void Z2AudioArcLoader::readBFCA(const void*) {
nofralloc
#include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9AC8.s"
}
// readBSTN__16Z2AudioArcLoaderFPCvUl
// Z2AudioArcLoader::readBSTN(const void*, unsigned long)
-asm void func_802A9B54(void) {
+asm void Z2AudioArcLoader::readBSTN(const void*, u32) {
nofralloc
#include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9B54.s"
}
// __dt__16Z2AudioArcLoaderFv
// Z2AudioArcLoader::~Z2AudioArcLoader(void)
-asm void func_802A9B58(void) {
+asm Z2AudioArcLoader::~Z2AudioArcLoader() {
nofralloc
#include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9B58.s"
}