mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-06 11:47:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_Do_audio

Browse Source
This commit is contained in:
jdflyer
2021-01-21 21:47:28 -07:00
parent 7b97550cee
commit ff7ac962f1
59 changed files with 882 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Z2AudioLib/Z2AudioLib.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef __Z2AUDIOLIB_H
#define __Z2AUDIOLIB_H
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
#include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
#endif
include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h
+24 -3
View File
@@ -1,9 +1,30 @@
#ifndef __Z2AUDIOMGR_H__
#define __Z2AUDIOMGR_H__
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
#include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
#include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
extern "C" {
void Z2AudioMgr_NS_setOutputMode(void*, unsigned long);
u32 Z2AudioMgr_NS_hasReset(void*);
struct Z2AudioMgr{
Z2AudioMgr();
~Z2AudioMgr();
void gframeProcess(void);
Z2AudioMgr* setOutputMode(unsigned long outputMode);
u32 resetProcess(u32 param_1, bool param_2);
bool hasReset(void) const;
void resetRecover(void);
void init(JKRSolidHeap*, unsigned long, void*, JKRArchive*);
u8 p1[0x4a4];
Z2SceneMgr sceneMgr;
u8 p2[0xdad];
};
extern "C"{
void setOutputMode__10Z2AudioMgrFUl(void);
void setOutputMode__9JASDriverFUl(void);
}
extern Z2AudioMgr lbl_803DBF4C;
extern Z2AudioMgr* lbl_80451368;
#endif
include/Z2AudioLib/Z2AudioMgr/asm/func_802CD888.s
+1 -1
View File
@@ -4,7 +4,7 @@
/* 802CD894 002CA7D4 28 04 00 02 */ cmplwi r4, 2
/* 802CD898 002CA7D8 41 81 00 0C */ bgt lbl_802CD8A4
/* 802CD89C 002CA7DC 7C 83 23 78 */ mr r3, r4
/* 802CD8A0 002CA7E0 4B FD 08 D9 */ bl JASDriver_NS_setOutputMode
/* 802CD8A0 002CA7E0 4B FD 08 D9 */ bl setOutputMode__9JASDriverFUl
lbl_802CD8A4:
/* 802CD8A4 002CA7E4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802CD8A8 002CA7E8 7C 08 03 A6 */ mtlr r0
include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h
+4
View File
@@ -1,3 +1,5 @@
#ifndef __Z2SCENEMGR_H_
#define __Z2SCENEMGR_H_
#include "JSystem/JAudio2/JAISe/JAISe.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "global.h"
@@ -45,4 +47,6 @@ struct Z2SceneMgr {
void setFadeInStart(u8 param_1);
void setSceneName(char* stageName, long roomNum, long layerNum);
int checkFirstWaves(void);
void load1stDynamicWave(void);
};
#endif
include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h
+1
View File
@@ -8,6 +8,7 @@
struct Z2MultiSeObj {
Z2MultiSeObj();
~Z2MultiSeObj();
};
struct Z2SeMgr {
include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s
+6 -6
View File
@@ -6,8 +6,8 @@
/* 802AB660 002A85A0 93 ED 86 08 */ stw r31, lbl_80450B88-_SDA_BASE_(r13)
/* 802AB664 002A85A4 3C 80 80 2A */ lis r4, __ct__14JAISoundHandleFv@ha
/* 802AB668 002A85A8 38 84 4A C4 */ addi r4, r4, __ct__14JAISoundHandleFv@l
/* 802AB66C 002A85AC 3C A0 80 00 */ lis r5, JAISoundHandle_NS_dtor@ha
/* 802AB670 002A85B0 38 A5 78 38 */ addi r5, r5, JAISoundHandle_NS_dtor@l
/* 802AB66C 002A85AC 3C A0 80 00 */ lis r5, __dt__14JAISoundHandleFv@ha
/* 802AB670 002A85B0 38 A5 78 38 */ addi r5, r5, __dt__14JAISoundHandleFv@l
/* 802AB674 002A85B4 38 C0 00 04 */ li r6, 4
/* 802AB678 002A85B8 38 E0 00 18 */ li r7, 0x18
/* 802AB67C 002A85BC 48 0B 66 E5 */ bl func_80361D60
@@ -17,16 +17,16 @@
/* 802AB68C 002A85CC 38 7F 00 68 */ addi r3, r31, 0x68
/* 802AB690 002A85D0 3C 80 80 2B */ lis r4, __ct__12Z2MultiSeObjFv@ha
/* 802AB694 002A85D4 38 84 B7 10 */ addi r4, r4, __ct__12Z2MultiSeObjFv@l
/* 802AB698 002A85D8 3C A0 80 00 */ lis r5, Z2MultiSeObj_NS_dtor@ha
/* 802AB69C 002A85DC 38 A5 78 88 */ addi r5, r5, Z2MultiSeObj_NS_dtor@l
/* 802AB698 002A85D8 3C A0 80 00 */ lis r5, __dt__12Z2MultiSeObjFv@ha
/* 802AB69C 002A85DC 38 A5 78 88 */ addi r5, r5, __dt__12Z2MultiSeObjFv@l
/* 802AB6A0 002A85E0 38 C0 00 24 */ li r6, 0x24
/* 802AB6A4 002A85E4 38 E0 00 0A */ li r7, 0xa
/* 802AB6A8 002A85E8 48 0B 66 B9 */ bl func_80361D60
/* 802AB6AC 002A85EC 38 7F 01 D4 */ addi r3, r31, 0x1d4
/* 802AB6B0 002A85F0 3C 80 80 2B */ lis r4, __ct__12Z2MultiSeObjFv@ha
/* 802AB6B4 002A85F4 38 84 B7 10 */ addi r4, r4, __ct__12Z2MultiSeObjFv@l
/* 802AB6B8 002A85F8 3C A0 80 00 */ lis r5, Z2MultiSeObj_NS_dtor@ha
/* 802AB6BC 002A85FC 38 A5 78 88 */ addi r5, r5, Z2MultiSeObj_NS_dtor@l
/* 802AB6B8 002A85F8 3C A0 80 00 */ lis r5, __dt__12Z2MultiSeObjFv@ha
/* 802AB6BC 002A85FC 38 A5 78 88 */ addi r5, r5, __dt__12Z2MultiSeObjFv@l
/* 802AB6C0 002A8600 38 C0 00 24 */ li r6, 0x24
/* 802AB6C4 002A8604 38 E0 00 0A */ li r7, 0xa
/* 802AB6C8 002A8608 48 0B 66 99 */ bl func_80361D60
include/Z2AudioLib/Z2SoundMgr/asm/func_802A9E80.s
+3 -3
View File
@@ -9,13 +9,13 @@
/* 802A9EA0 002A6DE0 90 1F 00 00 */ stw r0, 0(r31)
/* 802A9EA4 002A6DE4 38 7F 00 04 */ addi r3, r31, 4
/* 802A9EA8 002A6DE8 38 80 00 01 */ li r4, 1
/* 802A9EAC 002A6DEC 4B FF 61 C9 */ bl JAISeMgr
/* 802A9EAC 002A6DEC 4B FF 61 C9 */ bl __ct__8JAISeMgrFb
/* 802A9EB0 002A6DF0 38 7F 07 28 */ addi r3, r31, 0x728
/* 802A9EB4 002A6DF4 38 80 00 01 */ li r4, 1
/* 802A9EB8 002A6DF8 4B FF 7A 5D */ bl JAISeqMgr
/* 802A9EB8 002A6DF8 4B FF 7A 5D */ bl __ct__9JAISeqMgrFb
/* 802A9EBC 002A6DFC 38 7F 07 9C */ addi r3, r31, 0x79c
/* 802A9EC0 002A6E00 38 80 00 01 */ li r4, 1
/* 802A9EC4 002A6E04 4B FF 9C A5 */ bl JAIStreamMgr
/* 802A9EC4 002A6E04 4B FF 9C A5 */ bl __ct__12JAIStreamMgrFb
/* 802A9EC8 002A6E08 38 00 FF FF */ li r0, -1
/* 802A9ECC 002A6E0C 90 1F 08 0C */ stw r0, 0x80c(r31)
/* 802A9ED0 002A6E10 7F E3 FB 78 */ mr r3, r31