Skip to content

Z2AudioLib work #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TakaRikka merged 4 commits into from
Mar 22, 2025
Merged

Z2AudioLib work #2339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea2d7f3
Z2LinkMgr work, Z2AudioArcLoader matching
randomsalience Mar 20, 2025
741369b
Z2SeMgr matching
randomsalience Mar 20, 2025
3d05702
Z2SpeechMgr2 almost done, Z2SoundHandles matching
randomsalience Mar 22, 2025
55ae258
Merge branch 'main' into Z2AudioLib
randomsalience Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .clangd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CompileFlags:
Diagnostics:
Suppress:
- "warn_char_constant_too_large"
- "illegal_union_or_anon_struct_member"
---
If:
PathMatch: .*/*.inc
Expand Down
8 changes: 6 additions & 2 deletions config/GZ2E01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2067,7 +2067,7 @@ JSystem/JAudio2/osdsp.cpp:
JSystem/JAudio2/osdsp_task.cpp:
.text start:0x8029EB20 end:0x8029EFAC
.bss start:0x80434060 end:0x80434078
.sbss start:0x80451308 end:0x80451330
.sbss start:0x80451308 end:0x80451310

JSystem/JAudio2/JAIAudible.cpp:
.text start:0x8029EFAC end:0x8029EFF4
Expand All @@ -2087,6 +2087,7 @@ JSystem/JAudio2/JAISeMgr.cpp:
.rodata start:0x8039B8F8 end:0x8039B910
.data start:0x803C98B0 end:0x803C98D8
.bss start:0x80434078 end:0x80434098
.sbss start:0x80451310 end:0x80451320
.sdata2 start:0x80455788 end:0x80455798

JSystem/JAudio2/JAISeq.cpp:
Expand All @@ -2103,6 +2104,7 @@ JSystem/JAudio2/JAISeqMgr.cpp:
.text start:0x802A1804 end:0x802A2184
.data start:0x803C9958 end:0x803C9970
.bss start:0x804340C0 end:0x804340E0
.sbss start:0x80451320 end:0x80451328
.sdata2 start:0x804557A8 end:0x804557B8

JSystem/JAudio2/JAISound.cpp:
Expand Down Expand Up @@ -2143,6 +2145,7 @@ JSystem/JAudio2/JAIStreamDataMgr.cpp:
JSystem/JAudio2/JAIStreamMgr.cpp:
.text start:0x802A3B68 end:0x802A4244
.bss start:0x804340F0 end:0x80434110
.sbss start:0x80451328 end:0x80451330
.sdata2 start:0x80455800 end:0x80455810

JSystem/JAudio2/JAUAudioArcInterpreter.cpp:
Expand Down Expand Up @@ -2216,7 +2219,7 @@ Z2AudioLib/Z2Calc.cpp:

Z2AudioLib/Z2Param.cpp:
.sdata start:0x804507D8 end:0x80450870
.sbss start:0x80451338 end:0x80451350
.sbss start:0x80451338 end:0x80451348

Z2AudioLib/Z2AudioArcLoader.cpp:
.text start:0x802A9A34 end:0x802A9B58
Expand All @@ -2238,6 +2241,7 @@ Z2AudioLib/Z2SoundStarter.cpp:
Z2AudioLib/Z2SoundHandles.cpp:
.text start:0x802AB07C end:0x802AB64C
.bss start:0x804341B8 end:0x804341D8
.sbss start:0x80451348 end:0x80451350

Z2AudioLib/Z2SeMgr.cpp:
.text start:0x802AB64C end:0x802AEEA0
Expand Down
14 changes: 7 additions & 7 deletions config/GZ2E01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21177,10 +21177,10 @@ memPool_$localstatic3$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .bss:0x80434
@896 = .bss:0x804340A4; // type:object size:0xC scope:local align:4
memPool_$localstatic3$getMemPool___35JASPoolAllocObject<13JAISoundChild>Fv = .bss:0x804340B0; // type:object size:0x10 scope:local align:4
@715 = .bss:0x804340C0; // type:object size:0xC scope:local align:4
memPool_$localstatic3$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .bss:0x804340CC; // type:object size:0x10 scope:local align:4
memPool_$localstatic3$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .bss:0x804340CC; // type:object size:0x10 scope:weak align:4
@881 = .bss:0x804340E0; // type:object size:0xC scope:local align:4
@745 = .bss:0x804340F0; // type:object size:0xC scope:local align:4
memPool_$localstatic3$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .bss:0x804340FC; // type:object size:0x10 scope:local align:4
memPool_$localstatic3$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .bss:0x804340FC; // type:object size:0x10 scope:weak align:4
...bss.0 = .bss:0x80434110; // type:label scope:local
@757 = .bss:0x80434110; // type:object size:0xC scope:local align:4
@763 = .bss:0x8043411C; // type:object size:0xC scope:local align:4
Expand All @@ -21189,7 +21189,7 @@ memPool_$localstatic3$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .bss:0x8
@863 = .bss:0x80434140; // type:object size:0xC scope:local align:4
@867 = .bss:0x8043414C; // type:object size:0xC scope:local align:4
@632 = .bss:0x804341B8; // type:object size:0xC scope:local align:4
memPool_$localstatic3$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .bss:0x804341C4; // type:object size:0x10 scope:local align:4
memPool_$localstatic3$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .bss:0x804341C4; // type:object size:0x10 scope:weak align:4
@1539 = .bss:0x804341D8; // type:object size:0xC scope:local align:4
memPool_$localstatic3$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .bss:0x804341E4; // type:object size:0x10 scope:local align:4
...bss.0 = .bss:0x804341F8; // type:label scope:local
Expand Down Expand Up @@ -21509,7 +21509,7 @@ sStickHigh = .sdata:0x80450898; // type:object size:0x4 scope:global align:4 dat
sStickCenter = .sdata:0x8045089C; // type:object size:0x4 scope:global align:4 data:float
sHowlTobikusa = .sdata:0x804508A0; // type:object size:0x8 scope:global align:4
cm2hw$539 = .sdata:0x804508A8; // type:object size:0x4 scope:local align:4
data_804508B0 = .sdata:0x804508B0; // type:object size:0x8 scope:global align:4 data:byte
data_804508B0 = .sdata:0x804508B0; // type:object size:0x1 scope:global align:4 data:byte
sSZSBufferSize__7JKRAram = .sdata:0x804508B8; // type:object size:0x4 scope:global align:4 data:4byte
rootPath$2498 = .sdata:0x804508C0; // type:object size:0x2 scope:local align:4 data:string
errorRetry = .sdata:0x804508C8; // type:object size:0x1 scope:local align:1 data:byte
Expand Down Expand Up @@ -22087,8 +22087,8 @@ struct_80451309 = .sbss:0x80451309; // type:object size:0x1 scope:local align:1
DSP_prior_task = .sbss:0x8045130C; // type:object size:0x4 scope:global align:4 data:4byte
data_80451310 = .sbss:0x80451310; // type:object size:0x8 scope:global align:4 data:byte
data_80451318 = .sbss:0x80451318; // type:object size:0x8 scope:global align:4 data:byte
data_80451320 = .sbss:0x80451320; // type:object size:0x8 scope:global align:4 data:byte
data_80451328 = .sbss:0x80451328; // type:object size:0x8 scope:global align:4 data:byte
init$localstatic4$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .sbss:0x80451320; // type:object size:0x1 scope:global align:1 data:byte
init$localstatic4$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .sbss:0x80451328; // type:object size:0x1 scope:global align:1 data:byte
init$80 = .sbss:0x80451330; // type:object size:0x1 scope:local align:1 data:byte
oRandom$401 = .sbss:0x80451334; // type:object size:0x4 scope:local align:4 data:4byte
MIN_DISTANCE_VOLUME__7Z2Param = .sbss:0x80451338; // type:object size:0x4 scope:global align:4 data:float
Expand All @@ -22097,7 +22097,7 @@ struct_80451340 = .sbss:0x80451340; // type:object size:0x1 scope:global align:1
struct_80451341 = .sbss:0x80451341; // type:object size:0x1 scope:global align:1 data:byte
struct_80451342 = .sbss:0x80451342; // type:object size:0x1 scope:global align:1 data:byte
pad_80451344 = .sbss:0x80451344; // type:object size:0x4 scope:global align:4
data_80451348 = .sbss:0x80451348; // type:object size:0x8 scope:global align:4 data:byte
init$localstatic4$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .sbss:0x80451348; // type:object size:0x1 scope:global align:1 data:byte
cNearFarRatio = .sbss:0x80451350; // type:object size:0x4 scope:local align:4 data:float
data_80451354 = .sbss:0x80451354; // type:object size:0x4 scope:global align:4 data:byte
data_80451358 = .sbss:0x80451358; // type:object size:0x1 scope:global align:1 data:byte
Expand Down
24 changes: 12 additions & 12 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ def MatchingFor(*versions):
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASProbe.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASReport.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASCmdStack.cpp"),
Object(NonMatching, "JSystem/JAudio2/JASTrack.cpp"),
Object(NonMatching, "JSystem/JAudio2/JASTrack.cpp", extra_cflags=['-pragma "nosyminline off"']),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASTrackPort.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASRegisterParam.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASSeqCtrl.cpp"),
Expand All @@ -840,7 +840,7 @@ def MatchingFor(*versions):
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASWSParser.cpp"),
Object(NonMatching, "JSystem/JAudio2/JASBNKParser.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASWaveArcLoader.cpp", extra_cflags=['-pragma "nosyminline off"']),
Object(NonMatching, "JSystem/JAudio2/JASChannel.cpp", extra_cflags=['-pragma "nosyminline off"']),
Object(Equivalent, "JSystem/JAudio2/JASChannel.cpp", extra_cflags=['-pragma "nosyminline off"']), # bss locations
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASLfo.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASOscillator.cpp"),
Object(NonMatching, "JSystem/JAudio2/JASAiCtrl.cpp"),
Expand All @@ -857,25 +857,25 @@ def MatchingFor(*versions):
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIAudible.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIAudience.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISe.cpp"),
Object(NonMatching, "JSystem/JAudio2/JAISeMgr.cpp"),
Object(NonMatching, "JSystem/JAudio2/JAISeq.cpp"),
Object(Equivalent, "JSystem/JAudio2/JAISeMgr.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak function order
Object(Equivalent, "JSystem/JAudio2/JAISeq.cpp", extra_cflags=['-pragma "nosyminline off"']), # bss locations
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeqDataMgr.cpp"),
Object(NonMatching, "JSystem/JAudio2/JAISeqMgr.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeqMgr.cpp", extra_cflags=['-pragma "nosyminline off"']),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISound.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundChild.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundHandles.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundInfo.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundParams.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundStarter.cpp"),
Object(NonMatching, "JSystem/JAudio2/JAIStream.cpp", extra_cflags=["-sym off"]),
Object(Equivalent, "JSystem/JAudio2/JAIStream.cpp", extra_cflags=['-pragma "nosyminline off"']), # bss locations
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStreamDataMgr.cpp"),
Object(NonMatching, "JSystem/JAudio2/JAIStreamMgr.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStreamMgr.cpp", extra_cflags=['-pragma "nosyminline off"']),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUAudioArcInterpreter.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUAudioArcLoader.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUAudioMgr.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUBankTable.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUClusterSound.cpp"),
Object(NonMatching, "JSystem/JAudio2/JAUInitializer.cpp"),
Object(Equivalent, "JSystem/JAudio2/JAUInitializer.cpp", extra_cflags=['-pragma "nosyminline off"']), # bss locations
Object(NonMatching, "JSystem/JAudio2/JAUSectionHeap.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUSeqCollection.cpp"),
Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUSeqDataBlockMgr.cpp"),
Expand All @@ -902,12 +902,12 @@ def MatchingFor(*versions):
"host": True,
"objects": [
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2Calc.cpp"),
Object(NonMatching, "Z2AudioLib/Z2AudioArcLoader.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2AudioArcLoader.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2Param.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundMgr.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundStarter.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SoundHandles.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SeMgr.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundHandles.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SeMgr.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SeqMgr.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2StatusMgr.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SceneMgr.cpp"),
Expand All @@ -917,7 +917,7 @@ def MatchingFor(*versions):
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundObject.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundObjMgr.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2Creature.cpp"),
Object(NonMatching, "Z2AudioLib/Z2LinkMgr.cpp"),
Object(NonMatching, "Z2AudioLib/Z2LinkMgr.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "Z2AudioLib/Z2EnvSeMgr.cpp"),
Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2WolfHowlMgr.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SpeechMgr2.cpp"),
Expand Down
7 changes: 6 additions & 1 deletion include/JSystem/JAudio2/JAISeMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ class JAISeCategoryMgr : public JAISeqDataUser {
/* 8029FE78 */ void stopSoundID(JAISoundID);
/* 8029FEEC */ void pause(bool);
/* 8029FF18 */ void JAISeMgr_mixOut_(JAISoundParamsMove const&, JAISoundActivity);
/* 802A0994 */ JAISeCategoryMgr();
/* 802A0994 */ JAISeCategoryMgr() {
mParams.init();
mMaxActiveSe = 0;
mMaxInactiveSe = 0;
field_0x4.field_0x0 = 0;
}

/* 800078DC */ virtual ~JAISeCategoryMgr() {}
/* 8029F8B0 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
Expand Down
8 changes: 4 additions & 4 deletions include/JSystem/JAudio2/JASHeapCtrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,23 +241,23 @@ template <typename T>
class JASPoolAllocObject {
public:
static void* operator new(size_t n) {
JASMemPool<T>* memPool = getMemPool();
JASMemPool<T>* memPool = getMemPool_();
return memPool->alloc(sizeof(T));
}
static void* operator new(size_t n, void* ptr) {
return ptr;
}
static void operator delete(void* ptr, size_t n) {
JASMemPool<T>* memPool_ = getMemPool();
JASMemPool<T>* memPool_ = getMemPool_();
memPool_->free(ptr, sizeof(T));
}
static void newMemPool(int param_0) {
JASMemPool<T>* memPool_ = getMemPool();
JASMemPool<T>* memPool_ = getMemPool_();
memPool_->newMemPool(param_0);
}

private:
static JASMemPool<T>* getMemPool() {
static JASMemPool<T>* getMemPool_() {
static JASMemPool<T> memPool_;
return &memPool_;
}
Expand Down
12 changes: 11 additions & 1 deletion include/JSystem/JAudio2/JASTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,17 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
/* 0x000 */ JASSeqCtrl mSeqCtrl;
/* 0x05C */ JASTrackPort mTrackPort;
/* 0x080 */ JASRegisterParam mRegisterParam;
/* 0x09C */ MoveParam_ mMoveParam[6]; // volume, pitch, fxmix, pan, dolby, distFilter
/* 0x09C */ union {
struct {
MoveParam_ volume;
MoveParam_ pitch;
MoveParam_ fxmix;
MoveParam_ pan;
MoveParam_ dolby;
MoveParam_ distFilter;
} params;
MoveParam_ array[6];
} mMoveParam;
/* 0x0e4 */ JASOscillator::Data mOscParam[2];
/* 0x114 */ JASOscillator::Point mOscPoint[4];
/* 0x12C */ JASTrack* mParent;
Expand Down
3 changes: 3 additions & 0 deletions include/JSystem/JGadget/linklist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ struct TLinkListNode {

struct TNodeLinkList {
struct iterator {
iterator() { node = NULL; }
explicit iterator(TLinkListNode* pNode) { node = pNode; }
iterator& operator=(const iterator& other) { node = other.node; return *this; }

iterator& operator++() { node = node->getNext(); return *this; }
iterator& operator--() { node = node->getPrev(); return *this; }
Expand Down Expand Up @@ -117,6 +119,7 @@ struct TLinkList : public TNodeLinkList {
TLinkList() : TNodeLinkList() {}

struct iterator {
iterator() {}
explicit iterator(TNodeLinkList::iterator iter) : base(iter) {}

iterator& operator++() {
Expand Down
7 changes: 6 additions & 1 deletion include/JSystem/JKernel/JKRArchive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@ inline bool JKRRemoveResource(void* resource, JKRFileLoader* fileLoader) {
return JKRFileLoader::removeResource(resource, fileLoader);
}

inline JKRArchive* JKRMountArchive(void* ptr, JKRHeap* heap,
JKRArchive::EMountDirection mountDirection) {
return JKRArchive::mount(ptr, heap, mountDirection);
}

inline void JKRUnmountArchive(JKRArchive* arc) {
arc->unmount();
}
Expand All @@ -246,4 +251,4 @@ inline void JKRReadIdxResource(void* param_1, u32 param_2, u32 param_3, JKRArchi
param_4->readIdxResource(param_1, param_2, param_3);
}

#endif
#endif
2 changes: 1 addition & 1 deletion include/JSystem/JMath/JMath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ void JMAVECScaleAdd(register const Vec* vec1, register const Vec* vec2, register
register f32 scale);

inline int JMAAbs(int value) {
return (value >> 0x1f ^ value) - (value >> 0x1f);
return value > 0 ? value : -value;
}

inline f32 JMAFastReciprocal(f32 value) {
Expand Down
2 changes: 1 addition & 1 deletion include/JSystem/JMath/random.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct TRandom_fast_ {

u32 get_bit32(void) { return this->get(); }

s8 get_uint8(u8 param_0) {
u8 get_uint8(u8 param_0) {
return get_ufloat_1() * param_0;
}

Expand Down
Loading