kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

refac: rename func_8030D90C to sfxsource_createSfxsourceAndReturnIndex and func_8030DBB4 to sfxsource_playSfxAtVolume

Browse Source 
Additionally rename properties/variables assigned by sfxsource_createSfxsourceAndReturnIndex to sfxsourceIdx
This commit is contained in:
Bl00D4NGEL
2024-09-22 03:10:19 +02:00
parent fbe20325c2
commit 9bd6988f99
55 changed files with 297 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/CCW/code_14B0.c
View File

@@ -13,7 +13,7 @@ typedef struct{
}Struct_CCW_14B0_0;
typedef struct {
u8 unk0;
u8 sfxsourceIdx;
// u8 pad1[3];
Struct_CCW_14B0_0 *unk4;
f32 unk8;
@@ -55,7 +55,7 @@ void func_803878A0(Actor *this, s32 next_state) {
void CCW_func_80387A20(Actor *this){
ActorLocal_CCW_14B0 *local = (ActorLocal_CCW_14B0 *)&this->local;
func_8030DA44(local->unk0);
func_8030DA44(local->sfxsourceIdx);
}
void CCW_func_80387A40(Actor *this) {
@@ -76,12 +76,12 @@ void CCW_func_80387A40(Actor *this) {
while((local->unk4->unk0 != 0) && (map_get() != local->unk4->unk0)) {
local->unk4++;
}
local->unk0 = func_8030D90C();
local->sfxsourceIdx = sfxsource_createSfxsourceAndReturnIndex();
local->unk18[0] = local->unk18[1] = local->unk18[2] = 0.0f;
sfxsource_setSfxId(local->unk0, 0x3FA);
func_8030DD14(local->unk0, 2);
func_8030DBB4(local->unk0, 0.9f);
sfxsource_setSampleRate(local->unk0, 0);
sfxsource_setSfxId(local->sfxsourceIdx, 0x3FA);
func_8030DD14(local->sfxsourceIdx, 2);
sfxsource_playSfxAtVolume(local->sfxsourceIdx, 0.9f);
sfxsource_setSampleRate(local->sfxsourceIdx, 0);
func_803878A0(this, 1);
return;
}
@@ -113,11 +113,11 @@ void CCW_func_80387A40(Actor *this) {
if(this->position[0]);
func_8030DBFC(local->unk0, 0.8f, 0.9f, 0.05f);
sfxsource_set_fade_distances(local->unk0, 500.0f, 1500.0f);
sfxsource_set_position(local->unk0, this->position);
func_8030E2C4(local->unk0);
sfxsource_setSampleRate(local->unk0, 2000.0f + 8000.0f*(gu_sqrtf(local->unk18[0]*local->unk18[0] + local->unk18[1]*local->unk18[1] + local->unk18[2]*local->unk18[2])/ local->unk8));
func_8030DBFC(local->sfxsourceIdx, 0.8f, 0.9f, 0.05f);
sfxsource_set_fade_distances(local->sfxsourceIdx, 500.0f, 1500.0f);
sfxsource_set_position(local->sfxsourceIdx, this->position);
func_8030E2C4(local->sfxsourceIdx);
sfxsource_setSampleRate(local->sfxsourceIdx, 2000.0f + 8000.0f*(gu_sqrtf(local->unk18[0]*local->unk18[0] + local->unk18[1]*local->unk18[1] + local->unk18[2]*local->unk18[2])/ local->unk8));
if (!mapSpecificFlags_get(local->unk4->unk2)) {
player_getPosition(sp44);
if (sp44[2] > -600.0f) {

2
src/CCW/code_2B00.c
View File

@@ -111,7 +111,7 @@ void func_803891B0(void* marker) {
actor->unk44_31 = func_8030ED2C(SFX_3EC_CCW_DOOR_OPENING, 3);
func_8030DD90(actor->unk44_31, 0);
sfxsource_setSampleRate(actor->unk44_31, 0x2AF8);
func_8030DBB4(actor->unk44_31, 0.3f);
sfxsource_playSfxAtVolume(actor->unk44_31, 0.3f);
func_8030E2C4(actor->unk44_31);
}

26
src/CCW/code_950.c
View File

@@ -5,7 +5,7 @@
extern void func_8030DBFC(u8, f32, f32, f32);
typedef struct{
u8 unk0;
u8 sfxsourceIdx;
//u8 pad1[3];
ActorMarker *unk4;
f32 unk8[3];
@@ -91,7 +91,7 @@ void func_8038717C(Actor *this){
ActorLocal_CCW_950 *local;
local = (ActorLocal_CCW_950 *)&this->local;
func_8030DA44(local->unk0);
func_8030DA44(local->sfxsourceIdx);
}
void chwasp_update(Actor *this) {
@@ -113,13 +113,13 @@ void chwasp_update(Actor *this) {
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = func_8038717C;
local->unk0 = func_8030D90C();
local->sfxsourceIdx = sfxsource_createSfxsourceAndReturnIndex();
local->unk4 = 0;
local->unk14 = 1000.0f;
sfxsource_setSfxId(local->unk0, 0x3FA);
func_8030DD14(local->unk0, 2);
func_8030DBB4(local->unk0, 0.9f);
sfxsource_setSampleRate(local->unk0, 0);
sfxsource_setSfxId(local->sfxsourceIdx, 0x3FA);
func_8030DD14(local->sfxsourceIdx, 2);
sfxsource_playSfxAtVolume(local->sfxsourceIdx, 0.9f);
sfxsource_setSampleRate(local->sfxsourceIdx, 0);
marker_setCollisionScripts(this->marker, func_80387124, NULL, CCW_func_80387150);
chwasp_setState(this, 1);
return;
@@ -204,12 +204,12 @@ void chwasp_update(Actor *this) {
if(this->state);
if (this->state == 2) {
func_8030DBFC(local->unk0, 1.0f, 1.1f, 0.05f);
func_8030DBFC(local->sfxsourceIdx, 1.0f, 1.1f, 0.05f);
} else {
func_8030DBFC(local->unk0, 0.8f, 0.9f, 0.05f);
func_8030DBFC(local->sfxsourceIdx, 0.8f, 0.9f, 0.05f);
}
sfxsource_set_fade_distances(local->unk0, 500.0f, 1500.0f);
sfxsource_set_position(local->unk0, this->position);
func_8030E2C4(local->unk0);
sfxsource_setSampleRate(local->unk0, (s32) ((local->unk18 / local->unk14) * 10000.0f));
sfxsource_set_fade_distances(local->sfxsourceIdx, 500.0f, 1500.0f);
sfxsource_set_position(local->sfxsourceIdx, this->position);
func_8030E2C4(local->sfxsourceIdx);
sfxsource_setSampleRate(local->sfxsourceIdx, (s32) ((local->unk18 / local->unk14) * 10000.0f));
}