diff --git a/include/functions.h b/include/functions.h index 145deaec..11ac0cf0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -397,7 +397,7 @@ void func_8030E2C4(u8); void func_8030E394(u8 indx); void func_8030E484(enum sfx_e uid); void func_8030E4E4(enum sfx_e uid); -void func_8030E510(enum sfx_e uid, s32 arg1); +void sfxsource_play(enum sfx_e uid, s32 sample_rate); void func_8030E540(enum sfx_e uid); void func_8030E560(enum sfx_e uid, s32 arg1); void func_8030E58C(enum sfx_e uid, f32 arg1); diff --git a/src/BGS/ch/pinkegg.c b/src/BGS/ch/pinkegg.c index a455aabb..8f1193d9 100644 --- a/src/BGS/ch/pinkegg.c +++ b/src/BGS/ch/pinkegg.c @@ -84,7 +84,7 @@ void chpinkegg_collision(ActorMarker *this, ActorMarker *other_marker){ thisActor = marker_getActor(this); this->propPtr->unk8_3 = 0; - func_8030E510(SFX_AA_BGS_EGG_BREAKING_1, 28000); + sfxsource_play(SFX_AA_BGS_EGG_BREAKING_1, 28000); subaddie_set_state(thisActor, 3); actor_playAnimationOnce(thisActor); this->collidable = 0; diff --git a/src/CCW/code_3050.c b/src/CCW/code_3050.c index 12698181..ea928bba 100644 --- a/src/CCW/code_3050.c +++ b/src/CCW/code_3050.c @@ -13,7 +13,7 @@ void func_80389440(Actor *this, s32 next_state) { void *temp_v0; if (next_state == 2) { - func_8030E510(SFX_AA_BGS_EGG_BREAKING_1, 28000); + sfxsource_play(SFX_AA_BGS_EGG_BREAKING_1, 28000); this->marker->propPtr->unk8_3 = FALSE; fileProgressFlag_set(FILEPROG_E6_SPRING_EYRIE_HATCHED, TRUE); skeletalAnim_set(this->unk148, 0x187, 0.0f, 2.0f); diff --git a/src/GV/ch/histup.c b/src/GV/ch/histup.c index 9b1efd8b..d5c81e1c 100644 --- a/src/GV/ch/histup.c +++ b/src/GV/ch/histup.c @@ -216,7 +216,7 @@ void func_8038DBDC(Actor *this){ } else{ if(actor_animationIsAt(this, 0.42f)) - func_8030E510(SFX_7C_CHEBOOF, 32000); + sfxsource_play(SFX_7C_CHEBOOF, 32000); tmp = this->unk44_31; if(tmp && func_8030E3FC(tmp)){ if(1.0 < this->unk1C[1]){ diff --git a/src/core2/ch/gameSelect.c b/src/core2/ch/gameSelect.c index aacf2606..b306dfbd 100644 --- a/src/core2/ch/gameSelect.c +++ b/src/core2/ch/gameSelect.c @@ -341,10 +341,10 @@ void func_802C4C14(Actor *this){ switch(sp84){ case 0://L802C4D8C if(actor_animationIsAt(this, 0.1f)) - func_8030E510(SFX_5D_BANJO_RAAOWW, 8000); + sfxsource_play(SFX_5D_BANJO_RAAOWW, 8000); if(actor_animationIsAt(this, 0.7f)) - func_8030E510(SFX_5E_BANJO_PHEWWW, 8000); + sfxsource_play(SFX_5E_BANJO_PHEWWW, 8000); break; case 1://L802C4DD0 if(randf() < 0.1){ @@ -364,7 +364,7 @@ void func_802C4C14(Actor *this){ switch(this->state){ case 1://L802C4F10 if(sp84 == 1){ - func_8030E510(SFX_136_GAMEBOY_STARTUP, 15000); + sfxsource_play(SFX_136_GAMEBOY_STARTUP, 15000); timedFunc_set_3(0.25f, (GenFunction_3)comusic_8025AB44, COMUSIC_73_GAMEBOY, -1, 2000); func_8025A58C(0, 2000); } @@ -441,20 +441,20 @@ void func_802C4C14(Actor *this){ if(randf() < 0.1){ switch(sp84){ case 0://L802C52B8 - func_8030E510(SFX_31_BANJO_OHHWAAOOO, 28000); + sfxsource_play(SFX_31_BANJO_OHHWAAOOO, 28000); func_8030E540(SFX_135_CARTOONY_SPRING); - timedFunc_set_2(0.4f, (GenFunction_2)func_8030E510, SFX_13A_GLASS_BREAKING_7, 0x7fff); - timedFunc_set_2(0.9f, (GenFunction_2)func_8030E510, SFX_150_PORCELAIN_CRASH, 0x7fff); - timedFunc_set_2(1.0f, (GenFunction_2)func_8030E510, SFX_151_CAT_MEOW, 0x7fff); + timedFunc_set_2(0.4f, (GenFunction_2)sfxsource_play, SFX_13A_GLASS_BREAKING_7, 0x7fff); + timedFunc_set_2(0.9f, (GenFunction_2)sfxsource_play, SFX_150_PORCELAIN_CRASH, 0x7fff); + timedFunc_set_2(1.0f, (GenFunction_2)sfxsource_play, SFX_151_CAT_MEOW, 0x7fff); break; case 1://L802C5320 - timedFunc_set_2(0.4f, (GenFunction_2)func_8030E510, SFX_31_BANJO_OHHWAAOOO, 28000); - timedFunc_set_2(0.2f, (GenFunction_2)func_8030E510, SFX_E_SHOCKSPRING_BOING, 28000); + timedFunc_set_2(0.4f, (GenFunction_2)sfxsource_play, SFX_31_BANJO_OHHWAAOOO, 28000); + timedFunc_set_2(0.2f, (GenFunction_2)sfxsource_play, SFX_E_SHOCKSPRING_BOING, 28000); func_8030E540(SFX_2D_KABOING); break; case 2://L802C5364 - timedFunc_set_2(0.15f, (GenFunction_2)func_8030E510, SFX_32_BANJO_EGHEE, 28000); - func_8030E510(SFX_3F6_UNKNOWN, 28000); + timedFunc_set_2(0.15f, (GenFunction_2)sfxsource_play, SFX_32_BANJO_EGHEE, 28000); + sfxsource_play(SFX_3F6_UNKNOWN, 28000); func_8030E540(SFX_8F_SNOWBALL_FLYING); break; }//L802C5394 @@ -466,7 +466,7 @@ void func_802C4C14(Actor *this){ subaddie_set_state(this, 3); } }else{//L802C53D0 - func_8030E510(SFX_4F_BANJO_WAHOO, 28000); + sfxsource_play(SFX_4F_BANJO_WAHOO, 28000); subaddie_set_state(this, 3); }//L802C53E8 if(sp84 == 0) diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 84580db7..0f9b7a7a 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -171,7 +171,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { case MARKER_109_BREAKABLE_BRICK_WALL: func_8030E6D4(SFX_114_BRICKWALL_BREAKING); - func_8030E510(SFX_11_WOOD_BREAKING_1, 28000); + sfxsource_play(SFX_11_WOOD_BREAKING_1, 28000); subaddie_set_state_looped(sp2C, 9); fileProgressFlag_set((sp2C->unkF4_8 == 1) ? FILEPROG_C8_LAIR_BRICKWALL_TO_WADINGBOOTS_BROKEN : FILEPROG_C9_LAIR_BRICKWALL_TO_SHOCKJUMP_PAD_BROKEN, TRUE); break; @@ -329,7 +329,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { case 0x164: case 0x165: if (sp2C->unk1C[1] == sp2C->position[1]) { - func_8030E510(SFX_9B_BOULDER_BREAKING_1, 25000); + sfxsource_play(SFX_9B_BOULDER_BREAKING_1, 25000); sp2C->unk1C[0] = 1.0f; } break; diff --git a/src/core2/code_85800.c b/src/core2/code_85800.c index f88a66fb..4a67266b 100644 --- a/src/core2/code_85800.c +++ b/src/core2/code_85800.c @@ -849,12 +849,12 @@ void func_8030E4E4(enum sfx_e uid){ func_8030D6C4(uid, 1.0f, 22000, 0, 0); } -void func_8030E510(enum sfx_e uid, s32 arg1){ - func_8030D6C4(uid, 1.0f, arg1, 0, 2); +void sfxsource_play(enum sfx_e uid, s32 sample_rate){ + func_8030D6C4(uid, 1.0f, sample_rate, 0, 2); } void func_8030E540(enum sfx_e uid){ - func_8030E510(uid, 0x7ff8); + sfxsource_play(uid, 0x7ff8); } void func_8030E560(enum sfx_e uid, s32 arg1){ diff --git a/src/lair/ch/cauldron.c b/src/lair/ch/cauldron.c index 14806538..2c30609e 100644 --- a/src/lair/ch/cauldron.c +++ b/src/lair/ch/cauldron.c @@ -276,7 +276,7 @@ void chWarpCauldron_update(Actor *this) { func_802BAFE4(D_80393620[this->unkF4_8 - 1].unk3); func_802D09B8(this, 2); phi_a0 = (fileProgressFlag_get(chWarpCauldron_getPairedFileProgressFlagIndex(this)) != 0) ? SFX_107_CAULDRON_ACTIVATION_1 : SFX_108_CAULDRON_ACTIVATION_2; - func_8030E510(phi_a0, 32000); + sfxsource_play(phi_a0, 32000); if (!fileProgressFlag_get(FILEPROG_F5_COMPLETED_A_WARP_CAULDRON_SET) && !fileProgressFlag_get(chWarpCauldron_getPairedFileProgressFlagIndex(this))) { func_80311480(0xF79, 4, NULL, NULL, NULL, NULL); }