func_80001BC0

This commit is contained in:
Mittenshugg
2020-08-11 12:13:28 -05:00
parent ffea91496a
commit cf96152714
6 changed files with 13 additions and 32 deletions
@@ -1,20 +0,0 @@
glabel func_80001BC0
/* 0027C0 80001BC0 3C028011 */ lui $v0, %hi(D_80115D05) # $v0, 0x8011
/* 0027C4 80001BC4 240E0001 */ li $t6, 1
/* 0027C8 80001BC8 3C01800E */ lui $at, %hi(D_800DC644) # $at, 0x800e
/* 0027CC 80001BCC 24425D05 */ addiu $v0, %lo(D_80115D05) # addiu $v0, $v0, 0x5d05
/* 0027D0 80001BD0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0027D4 80001BD4 00803025 */ move $a2, $a0
/* 0027D8 80001BD8 A02EC644 */ sb $t6, %lo(D_800DC644)($at)
/* 0027DC 80001BDC A0460000 */ sb $a2, ($v0)
/* 0027E0 80001BE0 3C05800E */ lui $a1, %hi(gSndFxPlayer) # $a1, 0x800e
/* 0027E4 80001BE4 AFBF0014 */ sw $ra, 0x14($sp)
/* 0027E8 80001BE8 AFA40018 */ sw $a0, 0x18($sp)
/* 0027EC 80001BEC 8CA5C634 */ lw $a1, %lo(gSndFxPlayer)($a1)
/* 0027F0 80001BF0 0C0008AF */ jal func_800022BC
/* 0027F4 80001BF4 30C400FF */ andi $a0, $a2, 0xff
/* 0027F8 80001BF8 8FBF0014 */ lw $ra, 0x14($sp)
/* 0027FC 80001BFC 27BD0018 */ addiu $sp, $sp, 0x18
/* 002800 80001C00 03E00008 */ jr $ra
/* 002804 80001C04 00000000 */ nop
@@ -1,4 +1,4 @@
glabel func_80002660
glabel audioNewThread
/* 003260 80002660 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 003264 80002664 3C018011 */ lui $at, %hi(D_80115F90) # $at, 0x8011
/* 003268 80002668 AFBF0034 */ sw $ra, 0x34($sp)
@@ -21,7 +21,7 @@ glabel D_8006C330
/* 06CF78 8006C378 00000000 */ nop
/* 06CF7C 8006C37C 0C01C9C2 */ jal func_80072708
/* 06CF80 8006C380 00000000 */ nop
/* 06CF84 8006C384 0C000A9D */ jal func_80002A74
/* 06CF84 8006C384 0C000A9D */ jal audioStopThread
/* 06CF88 8006C388 00000000 */ nop
/* 06CF8C 8006C38C 0C031CEF */ jal func_800C73BC
/* 06CF90 8006C390 00000000 */ nop
+6 -5
View File
@@ -184,7 +184,7 @@ void audio_init(u32 arg0){
mConfig.unk1d = 2;
mConfig.unk18 = 0;
mConfig.heap = &gALHeap;
func_80002660(&mConfig, 12, arg0);
audioNewThread(&mConfig, 12, arg0);
gMusicPlayer = func_80002224(24, 120);
func_8000B010(gMusicPlayer, 18);
gSndFxPlayer = func_80002224(16, 50);
@@ -196,7 +196,7 @@ void audio_init(u32 arg0){
audConfig.unk10 = 1;
audConfig.hp = &gALHeap;
func_800031C0(&audConfig);
func_80002A50();
audioStartThread();
func_80000968(0);
func_80071140(reg_s2);
func_8000318C(10);
@@ -644,9 +644,10 @@ void sfxSetPan(ALPan pan){
return;
}
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001BC0.s")
void func_80001BC0(u8 arg0){
D_800DC644 = 1;
func_800022BC( D_80115D05 = arg0, gSndFxPlayer);
}
u32 func_80001C08(void){
if(D_80115D05 && D_800DC644 && (gSndFxPlayer->state == AL_PLAYING) ){
+4 -4
View File
@@ -31,9 +31,9 @@ extern OSMesg D_80119B08;
extern f32 D_80126170;
#if 1
GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80002660.s")
GLOBAL_ASM("asm/non_matchings/unknown_003260/audioNewThread.s")
#else
void func_80002660(ALSynConfig* c, OSPri p, s32 arg2){
void audioNewThread(ALSynConfig* c, OSPri p, s32 arg2){
D_80115F90 = arg2;
D_80115F94 = c->heap;
c->dmaproc = &D_80003008;
@@ -49,11 +49,11 @@ GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80002660.s")
}
#endif
void func_80002A50(void) {
void audioStartThread(void) {
osStartThread(&D_80115FB0);
}
void func_80002A74(void) {
void audioStopThread(void) {
osStopThread(&D_80115FB0);
}
+1 -1
View File
@@ -1411,7 +1411,7 @@ void func_8006C330(s32 arg0) {
while(1) {
if (func_8006EAC0() != 0) {
func_80072708();
func_80002A74();
audioStopThread();
func_800C73BC();
__osSpSetStatus(0xAAAA82);
func_800CD250(0x1D6);