izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

c: func_80001C08

Browse Source
This commit is contained in:
Mittenshugg
2020-08-09 13:53:37 -05:00
parent e95ab6e52d
commit 8d6721468e
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/unknown_001050/func_80001C08.s → asm/non_matchings/unknown_001050/func_80001C5C.s
+1 -25
View File
@@ -1,28 +1,4 @@
glabel func_80001C08
/* 002808 80001C08 3C038011 */ lui $v1, %hi(D_80115D05) # $v1, 0x8011
/* 00280C 80001C0C 90635D05 */ lbu $v1, %lo(D_80115D05)($v1)
/* 002810 80001C10 3C0E800E */ lui $t6, %hi(D_800DC644) # $t6, 0x800e
/* 002814 80001C14 1060000D */ beqz $v1, .L80001C4C
/* 002818 80001C18 00001025 */ move $v0, $zero
/* 00281C 80001C1C 91CEC644 */ lbu $t6, %lo(D_800DC644)($t6)
/* 002820 80001C20 3C0F800E */ lui $t7, %hi(gSndFxPlayer) # $t7, 0x800e
/* 002824 80001C24 11C00009 */ beqz $t6, .L80001C4C
/* 002828 80001C28 00000000 */ nop
/* 00282C 80001C2C 8DEFC634 */ lw $t7, %lo(gSndFxPlayer)($t7)
/* 002830 80001C30 24010001 */ li $at, 1
/* 002834 80001C34 8DF8002C */ lw $t8, 0x2c($t7)
/* 002838 80001C38 00000000 */ nop
/* 00283C 80001C3C 17010003 */ bne $t8, $at, .L80001C4C
/* 002840 80001C40 00000000 */ nop
/* 002844 80001C44 03E00008 */ jr $ra
/* 002848 80001C48 00601025 */ move $v0, $v1
.L80001C4C:
/* 00284C 80001C4C 3C01800E */ lui $at, %hi(D_800DC644) # $at, 0x800e
/* 002850 80001C50 A020C644 */ sb $zero, %lo(D_800DC644)($at)
/* 002854 80001C54 03E00008 */ jr $ra
/* 002858 80001C58 00000000 */ nop
glabel func_80001C5C
/* 00285C 80001C5C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 002860 80001C60 AFB1001C */ sw $s1, 0x1c($sp)
/* 002864 80001C64 00048A00 */ sll $s1, $a0, 8
src/unknown_001050.c
+11 -1
View File
@@ -27,6 +27,7 @@ extern ALCSPlayer* gSndFxPlayer;
extern u8 D_800DC638;
extern u8 D_800DC63C;
extern u8 D_800DC640;
extern u8 D_800DC644;
extern s32 D_800DC648;
extern s32 D_800DC64C;
extern f32 D_800DC650;
@@ -330,6 +331,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800017D4.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001844.s")
void func_80002570(ALCSPlayer* arg0);
u32 func_80001C08(void);
void func_800018E0(void) {
if (func_80001C08() == 0) {
@@ -386,7 +388,15 @@ void sfxSetPan(ALPan pan){
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001BC0.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001C08.s")
u32 func_80001C08(void){
if(D_80115D05 && D_800DC644 && (gSndFxPlayer->state == AL_PLAYING) ){
return D_80115D05;
}
D_800DC644 = 0;
return 0;
}
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001C5C.s")
u16 func_80001CB8(u16 arg0) {
if (D_80115D20 < arg0) {