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

Merge branch 'master' into polypass2

Browse Source
This commit is contained in:
notyourav
2021-01-24 21:30:58 -08:00
committed by GitHub
parent af69b34327 d515e1c282
commit d26898feee
62 changed files with 881 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/doxygen.yml
+1 -1
View File
@@ -3,7 +3,7 @@ name: run Doxygen to generate docs
on:
push:
branches:
- main
- master
jobs:
build:
Makefile
+1 -1
View File
@@ -82,7 +82,7 @@ ASFLAGS := -mgekko -I include
LDFLAGS := -map $(MAP) -fp hard -nodefaults -w off
# Compiler flags
CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc -enum int $(INCLUDES)
CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc -maxerrors 5 -enum int $(INCLUDES)
# elf2dol needs to know these in order to calculate sbss correctly.
SDATA_PDHR := 9
asm/JAudio2/JAISeMgr.s
+10 -10
View File
@@ -602,8 +602,8 @@ lbl_802A005C:
/* 802A006C 0029CFAC 38 21 00 40 */ addi r1, r1, 0x40
/* 802A0070 0029CFB0 4E 80 00 20 */ blr
.global JAISeMgr
JAISeMgr:
.global __ct__8JAISeMgrFb
__ct__8JAISeMgrFb:
/* 802A0074 0029CFB4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802A0078 0029CFB8 7C 08 02 A6 */ mflr r0
/* 802A007C 0029CFBC 90 01 00 14 */ stw r0, 0x14(r1)
@@ -624,10 +624,10 @@ lbl_802A0094:
/* 802A00B0 0029CFF0 3C 80 80 2A */ lis r4, JAISeCategoryMgr@ha
.global JAISeCategoryMgr
/* 802A00B4 0029CFF4 38 84 09 94 */ addi r4, r4, JAISeCategoryMgr@l
.global JAISeCategoryMgr_NS_dtor
/* 802A00B8 0029CFF8 3C A0 80 00 */ lis r5, JAISeCategoryMgr_NS_dtor@ha
.global JAISeCategoryMgr_NS_dtor
/* 802A00BC 0029CFFC 38 A5 78 DC */ addi r5, r5, JAISeCategoryMgr_NS_dtor@l
.global __dt__16JAISeCategoryMgrFv
/* 802A00B8 0029CFF8 3C A0 80 00 */ lis r5, __dt__16JAISeCategoryMgrFv@ha
.global __dt__16JAISeCategoryMgrFv
/* 802A00BC 0029CFFC 38 A5 78 DC */ addi r5, r5, __dt__16JAISeCategoryMgrFv@l
/* 802A00C0 0029D000 38 C0 00 6C */ li r6, 0x6c
/* 802A00C4 0029D004 38 E0 00 10 */ li r7, 0x10
/* 802A00C8 0029D008 48 0C 1C 99 */ bl func_80361D60
@@ -1247,10 +1247,10 @@ lbl_802A08E0:
/* 802A0920 0029D860 38 03 98 B0 */ addi r0, r3, lbl_803C98B0@l
/* 802A0924 0029D864 90 1E 00 00 */ stw r0, 0(r30)
/* 802A0928 0029D868 38 7E 00 14 */ addi r3, r30, 0x14
.global JAISeCategoryMgr_NS_dtor
/* 802A092C 0029D86C 3C 80 80 00 */ lis r4, JAISeCategoryMgr_NS_dtor@ha
.global JAISeCategoryMgr_NS_dtor
/* 802A0930 0029D870 38 84 78 DC */ addi r4, r4, JAISeCategoryMgr_NS_dtor@l
.global __dt__16JAISeCategoryMgrFv
/* 802A092C 0029D86C 3C 80 80 00 */ lis r4, __dt__16JAISeCategoryMgrFv@ha
.global __dt__16JAISeCategoryMgrFv
/* 802A0930 0029D870 38 84 78 DC */ addi r4, r4, __dt__16JAISeCategoryMgrFv@l
/* 802A0934 0029D874 38 A0 00 6C */ li r5, 0x6c
/* 802A0938 0029D878 38 C0 00 10 */ li r6, 0x10
/* 802A093C 0029D87C 48 0C 13 AD */ bl func_80361CE8
asm/JAudio2/JAISeqMgr.s
+2 -2
View File
@@ -85,8 +85,8 @@ lbl_802A18FC:
/* 802A190C 0029E84C 38 21 00 20 */ addi r1, r1, 0x20
/* 802A1910 0029E850 4E 80 00 20 */ blr
.global JAISeqMgr
JAISeqMgr:
.global __ct__9JAISeqMgrFb
__ct__9JAISeqMgrFb:
/* 802A1914 0029E854 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802A1918 0029E858 7C 08 02 A6 */ mflr r0
/* 802A191C 0029E85C 90 01 00 14 */ stw r0, 0x14(r1)
asm/JAudio2/JAIStreamMgr.s
+2 -2
View File
@@ -3,8 +3,8 @@
.section .text, "ax" # 802a3b68
.global JAIStreamMgr
JAIStreamMgr:
.global __ct__12JAIStreamMgrFb
__ct__12JAIStreamMgrFb:
/* 802A3B68 002A0AA8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802A3B6C 002A0AAC 7C 08 02 A6 */ mflr r0
/* 802A3B70 002A0AB0 90 01 00 14 */ stw r0, 0x14(r1)
asm/JAudio2/JASDriverIF.s
+2 -2
View File
@@ -30,8 +30,8 @@ JASDriver_NS_getDSPLevel:
/* 8029E170 0029B0B0 38 21 00 10 */ addi r1, r1, 0x10
/* 8029E174 0029B0B4 4E 80 00 20 */ blr
.global JASDriver_NS_setOutputMode
JASDriver_NS_setOutputMode:
.global setOutputMode__9JASDriverFUl
setOutputMode__9JASDriverFUl:
/* 8029E178 0029B0B8 90 6D 82 44 */ stw r3, lbl_804507C4-_SDA_BASE_(r13)
/* 8029E17C 0029B0BC 4E 80 00 20 */ blr
asm/JAudio2/JAUInitializer.s
+2 -2
View File
@@ -167,11 +167,11 @@ lbl_802A4CF4:
/* 802A4D0C 002A1C4C 48 00 00 18 */ b lbl_802A4D24
lbl_802A4D10:
/* 802A4D10 002A1C50 38 60 00 00 */ li r3, 0
/* 802A4D14 002A1C54 4B FF 94 65 */ bl JASDriver_NS_setOutputMode
/* 802A4D14 002A1C54 4B FF 94 65 */ bl setOutputMode__9JASDriverFUl
/* 802A4D18 002A1C58 48 00 00 0C */ b lbl_802A4D24
lbl_802A4D1C:
/* 802A4D1C 002A1C5C 38 60 00 01 */ li r3, 1
/* 802A4D20 002A1C60 4B FF 94 59 */ bl JASDriver_NS_setOutputMode
/* 802A4D20 002A1C60 4B FF 94 59 */ bl setOutputMode__9JASDriverFUl
lbl_802A4D24:
/* 802A4D24 002A1C64 39 61 00 20 */ addi r11, r1, 0x20
/* 802A4D28 002A1C68 48 0B D5 01 */ bl _restgpr_29
asm/d/error/d_error_msg.s
+2 -2
View File
@@ -840,7 +840,7 @@ lbl_8009D7C0:
/* 8009D7D0 0009A710 88 03 05 18 */ lbz r0, 0x518(r3)
/* 8009D7D4 0009A714 28 00 00 00 */ cmplwi r0, 0
/* 8009D7D8 0009A718 41 82 00 20 */ beq lbl_8009D7F8
/* 8009D7DC 0009A71C 4B F6 9A E9 */ bl mDoAud_resetRecover
/* 8009D7DC 0009A71C 4B F6 9A E9 */ bl mDoAud_resetRecover__Fv
/* 8009D7E0 0009A720 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8009D7E4 0009A724 40 82 00 14 */ bne lbl_8009D7F8
/* 8009D7E8 0009A728 88 6D 81 08 */ lbz r3, lbl_80450688-_SDA_BASE_(r13)
@@ -854,7 +854,7 @@ lbl_8009D7F8:
/* 8009D804 0009A744 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13)
/* 8009D808 0009A748 38 80 00 10 */ li r4, 0x10
/* 8009D80C 0009A74C 38 A0 00 01 */ li r5, 1
/* 8009D810 0009A750 48 23 01 65 */ bl Z2AudioMgr_NS_resetProcess
/* 8009D810 0009A750 48 23 01 65 */ bl resetProcess__10Z2AudioMgrFUlb
lbl_8009D814:
/* 8009D814 0009A754 88 6D 81 08 */ lbz r3, lbl_80450688-_SDA_BASE_(r13)
/* 8009D818 0009A758 4B FF FB F9 */ bl drawCapture
asm/d/menu/d_menu_option.s
+3 -3
View File
@@ -2726,7 +2726,7 @@ lbl_801E4690:
/* 801E469C 001E15DC 3C 80 80 39 */ lis r4, lbl_80396EA8@ha
/* 801E46A0 001E15E0 38 84 6E A8 */ addi r4, r4, lbl_80396EA8@l
/* 801E46A4 001E15E4 7C 84 00 2E */ lwzx r4, r4, r0
/* 801E46A8 001E15E8 48 0E 91 E1 */ bl Z2AudioMgr_NS_setOutputMode
/* 801E46A8 001E15E8 48 0E 91 E1 */ bl setOutputMode__10Z2AudioMgrFUl
/* 801E46AC 001E15EC 7F E3 FB 78 */ mr r3, r31
/* 801E46B0 001E15F0 88 1F 03 E9 */ lbz r0, 0x3e9(r31)
/* 801E46B4 001E15F4 54 00 10 3A */ slwi r0, r0, 2
@@ -2829,7 +2829,7 @@ lbl_801E480C:
/* 801E4818 001E1758 3C 80 80 39 */ lis r4, lbl_80396EA8@ha
/* 801E481C 001E175C 38 84 6E A8 */ addi r4, r4, lbl_80396EA8@l
/* 801E4820 001E1760 7C 84 00 2E */ lwzx r4, r4, r0
/* 801E4824 001E1764 48 0E 90 65 */ bl Z2AudioMgr_NS_setOutputMode
/* 801E4824 001E1764 48 0E 90 65 */ bl setOutputMode__10Z2AudioMgrFUl
/* 801E4828 001E1768 7F E3 FB 78 */ mr r3, r31
/* 801E482C 001E176C 88 1F 03 E9 */ lbz r0, 0x3e9(r31)
/* 801E4830 001E1770 54 00 10 3A */ slwi r0, r0, 2
@@ -3447,7 +3447,7 @@ lbl_801E50F0:
/* 801E5140 001E2080 3C 80 80 39 */ lis r4, lbl_80396EA8@ha
/* 801E5144 001E2084 38 84 6E A8 */ addi r4, r4, lbl_80396EA8@l
/* 801E5148 001E2088 7C 84 00 2E */ lwzx r4, r4, r0
/* 801E514C 001E208C 48 0E 87 3D */ bl Z2AudioMgr_NS_setOutputMode
/* 801E514C 001E208C 48 0E 87 3D */ bl setOutputMode__10Z2AudioMgrFUl
/* 801E5150 001E2090 7F E3 FB 78 */ mr r3, r31
/* 801E5154 001E2094 88 1F 03 E9 */ lbz r0, 0x3e9(r31)
/* 801E5158 001E2098 54 00 10 3A */ slwi r0, r0, 2
asm/d/ovlp/d_ovlp_fade.s
+2 -2
View File
@@ -49,7 +49,7 @@ dOvlpFd_FadeOut:
/* 80252214 0024F154 2C 00 00 00 */ cmpwi r0, 0
/* 80252218 0024F158 40 82 00 4C */ bne lbl_80252264
/* 8025221C 0024F15C 38 60 00 00 */ li r3, 0
/* 80252220 0024F160 4B DB 50 35 */ bl mDoAud_setFadeInStart
/* 80252220 0024F160 4B DB 50 35 */ bl mDoAud_setFadeInStart__FUc
/* 80252224 0024F164 A8 1E 00 0E */ lha r0, 0xe(r30)
/* 80252228 0024F168 2C 00 00 08 */ cmpwi r0, 8
/* 8025222C 0024F16C 40 82 00 10 */ bne lbl_8025223C
@@ -175,7 +175,7 @@ lbl_802523B4:
lbl_802523BC:
/* 802523BC 0024F2FC 93 DF 00 D4 */ stw r30, 0xd4(r31)
/* 802523C0 0024F300 38 60 00 00 */ li r3, 0
/* 802523C4 0024F304 4B DB 4E 61 */ bl mDoAud_setFadeOutStart
/* 802523C4 0024F304 4B DB 4E 61 */ bl mDoAud_setFadeOutStart__FUc
lbl_802523C8:
/* 802523C8 0024F308 80 7F 00 D0 */ lwz r3, 0xd0(r31)
/* 802523CC 0024F30C 34 03 FF FF */ addic. r0, r3, -1
asm/d/ovlp/d_ovlp_fade3.s
+2 -2
View File
@@ -497,7 +497,7 @@ lbl_8025365C:
/* 8025365C 0025059C 38 00 00 5A */ li r0, 0x5a
/* 80253660 002505A0 98 1F 01 1D */ stb r0, 0x11d(r31)
/* 80253664 002505A4 38 60 00 00 */ li r3, 0
/* 80253668 002505A8 4B DB 3B BD */ bl mDoAud_setFadeOutStart
/* 80253668 002505A8 4B DB 3B BD */ bl mDoAud_setFadeOutStart__FUc
/* 8025366C 002505AC 48 00 00 0C */ b lbl_80253678
lbl_80253670:
/* 80253670 002505B0 38 7F 01 1D */ addi r3, r31, 0x11d
@@ -527,7 +527,7 @@ lbl_80253678:
/* 802536CC 0025060C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802536D0 00250610 40 82 00 4C */ bne lbl_8025371C
/* 802536D4 00250614 38 60 00 00 */ li r3, 0
/* 802536D8 00250618 4B DB 3B 7D */ bl mDoAud_setFadeInStart
/* 802536D8 00250618 4B DB 3B 7D */ bl mDoAud_setFadeInStart__FUc
/* 802536DC 0025061C A8 7F 01 10 */ lha r3, 0x110(r31)
/* 802536E0 00250620 A8 1F 01 12 */ lha r0, 0x112(r31)
/* 802536E4 00250624 7C 03 02 14 */ add r0, r3, r0
asm/d/s/d_s_logo.s
+1 -1
View File
@@ -1249,7 +1249,7 @@ dScnLogo_c_NS_dtor:
/* 802572F4 00254234 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13)
/* 802572F8 00254238 38 80 00 05 */ li r4, 5
/* 802572FC 0025423C 38 A0 00 01 */ li r5, 1
/* 80257300 00254240 48 07 66 75 */ bl Z2AudioMgr_NS_resetProcess
/* 80257300 00254240 48 07 66 75 */ bl resetProcess__10Z2AudioMgrFUlb
lbl_80257304:
/* 80257304 00254244 38 60 00 00 */ li r3, 0
/* 80257308 00254248 3C 80 80 00 */ lis r4, 0x8000
asm/d/s/d_s_play.s
+3 -3
View File
@@ -491,7 +491,7 @@ dScnPly_c_NS_resetGame:
/* 80259AF4 00256A34 38 60 00 00 */ li r3, 0
/* 80259AF8 00256A38 48 00 00 F0 */ b lbl_80259BE8
lbl_80259AFC:
/* 80259AFC 00256A3C 4B DA D7 C9 */ bl mDoAud_resetRecover
/* 80259AFC 00256A3C 4B DA D7 C9 */ bl mDoAud_resetRecover__Fv
/* 80259B00 00256A40 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80259B04 00256A44 40 82 00 0C */ bne lbl_80259B10
/* 80259B08 00256A48 38 60 00 00 */ li r3, 0
@@ -653,8 +653,8 @@ lbl_80259D14:
/* 80259D3C 00256C7C 7C 65 1B 78 */ mr r5, r3
/* 80259D40 00256C80 7F C3 F3 78 */ mr r3, r30
/* 80259D44 00256C84 7F E4 FB 78 */ mr r4, r31
/* 80259D48 00256C88 4B DA D4 75 */ bl mDoAud_setSceneName
/* 80259D4C 00256C8C 4B DA D4 AD */ bl mDoAud_load1stDynamicWave
/* 80259D48 00256C88 4B DA D4 75 */ bl mDoAud_setSceneName__FPCcll
/* 80259D4C 00256C8C 4B DA D4 AD */ bl mDoAud_load1stDynamicWave__Fv
/* 80259D50 00256C90 2C 03 00 00 */ cmpwi r3, 0
/* 80259D54 00256C94 40 82 00 0C */ bne lbl_80259D60
/* 80259D58 00256C98 38 60 00 00 */ li r3, 0
asm/m/Do/m_Do_audio.s
-718
View File
File diff suppressed because it is too large Load Diff
include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef _JAI_SE_MGR_H
#define _JAI_SE_MGR_H
class JAISeCategoryMgr {
public:
~JAISeCategoryMgr();
};
#endif
include/JSystem/JAudio2/JAISound/JAISound.h
+1
View File
@@ -128,6 +128,7 @@ void stop__8JAISoundFv(JAISound*);
class JAISoundHandle {
public:
JAISoundHandle(); // noninline in JAUClusterSound.cpp
~JAISoundHandle();
bool isSoundAttached() const { return mSound != NULL; }
include/Z2AudioLib/Z2AudioLib.h
+13
View File
@@ -0,0 +1,13 @@
#ifndef _Z2AUDIOLIB_H
#define _Z2AUDIOLIB_H
#include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#endif
include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h
+23 -3
View File
@@ -1,9 +1,29 @@
#ifndef Z2AUDIOMGR_H_
#define Z2AUDIOMGR_H_
#include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
#include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
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*);
extern "C" {
void Z2AudioMgr_NS_setOutputMode(void*, unsigned long);
u32 Z2AudioMgr_NS_hasReset(void*);
u8 unk_1[0x4a4];
Z2SceneMgr sceneMgr;
u8 unk_2[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

Some files were not shown because too many files have changed in this diff Show More