refac: rename func_8030D90C to sfxsource_createSfxsourceAndReturnIndex and func_8030DBB4 to sfxsource_playSfxAtVolume
Additionally rename properties/variables assigned by sfxsource_createSfxsourceAndReturnIndex to sfxsourceIdx
This commit is contained in:
@@ -261,7 +261,7 @@ void func_80388F90(Actor *this){
|
||||
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
|
||||
|
||||
func_8030DB04(this->unk44_31, 32000, this->position, 1000.0f, 4000.0f);
|
||||
func_8030DBB4(this->unk44_31, local->unk8);
|
||||
sfxsource_playSfxAtVolume(this->unk44_31, local->unk8);
|
||||
func_8030E2C4(this->unk44_31);
|
||||
}
|
||||
|
||||
|
@@ -68,7 +68,7 @@ void __chXmasTree_spawnStar(void *marker){
|
||||
void __chXmasTree_80387038(Actor *this){
|
||||
if(func_8030E3FC(this->unk44_31))
|
||||
func_8030E394(this->unk44_31);
|
||||
func_8030DBB4(this->unk44_31, randf2(0.9f, 1.1f));
|
||||
sfxsource_playSfxAtVolume(this->unk44_31, randf2(0.9f, 1.1f));
|
||||
func_8030E2C4(this->unk44_31);
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ void chXmasTree_update(Actor *this){
|
||||
this->marker->collidable = FALSE;
|
||||
marker_setFreeMethod(this->marker, __chXmasTree_free);
|
||||
if(this->unk44_31 == 0){
|
||||
this->unk44_31 = func_8030D90C();
|
||||
this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex();
|
||||
sfxsource_setSfxId(this->unk44_31, SFX_415_UNKNOWN);
|
||||
func_8030DD14(this->unk44_31, 3);
|
||||
sfxsource_setSampleRate(this->unk44_31, 28000);
|
||||
|
@@ -3,7 +3,7 @@
|
||||
#include "variables.h"
|
||||
|
||||
struct {
|
||||
u8 unk0;
|
||||
u8 sfxsourceIdx;
|
||||
f32 unk4[3];
|
||||
} D_803935E0;
|
||||
|
||||
@@ -11,8 +11,8 @@ struct {
|
||||
void func_803918C0(void){
|
||||
Actor *actor;
|
||||
if(map_get() == MAP_7F_FP_WOZZAS_CAVE){
|
||||
D_803935E0.unk0 = func_8030ED2C(SFX_128_FIRE_CRACKING, 2);
|
||||
func_8030DBB4(D_803935E0.unk0, 1.0f);
|
||||
D_803935E0.sfxsourceIdx = func_8030ED2C(SFX_128_FIRE_CRACKING, 2);
|
||||
sfxsource_playSfxAtVolume(D_803935E0.sfxsourceIdx, 1.0f);
|
||||
actor = actorArray_findActorFromActorId(0x353);
|
||||
if(actor){
|
||||
D_803935E0.unk4[0] = actor->position_x;
|
||||
@@ -26,15 +26,15 @@ void func_803918C0(void){
|
||||
}
|
||||
|
||||
void func_8039195C(void){
|
||||
if(D_803935E0.unk0){
|
||||
func_8030DA44(D_803935E0.unk0);
|
||||
D_803935E0.unk0 = 0;
|
||||
if(D_803935E0.sfxsourceIdx){
|
||||
func_8030DA44(D_803935E0.sfxsourceIdx);
|
||||
D_803935E0.sfxsourceIdx = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void func_80391994(void){
|
||||
if(map_get() == MAP_7F_FP_WOZZAS_CAVE){
|
||||
func_8030DB04(D_803935E0.unk0, 22000, D_803935E0.unk4, 400.0f, 1200.0f);
|
||||
func_8030E2C4(D_803935E0.unk0);
|
||||
func_8030DB04(D_803935E0.sfxsourceIdx, 22000, D_803935E0.unk4, 400.0f, 1200.0f);
|
||||
func_8030E2C4(D_803935E0.sfxsourceIdx);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user