From 18464c21c8c62ddb551d9b694bac5a5ac47e9377 Mon Sep 17 00:00:00 2001 From: Mittenshugg Date: Sun, 9 Aug 2020 20:00:43 -0500 Subject: [PATCH] c: func_80001784 --- .../unknown_001050/func_80001784.s | 23 ------------------- src/unknown_001050.c | 11 ++++++--- src/unknown_003260.c | 4 ++-- 3 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 asm/non_matchings/unknown_001050/func_80001784.s diff --git a/asm/non_matchings/unknown_001050/func_80001784.s b/asm/non_matchings/unknown_001050/func_80001784.s deleted file mode 100644 index 8613a905..00000000 --- a/asm/non_matchings/unknown_001050/func_80001784.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80001784 -/* 002384 80001784 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 002388 80001788 AFBF0014 */ sw $ra, 0x14($sp) -/* 00238C 8000178C 0C000702 */ jal func_80001C08 -/* 002390 80001790 AFA40018 */ sw $a0, 0x18($sp) -/* 002394 80001794 1440000B */ bnez $v0, .L800017C4 -/* 002398 80001798 3C05800E */ lui $a1, %hi(gSndFxPlayer) # $a1, 0x800e -/* 00239C 8000179C 93AE001B */ lbu $t6, 0x1b($sp) -/* 0023A0 800017A0 3C028011 */ lui $v0, %hi(D_80115D05) # $v0, 0x8011 -/* 0023A4 800017A4 24425D05 */ addiu $v0, %lo(D_80115D05) # addiu $v0, $v0, 0x5d05 -/* 0023A8 800017A8 A04E0000 */ sb $t6, ($v0) -/* 0023AC 800017AC 8CA5C634 */ lw $a1, %lo(gSndFxPlayer)($a1) -/* 0023B0 800017B0 0C0008AF */ jal func_800022BC -/* 0023B4 800017B4 31C400FF */ andi $a0, $t6, 0xff -/* 0023B8 800017B8 240F0001 */ li $t7, 1 -/* 0023BC 800017BC 3C018011 */ lui $at, %hi(D_80115D41) # $at, 0x8011 -/* 0023C0 800017C0 A02F5D41 */ sb $t7, %lo(D_80115D41)($at) -.L800017C4: -/* 0023C4 800017C4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0023C8 800017C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0023CC 800017CC 03E00008 */ jr $ra -/* 0023D0 800017D0 00000000 */ nop - diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 219764fb..d74f6ea3 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -373,7 +373,13 @@ GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800015F8.s") u32 func_80001C08(void); -GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001784.s") +void func_80001784(u8 a0){ + if(!func_80001C08()){ + func_800022BC(D_80115D05 = a0, gSndFxPlayer); + D_80115D41 = 1; + } +} + GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800017D4.s") void func_80002570(ALCSPlayer* arg0); @@ -429,7 +435,7 @@ u8 func_80001980(void) { return D_80115D05; } - +extern f32 D_800DC66C; GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001990.s") GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001A3C.s") @@ -484,7 +490,6 @@ u16 func_80001CB8(u16 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001D04.s") GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001EA8.s") - u16 func_800020E8(void); void func_80001F14(u16 arg0, u32 *arg1){ diff --git a/src/unknown_003260.c b/src/unknown_003260.c index b884fd7e..922de1ed 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -95,8 +95,8 @@ GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004384.s") GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004520.s") GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004604.s") -void func_80004638(s32 arg0, s16 arg1, s32 arg2) { - func_80004668(arg0, arg1, 0, arg2); +void func_80004638(ALBank* bnk, s16 arg1, s32 arg2) { + func_80004668(bnk, arg1, 0, arg2); } GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004668.s")