mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-01 09:43:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into m_Do_audio2

Browse Source
This commit is contained in:
jdflyer
2021-01-21 21:58:53 -07:00
parent ff7ac962f1 a072e71c33
commit 64bb8562fa
798 changed files with 7656 additions and 12286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h
+2 -3
View File
@@ -1,9 +1,8 @@
#ifndef __Z2AUDIOMGR_H__
#define __Z2AUDIOMGR_H__
#ifndef Z2AUDIOMGR_H_
#define Z2AUDIOMGR_H_
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
#include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
#include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
struct Z2AudioMgr{
Z2AudioMgr();
~Z2AudioMgr();
include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s
+3 -3
View File
@@ -12,7 +12,7 @@
/* 802CD274 002CA1B4 38 7F 04 C4 */ addi r3, r31, 0x4c4
/* 802CD278 002CA1B8 4B FE 8C A5 */ bl __ct__11Z2StatusMgrFv
/* 802CD27C 002CA1BC 38 7F 04 F4 */ addi r3, r31, 0x4f4
/* 802CD280 002CA1C0 4B FF 26 A1 */ bl Z2SoundObjMgr_NS_ctor
/* 802CD280 002CA1C0 4B FF 26 A1 */ bl __ct__13Z2SoundObjMgrFv
/* 802CD284 002CA1C4 3C 60 80 3D */ lis r3, lbl_803CBF38@ha
/* 802CD288 002CA1C8 38 03 BF 38 */ addi r0, r3, lbl_803CBF38@l
/* 802CD28C 002CA1CC 90 1F 05 14 */ stw r0, 0x514(r31)
@@ -20,7 +20,7 @@
/* 802CD294 002CA1D4 4B FC FE 21 */ bl JASAudioReseter
/* 802CD298 002CA1D8 38 7F 05 2C */ addi r3, r31, 0x52c
/* 802CD29C 002CA1DC 38 80 00 01 */ li r4, 1
/* 802CD2A0 002CA1E0 4B FD D8 F5 */ bl Z2SoundStarter_NS_ctor
/* 802CD2A0 002CA1E0 4B FD D8 F5 */ bl __ct__14Z2SoundStarterFb
/* 802CD2A4 002CA1E4 38 7F 05 30 */ addi r3, r31, 0x530
/* 802CD2A8 002CA1E8 4B FD CB D9 */ bl Z2SoundMgr_NS_ctor
/* 802CD2AC 002CA1EC 3B DF 0D 40 */ addi r30, r31, 0xd40
@@ -50,7 +50,7 @@ lbl_802CD2E8:
/* 802CD308 002CA248 38 7F 0D 4C */ addi r3, r31, 0xd4c
/* 802CD30C 002CA24C 4B FE FE 25 */ bl Z2Audience
/* 802CD310 002CA250 38 7F 0F 2C */ addi r3, r31, 0xf2c
/* 802CD314 002CA254 4B FF E9 4D */ bl Z2SpeechMgr2_NS_ctor
/* 802CD314 002CA254 4B FF E9 4D */ bl __ct__12Z2SpeechMgr2Fv
/* 802CD318 002CA258 38 7F 13 70 */ addi r3, r31, 0x1370
/* 802CD31C 002CA25C 4B FE D4 C1 */ bl Z2FxLineMgr
/* 802CD320 002CA260 93 ED 8D E8 */ stw r31, lbl_80451368-_SDA_BASE_(r13)
include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s
+1 -1
View File
@@ -253,7 +253,7 @@ lbl_802CD6A8:
/* 802CD708 002CA648 4B FD 89 A5 */ bl JAUSectionHeap_NS_newDynamicSeqBlock
/* 802CD70C 002CA64C 38 61 00 08 */ addi r3, r1, 8
/* 802CD710 002CA650 7F 24 CB 78 */ mr r4, r25
/* 802CD714 002CA654 4B FD C3 21 */ bl Z2AudioArcLoader
/* 802CD714 002CA654 4B FD C3 21 */ bl __ct__16Z2AudioArcLoaderFP10JAUSection
/* 802CD718 002CA658 38 61 00 08 */ addi r3, r1, 8
/* 802CD71C 002CA65C 7F 44 D3 78 */ mr r4, r26
/* 802CD720 002CA660 4B FD 70 6D */ bl JAUAudioArcLoader_NS_load