mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-13 20:24:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Z2AudioLib misc decomp (#75)

Browse Source 
* 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>
This commit is contained in:
Erin Moon
2021-01-21 22:16:51 -06:00
committed by GitHub
parent afb426c60c
commit a072e71c33
595 changed files with 1228 additions and 9009 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/Z2AudioLib/Z2SpeechMgr2.cpp
+18 -6
View File
@@ -1,19 +1,31 @@
/* Z2SpeechMgr2.cpp autogenerated by split.py v0.3 at 2021-01-04 22:38:34.026034 */
#include "JSystem/JMath/random.h"
#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
#include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "global.h"
extern "C" {
// __ct__12Z2SpeechMgr2Fv
// Z2SpeechMgr2::Z2SpeechMgr2(void)
asm void Z2SpeechMgr2_NS_ctor(void) {
#ifdef NONMATCHING
Z2SpeechMgr2::Z2SpeechMgr2()
: mSound(NULL), field_0x4(0), mRandom(0), mSpeechStarter(), field_0x3f8(0), mTextCount(-1),
field_0x3fc(0), field_0x3fe(0), field_0x3ff(0), field_0x401(0) {
// lbl_80450B70 = this;
// this->sound = NULL;
// this->field_0x4 = 0;
// this->random
for (int i = 0; i < 0x40; i++)
this->field_0x402[i] = -1;
}
#else
asm Z2SpeechMgr2::Z2SpeechMgr2() {
nofralloc
#include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s"
}
#endif
extern "C" {
// __dt__15Z2SpeechStarterFv
// Z2SpeechStarter::~Z2SpeechStarter(void)
asm void func_802CBCEC(void) {
@@ -86,7 +98,7 @@ asm void Z2SpeechMgr2_NS_isMidnaSpeak(void) {
// __ct__15Z2SpeechStarterFv
// Z2SpeechStarter::Z2SpeechStarter(void)
asm void Z2SpeechStarter(void) {
asm Z2SpeechStarter::Z2SpeechStarter(void) {
nofralloc
#include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s"
}