encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07: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 23:16:51 -05:00
committed by GitHub
co-authored by Pheenoh notyourav
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/JSystem/JAudio2/JAUClusterSound.cpp
+6 -2
View File
@@ -1,5 +1,9 @@
#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
#include "JSystem/JAudio2/JAISound/JAISound.h"
//! @meme: mwcc normally inlines this, but drops it this TU because it's the
//! first place we need a ref to this ctor.
//! @todo: eventually move this into JAISound.h once this file is decomped.
JAISoundHandle::JAISoundHandle() {
this->unk = NULL;
}
mSound = NULL;
}
libs/Z2AudioLib/Z2Audience.cpp
+1
View File
@@ -1,5 +1,6 @@
/* Z2Audience.cpp autogenerated by split.py v0.3 at 2021-01-04 22:46:19.894499 */
#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
#include "global.h"
extern "C" {
libs/Z2AudioLib/Z2AudioArcLoader.cpp
+6 -6
View File
@@ -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"
}
libs/Z2AudioLib/Z2AudioMgr.cpp
+1
View File
@@ -1,6 +1,7 @@
/* Z2AudioMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 23:11:48.333955 */
#include "Z2AudioLib/Z2Param/Z2Param.h"
#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
#include "global.h"
extern "C" {
libs/Z2AudioLib/Z2Creature.cpp
+4 -1
View File
@@ -1,14 +1,17 @@
/* Z2Creature.cpp autogenerated by split.py v0.3 at 2021-01-04 23:26:27.773541 */
#include "Z2AudioLib/Z2Creature/Z2Creature.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "global.h"
extern "C" {
// __ct__10Z2CreatureFv
// Z2Creature::Z2Creature(void)
asm void Z2Creature(void) {
asm Z2Creature::Z2Creature(void) {
nofralloc
#include "Z2AudioLib/Z2Creature/asm/func_802C03C8.s"
}
libs/Z2AudioLib/Z2EnvSeMgr.cpp
+1
View File
@@ -2,6 +2,7 @@
#include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
libs/Z2AudioLib/Z2LinkMgr.cpp
+2
View File
@@ -1,5 +1,7 @@
#include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
libs/Z2AudioLib/Z2SceneMgr.cpp
+3 -1
View File
@@ -1,6 +1,7 @@
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
#include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
@@ -117,8 +118,9 @@ asm void Z2SceneMgr::setSceneName(char* stageName, long roomNum, long layerNum){
#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s"
}
//! @meme this looks to be non-inlined here because @ref setSceneName is too large
JAISoundID::JAISoundID(JAISoundID const& soundIdToSet) {
this->soundId = soundIdToSet.soundId;
mId = soundIdToSet.mId;
return;
}
libs/Z2AudioLib/Z2SeMgr.cpp
+25 -10
View File
@@ -1,4 +1,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
extern "C" {
@@ -32,14 +35,20 @@ asm void Z2SeMgr::modHeightAtCamera(Vec const** param1) {
#include "Z2AudioLib/Z2SeMgr/asm/func_802AB830.s"
}
asm void Z2SeMgr::incrCrowdSize(void) {
nofralloc
#include "Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s"
void Z2SeMgr::incrCrowdSize(void) {
mCrowdSize++;
if (mCrowdSize > 100)
mCrowdSize = 100;
}
asm void Z2SeMgr::decrCrowdSize(void) {
nofralloc
#include "Z2AudioLib/Z2SeMgr/asm/func_802AB960.s"
void Z2SeMgr::decrCrowdSize(void) {
mCrowdSize--;
//! @bug probably copypasta from incrCrowdSize(), but semantically it's still correct:
//! mCrowdSize is a u8, so an underflow would result in mCrowdSize > 100, triggering the clamp.
if (mCrowdSize > 100)
mCrowdSize = 0;
}
asm void Z2SeMgr::seStart(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8) {
@@ -127,9 +136,15 @@ asm u32 Z2MultiSeMgr::registMultiSePos(Vec*) {
#include "Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s"
}
asm void Z2MultiSeMgr::resetMultiSePos(void) {
nofralloc
#include "Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s"
void Z2MultiSeMgr::resetMultiSePos(void) {
field_0x18 = -1;
// @todo fix when we have proper const placement
f32 zero = /* 0.0f */ lbl_80455878;
field_0x8 = zero;
this->field_0xc = zero;
this->field_0x10 = zero;
this->field_0x14 = zero;
this->field_0x4 = zero;
}
asm float Z2MultiSeMgr::getPanPower(void) {
@@ -140,4 +155,4 @@ asm float Z2MultiSeMgr::getPanPower(void) {
asm float Z2MultiSeMgr::getDolbyPower(void) {
nofralloc
#include "Z2AudioLib/Z2SeMgr/asm/func_802AEDC0.s"
}
}
libs/Z2AudioLib/Z2SeqMgr.cpp
+3 -1
View File
@@ -1,4 +1,6 @@
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
asm Z2SeqMgr::Z2SeqMgr(void) {
@@ -178,7 +180,7 @@ asm void Z2SeqMgr_NS_setBattleDistIgnore(void) {
// setBattleGhostMute__8Z2SeqMgrFb
// Z2SeqMgr::setBattleGhostMute(bool)
asm void Z2SeqMgr_NS_setBattleGhostMute(void) {
asm void Z2SeqMgr::setBattleGhostMute(bool) {
nofralloc
#include "Z2AudioLib/Z2SeqMgr/asm/func_802B43E0.s"
}
libs/Z2AudioLib/Z2SoundHandles.cpp
+57 -39
View File
@@ -1,57 +1,63 @@
/* Z2SoundHandles.cpp autogenerated by split.py v0.3 at 2021-01-05 01:21:30.657620 */
#include "Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h"
#include "global.h"
extern "C" {
// __ct__14Z2SoundHandlesFv
// Z2SoundHandles::Z2SoundHandles(void)
asm void Z2SoundHandles(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s"
Z2SoundHandles::Z2SoundHandles() {
mNumHandles = 0;
}
// __dt__14Z2SoundHandlesFv
// Z2SoundHandles::~Z2SoundHandles(void)
asm void Z2SoundHandles_NS_dtor(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s"
Z2SoundHandles::~Z2SoundHandles() {
deleteHandlesPool();
}
// initHandlesPool__14Z2SoundHandlesFUc
// Z2SoundHandles::initHandlesPool(unsigned char)
asm void Z2SoundHandles_NS_initHandlesPool(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s"
void Z2SoundHandles::initHandlesPool(u8 pNumHandles) {
mNumHandles = pNumHandles;
}
// deleteHandlesPool__14Z2SoundHandlesFv
// Z2SoundHandles::deleteHandlesPool(void)
asm void Z2SoundHandles_NS_deleteHandlesPool(void) {
asm void Z2SoundHandles::deleteHandlesPool() {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s"
}
extern "C" {
// __dt__31JASMemPool<17Z2SoundHandlePool>Fv
// JASMemPool<17Z2SoundHandlePool>::~JASMemPool<17Z2SoundHandlePool>(void)
asm void JASMemPool_NS_dtor_X4_(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB200.s"
}
};
// getHandleSoundID__14Z2SoundHandlesF10JAISoundID
// Z2SoundHandles::getHandleSoundID(JAISoundID)
asm void Z2SoundHandles_NS_getHandleSoundID(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s"
JAISoundHandle* Z2SoundHandles::getHandleSoundID(JAISoundID pSoundId) {
JSULink<Z2SoundHandlePool>* link;
for (link = this->getFirst(); link != NULL; link = link->getNext()) {
JAISoundHandle* handle = link->getObject();
if (handle->isSoundAttached()) {
if ((*handle)->getID() == pSoundId) {
return handle;
}
}
}
return NULL;
}
// getHandleUserData__14Z2SoundHandlesFUl
// Z2SoundHandles::getHandleUserData(unsigned long)
asm void Z2SoundHandles_NS_getHandleUserData(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s"
JAISoundHandle* Z2SoundHandles::getHandleUserData(u32 pUserData) {
JSULink<Z2SoundHandlePool>* link;
for (link = this->getFirst(); link != NULL; link = link->getNext()) {
JAISoundHandle* handle = link->getObject();
if (handle->isSoundAttached()) {
if ((*handle)->getUserData() == pUserData) {
return handle;
}
}
}
return NULL;
}
extern "C" {
// getFreeHandle__14Z2SoundHandlesFv
// Z2SoundHandles::getFreeHandle(void)
asm void Z2SoundHandles_NS_getFreeHandle(void) {
@@ -65,25 +71,37 @@ asm void Z2SoundHandles_NS_getLowPrioSound(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB3D0.s"
}
};
// stopAllSounds__14Z2SoundHandlesFUl
// Z2SoundHandles::stopAllSounds(unsigned long)
asm void Z2SoundHandles_NS_stopAllSounds(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s"
void Z2SoundHandles::stopAllSounds(u32 fadeout) {
JSULink<Z2SoundHandlePool>* link;
for (link = this->getFirst(); link != NULL; link = link->getNext()) {
JAISoundHandle* handle = link->getObject();
//! @meme: explicit operator bool call required to match and be similar
//! to CHN_debug; could more concisely write handle->isSoundAttached
//! (for some reason cast-to-bool doesn't work?)
if (handle && handle->operator bool()) {
(*handle)->stop(fadeout);
}
}
}
// isActive__14Z2SoundHandlesCFv
// Z2SoundHandles::isActive(void) const
asm void Z2SoundHandles_NS_isActive(void) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s"
bool Z2SoundHandles::isActive() const {
JSULink<Z2SoundHandlePool>* link;
for (link = this->getFirst(); link != NULL; link = link->getNext()) {
if (link->getObject()->isSoundAttached()) {
return true;
}
}
return false;
}
// setPos__14Z2SoundHandlesFRCQ29JGeometry8TVec3<f>
// Z2SoundHandles::setPos(JGeometry::TVec3<f>)
asm void Z2SoundHandles_NS_setPos(void) {
asm void Z2SoundHandles::setPos(const JGeometry::TVec3<f32>& pos) {
nofralloc
#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s"
}
};
libs/Z2AudioLib/Z2SoundInfo.cpp
+6 -2
View File
@@ -1,16 +1,18 @@
/* Z2SoundInfo.cpp autogenerated by split.py v0.3 at 2021-01-05 00:36:00.060978 */
#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
#include "dvd/dvd.h"
#include "global.h"
extern "C" {
// getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID
// Z2SoundInfo::getBgmSeqResourceID(JAISoundID) const
asm void Z2SoundInfo_NS_getBgmSeqResourceID(void) {
asm u32 Z2SoundInfo::getBgmSeqResourceID(JAISoundID) const {
nofralloc
#include "Z2AudioLib/Z2SoundInfo/asm/func_802BB00C.s"
}
// @todo thunk
// getSoundType__11Z2SoundInfoCF10JAISoundID
// Z2SoundInfo::getSoundType(JAISoundID) const
asm void func_802BB090(void) {
@@ -80,14 +82,16 @@ asm void Z2SoundInfo_NS_getStreamFileEntry(void) {
nofralloc
#include "Z2AudioLib/Z2SoundInfo/asm/func_802BBA88.s"
}
};
// getSwBit__11Z2SoundInfoCF10JAISoundID
// Z2SoundInfo::getSwBit(JAISoundID) const
asm void Z2SoundInfo_NS_getSwBit(void) {
asm u32 Z2SoundInfo::getSwBit(JAISoundID) const {
nofralloc
#include "Z2AudioLib/Z2SoundInfo/asm/func_802BBAC8.s"
}
extern "C" {
// getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound
// Z2SoundInfo::getSoundInfo_(JAISoundID, JAISound*) const
asm void Z2SoundInfo_NS_getSoundInfo_(void) {
libs/Z2AudioLib/Z2SoundMgr.cpp
+2
View File
@@ -3,6 +3,8 @@
#include "Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
#include "global.h"
extern "C" {
libs/Z2AudioLib/Z2SoundObjMgr.cpp
+48 -22
View File
@@ -1,19 +1,28 @@
/* Z2SoundObjMgr.cpp autogenerated by split.py v0.3 at 2021-01-05 00:01:40.089663 */
#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "global.h"
extern "C" {
// __ct__13Z2SoundObjMgrFv
// Z2SoundObjMgr::Z2SoundObjMgr(void)
asm void Z2SoundObjMgr_NS_ctor(void) {
#ifdef NONMATCHING
// order wrong because this needs to inherit from JASGlobalInstance<T>
Z2SoundObjMgr::Z2SoundObjMgr() {
lbl_80450B48 = this;
field_0x19 = 0;
this->mIsTwilightBattle = false;
this->setBattleInit();
this->setForceBattleArea(false, 700, 1100, 1500);
}
#else
asm Z2SoundObjMgr::Z2SoundObjMgr() {
nofralloc
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s"
}
#endif
extern "C" {
// setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
// Z2SoundObjMgr::setForceBattleArea(bool, unsigned short, unsigned short, unsigned short)
asm void Z2SoundObjMgr_NS_setForceBattleArea(void) {
asm void Z2SoundObjMgr::setForceBattleArea(bool, u16, u16, u16) {
nofralloc
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BF980.s"
}
@@ -25,11 +34,19 @@ asm void Z2SoundObjMgr_NS_searchEnemy(void) {
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s"
}
// setGhostEnemyState__13Z2SoundObjMgrFUc
// Z2SoundObjMgr::setGhostEnemyState(unsigned char)
asm void Z2SoundObjMgr_NS_setGhostEnemyState(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s"
void Z2SoundObjMgr::setGhostEnemyState(u8 p1) {
if (p1 == 0x20) {
if (field_0x1a >= field_0x16) {
lbl_80450B84->setBattleGhostMute(true);
}
} else {
if (this->field_0x1a == false) {
this->field_0x19 = 0;
return;
}
}
this->field_0x19 = p1 + (this->field_0x19 & 1);
}
// getEnemyID__13Z2SoundObjMgrFPCcP26JSULink<15Z2CreatureEnemy>
@@ -41,7 +58,7 @@ asm void Z2SoundObjMgr_NS_getEnemyID(void) {
// setBattleInit__13Z2SoundObjMgrFv
// Z2SoundObjMgr::setBattleInit(void)
asm void Z2SoundObjMgr_NS_setBattleInit(void) {
asm void Z2SoundObjMgr::setBattleInit() {
nofralloc
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C0100.s"
}
@@ -53,11 +70,21 @@ asm void Z2SoundObjMgr_NS_checkBattleFinish(void) {
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C0120.s"
}
// deleteEnemyAll__13Z2SoundObjMgrFv
// Z2SoundObjMgr::deleteEnemyAll(void)
asm void Z2SoundObjMgr_NS_deleteEnemyAll(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s"
void Z2SoundObjMgr::deleteEnemyAll() {
JSULink<Z2CreatureEnemy>* link;
// not moving the link pointer forward looks like a bug, but deleteObject() actually unlinks the
// enemy from its owning list
while (link = this->getFirst(), link != NULL) {
Z2CreatureEnemy* enemy = link->getObject();
if (enemy == NULL) {
// setWarningMessage_f((JUTAssertion *)0x1,(ulong)"Z2SoundObjMgr.cpp",(char
// *)0x16f,(int)&*fill*,
// "[Z2SoundObjMgr::searchEnemy] remain remove enemy\n",in_r8);
} else {
enemy->deleteObject();
}
}
}
// removeEnemy__13Z2SoundObjMgrFP26JSULink<15Z2CreatureEnemy>
@@ -66,14 +93,13 @@ asm void Z2SoundObjMgr_NS_removeEnemy(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C0190.s"
}
};
// isTwilightBattle__13Z2SoundObjMgrFv
// Z2SoundObjMgr::isTwilightBattle(void)
asm void Z2SoundObjMgr_NS_isTwilightBattle(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s"
bool Z2SoundObjMgr::isTwilightBattle() {
return mTwilightBattle;
}
extern "C" {
// __sinit_Z2SoundObjMgr_cpp
//
asm void func_802C01EC(void) {
libs/Z2AudioLib/Z2SoundObject.cpp
+71 -52
View File
@@ -1,58 +1,65 @@
/* Z2SoundObject.cpp autogenerated by split.py v0.3 at 2021-01-04 23:48:52.467160 */
#include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "global.h"
#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
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;
}
Z2SoundObjBase::~Z2SoundObjBase() {
deleteObject();
}
void Z2SoundObjBase::init(Vec* pSoundPos, u8 pNumHandles) {
initHandlesPool(pNumHandles);
mSoundPos = pSoundPos;
mIsInitialized = true;
}
void Z2SoundObjBase::deleteObject() {
this->dispose();
this->deleteHandlesPool();
}
void Z2SoundObjBase::framework(u32 p1, s8 p2) {
if (mIsInitialized) {
this->field_0x1c = p1;
this->field_0x1e = p2;
this->setPos(*(JGeometry::TVec3<f32>*)this->mSoundPos);
}
}
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;
}
bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& pSoundHandlePool) {
return !(lbl_80450B4C->getSwBit(pSoundHandlePool->getID()) & 0x8000);
}
extern "C" {
// __ct__14Z2SoundObjBaseFv
// Z2SoundObjBase::Z2SoundObjBase(void)
asm void Z2SoundObjBase_NS_ctor(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s"
}
// __dt__14Z2SoundObjBaseFv
// Z2SoundObjBase::~Z2SoundObjBase(void)
asm void Z2SoundObjBase_NS_dtor(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s"
}
// init__14Z2SoundObjBaseFP3VecUc
// Z2SoundObjBase::init(Vec*, unsigned char)
asm void Z2SoundObjBase_NS_init(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s"
}
// deleteObject__14Z2SoundObjBaseFv
// Z2SoundObjBase::deleteObject(void)
asm void Z2SoundObjBase_NS_deleteObject(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s"
}
// framework__14Z2SoundObjBaseFUlSc
// Z2SoundObjBase::framework(unsigned long, char)
asm void Z2SoundObjBase_NS_framework(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BE038.s"
}
// dispose__14Z2SoundObjBaseFv
// Z2SoundObjBase::dispose(void)
asm void func_802BE070(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BE070.s"
}
// stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool
// Z2SoundObjBase::stopOK(Z2SoundHandlePool&)
asm void func_802BE104(void) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BE104.s"
}
// startSound__14Z2SoundObjBaseF10JAISoundIDUlSc
// Z2SoundObjBase::startSound(JAISoundID, unsigned long, char)
asm void Z2SoundObjBase_NS_startSound(void) {
@@ -90,7 +97,7 @@ asm void func_802BE5FC(void) {
// init__21Z2DopplerSoundObjBaseFP3VecUc
// Z2DopplerSoundObjBase::init(Vec*, unsigned char)
asm void func_802BE65C(void) {
asm void init__21Z2DopplerSoundObjBaseFP3VecUc(Vec* pSoundPos, u8 pNumHandles) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s"
}
@@ -123,12 +130,24 @@ asm void Z2SoundObjSimple(void) {
#include "Z2AudioLib/Z2SoundObject/asm/func_802BE844.s"
}
#ifdef NONMATCHING
// init__16Z2SoundObjSimpleFP3VecUc
// Z2SoundObjSimple::init(Vec*, unsigned char)
asm void func_802BE880(void) {
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);
}
#else
asm void Z2SoundObjSimple::init(Vec* pSoundPos, u8 pNumHandles) {
nofralloc
#include "Z2AudioLib/Z2SoundObject/asm/func_802BE880.s"
}
#endif
// startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc
// Z2SoundObjSimple::startSound(JAISoundID, unsigned long, char)
libs/Z2AudioLib/Z2SoundStarter.cpp
+8 -6
View File
@@ -1,5 +1,6 @@
/* Z2SoundStarter.cpp autogenerated by split.py v0.3 at 2021-01-04 23:38:28.244752 */
#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
#include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "global.h"
@@ -7,14 +8,14 @@
extern "C" {
// __ct__14Z2SoundStarterFb
// Z2SoundStarter::Z2SoundStarter(bool)
asm void Z2SoundStarter_NS_ctor(void) {
asm Z2SoundStarter::Z2SoundStarter(bool) {
nofralloc
#include "Z2AudioLib/Z2SoundStarter/asm/func_802AAB94.s"
}
// startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>
// Z2SoundStarter::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f>)
asm void func_802AABF4(void) {
asm void Z2SoundStarter::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*) {
nofralloc
#include "Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s"
}
@@ -22,28 +23,29 @@ asm void func_802AABF4(void) {
// startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl
// Z2SoundStarter::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f>, unsigned long,
// float, float, float, float, float, unsigned long)
asm void Z2SoundStarter_NS_startSound_X1_(void) {
asm void Z2SoundStarter::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*, u32,
float, float, float, float, float, u32) {
nofralloc
#include "Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s"
}
// setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
// Z2SoundStarter::setPortData(JAISoundHandle*, unsigned long, unsigned short, char)
asm void Z2SoundStarter_NS_setPortData(void) {
asm void Z2SoundStarter::setPortData(JAISoundHandle*, u32, u16, s8) {
nofralloc
#include "Z2AudioLib/Z2SoundStarter/asm/func_802AAEDC.s"
}
// getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc
// Z2SoundStarter::getPortData(JAISoundHandle*, unsigned long, char)
asm void Z2SoundStarter_NS_getPortData(void) {
asm void Z2SoundStarter::getPortData(JAISoundHandle*, u32, s8) {
nofralloc
#include "Z2AudioLib/Z2SoundStarter/asm/func_802AAF74.s"
}
// __dt__14Z2SoundStarterFv
// Z2SoundStarter::~Z2SoundStarter(void)
asm void func_802AAFF0(void) {
asm Z2SoundStarter::~Z2SoundStarter(void) {
nofralloc
#include "Z2AudioLib/Z2SoundStarter/asm/func_802AAFF0.s"
}
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"
}
libs/Z2AudioLib/Z2WolfHowlMgr.cpp
+20 -19
View File
@@ -1,119 +1,120 @@
/* Z2WolfHowlMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 23:43:51.358132 */
#include "global.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "global.h"
#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
#include "Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h"
extern "C" {
// __ct__13Z2WolfHowlMgrFv
// Z2WolfHowlMgr::Z2WolfHowlMgr(void)
asm void Z2WolfHowlMgr(void) {
asm Z2WolfHowlMgr::Z2WolfHowlMgr() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAAC0.s"
}
// resetState__13Z2WolfHowlMgrFv
// Z2WolfHowlMgr::resetState(void)
asm void Z2WolfHowlMgr_NS_resetState(void) {
asm void Z2WolfHowlMgr::resetState() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAB8C.s"
}
// calcVolumeMod__13Z2WolfHowlMgrFf
// Z2WolfHowlMgr::calcVolumeMod(float)
asm void Z2WolfHowlMgr_NS_calcVolumeMod(void) {
asm void Z2WolfHowlMgr::calcVolumeMod(float) {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CABEC.s"
}
// getNowPitch__13Z2WolfHowlMgrFv
// Z2WolfHowlMgr::getNowPitch(void)
asm void Z2WolfHowlMgr_NS_getNowPitch(void) {
asm void Z2WolfHowlMgr::getNowPitch() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACB0.s"
}
// getNowInputValue__13Z2WolfHowlMgrFv
// Z2WolfHowlMgr::getNowInputValue(void)
asm void Z2WolfHowlMgr_NS_getNowInputValue(void) {
asm void Z2WolfHowlMgr::getNowInputValue() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACCC.s"
}
// calcPitchMod__13Z2WolfHowlMgrFff
// Z2WolfHowlMgr::calcPitchMod(float, float)
asm void Z2WolfHowlMgr_NS_calcPitchMod(void) {
asm void Z2WolfHowlMgr::calcPitchMod(float, float) {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s"
}
// startWolfHowlSound__13Z2WolfHowlMgrFffbf
// Z2WolfHowlMgr::startWolfHowlSound(float, float, bool, float)
asm void Z2WolfHowlMgr_NS_startWolfHowlSound(void) {
asm void Z2WolfHowlMgr::startWolfHowlSound(float, float, bool, float) {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s"
}
// setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData
// Z2WolfHowlMgr::setCorrectData(char, Z2WolfHowlData*)
asm void Z2WolfHowlMgr_NS_setCorrectData(void) {
asm void Z2WolfHowlMgr::setCorrectData(s8, Z2WolfHowlData*) {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s"
}
// getCorrectLine__13Z2WolfHowlMgrFUc
// Z2WolfHowlMgr::getCorrectLine(unsigned char)
asm void Z2WolfHowlMgr_NS_getCorrectLine(void) {
asm void Z2WolfHowlMgr::getCorrectLine(u8) {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB320.s"
}
// getCorrectLineNum__13Z2WolfHowlMgrFv
// Z2WolfHowlMgr::getCorrectLineNum(void)
asm void Z2WolfHowlMgr_NS_getCorrectLineNum(void) {
asm void Z2WolfHowlMgr::getCorrectLineNum() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB370.s"
}
// checkLine__13Z2WolfHowlMgrFv
// Z2WolfHowlMgr::checkLine(void)
asm void Z2WolfHowlMgr_NS_checkLine(void) {
asm void Z2WolfHowlMgr::checkLine() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s"
}
// getOnLineNum__13Z2WolfHowlMgrFv
// Z2WolfHowlMgr::getOnLineNum(void)
asm void Z2WolfHowlMgr_NS_getOnLineNum(void) {
asm void Z2WolfHowlMgr::getOnLineNum() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s"
}
// startWindStoneSound__13Z2WolfHowlMgrFScP3Vec
// Z2WolfHowlMgr::startWindStoneSound(char, Vec*)
asm void func_802CB6EC(void) {
asm void Z2WolfHowlMgr::startWindStoneSound(s8, Vec*) {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s"
}
// startGuideMelody__13Z2WolfHowlMgrFb
// Z2WolfHowlMgr::startGuideMelody(bool)
asm void Z2WolfHowlMgr_NS_startGuideMelody(void) {
asm void Z2WolfHowlMgr::startGuideMelody(bool) {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s"
}
// skipCorrectDemo__13Z2WolfHowlMgrFv
// Z2WolfHowlMgr::skipCorrectDemo(void)
asm void Z2WolfHowlMgr_NS_skipCorrectDemo(void) {
asm void Z2WolfHowlMgr::skipCorrectDemo() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB58.s"
}
// __sinit_Z2WolfHowlMgr_cpp
//
asm void func_802CBB7C(void) {
asm void func_802CBB7C() {
nofralloc
#include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB7C.s"
}
};