diff --git a/asm/non_matchings/audio/func_800015F8.s b/asm/non_matchings/audio/func_800015F8.s index 2bf969fb..cdc675cd 100644 --- a/asm/non_matchings/audio/func_800015F8.s +++ b/asm/non_matchings/audio/func_800015F8.s @@ -7,7 +7,7 @@ glabel D_800E49E8 .float 120000.0 .text -glabel func_800015F8 +glabel audio_get_chr_select_anim_frac /* 0021F8 800015F8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0021FC 800015FC AFBF0014 */ sw $ra, 0x14($sp) /* 002200 80001600 0C031E34 */ jal osGetCount diff --git a/asm/non_matchings/game_ui/func_800A277C.s b/asm/non_matchings/game_ui/func_800A277C.s index 8c3081da..cfd45065 100644 --- a/asm/non_matchings/game_ui/func_800A277C.s +++ b/asm/non_matchings/game_ui/func_800A277C.s @@ -138,7 +138,7 @@ glabel func_800A277C /* 0A3518 800A2918 24010004 */ li $at, 4 /* 0A351C 800A291C 15E10042 */ bne $t7, $at, .L800A2A28 /* 0A3520 800A2920 00000000 */ nop -/* 0A3524 800A2924 0C00057E */ jal func_800015F8 +/* 0A3524 800A2924 0C00057E */ jal audio_get_chr_select_anim_frac /* 0A3528 800A2928 AFA900A8 */ sw $t1, 0xa8($sp) /* 0A352C 800A292C 8FB80098 */ lw $t8, 0x98($sp) /* 0A3530 800A2930 924C0000 */ lbu $t4, ($s2) diff --git a/asm/non_matchings/unknown_032760/obj_loop_char_select.s b/asm/non_matchings/unknown_032760/obj_loop_char_select.s index a737a858..449b098c 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_char_select.s +++ b/asm/non_matchings/unknown_032760/obj_loop_char_select.s @@ -210,7 +210,7 @@ glabel obj_loop_char_select /* 039230 80038630 24A5FFFF */ addiu $a1, $a1, -1 /* 039234 80038634 1541002F */ bne $t2, $at, .L800386F4 /* 039238 80038638 0005C900 */ sll $t9, $a1, 4 -/* 03923C 8003863C 0C00057E */ jal func_800015F8 +/* 03923C 8003863C 0C00057E */ jal audio_get_chr_select_anim_frac /* 039240 80038640 AFB90070 */ sw $t9, 0x70($sp) /* 039244 80038644 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 039248 80038648 44819800 */ mtc1 $at, $f19 diff --git a/src/audio.c b/src/audio.c index 5f1e961f..4d67c967 100644 --- a/src/audio.c +++ b/src/audio.c @@ -501,7 +501,7 @@ u8 music_is_playing(void) { return (alCSPGetState(gMusicPlayer) == AL_PLAYING); } -f32 func_800015F8(void) { +f32 audio_get_chr_select_anim_frac(void) { f32 tmp; u32 cnt = osGetCount(); if ((u32) audioPrevCount < cnt) { diff --git a/src/audio.h b/src/audio.h index 672ff9a8..7db02915 100644 --- a/src/audio.h +++ b/src/audio.h @@ -135,7 +135,7 @@ void func_80063A90(ALSeqPlayer *seqp, u8 chan); void play_sound_global(u16 soundID, s32* soundMask); //Non matching. void func_8000232C(ALSeqPlayer *seqp, void *ptr, u8 *arg2, ALCSeq *seq); //Non Matching -f32 func_800015F8(void); //Non Matching +f32 audio_get_chr_select_anim_frac(void); //Non Matching void func_80009B7C(s32 *arg0, f32 x, f32 y, f32 z); // Non Matching void func_8000974C(s32, f32, f32, f32, s32, s32, s32, s32, s32, s32, s32, s32);