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

Merge branch 'mr-origin-93'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-19 23:04:50 -05:00
parent d1b41e109d 8d2eeb28e3
commit 9443a276c5
63 changed files with 190 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core2/ba/marker.c
View File

@@ -24,7 +24,7 @@ extern Actor *baModel_80291AAC(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **
extern void baMarker_8028D7B8(s32 arg0, ActorMarker *arg1, struct5Cs *collision_flags);
extern void func_802EE6CC(f32[3], s32, s32[4], s32, f32, f32, s32,s32,s32);
extern void func_80320ED8(ActorMarker *, f32, s32);
extern NodeProp *cubeList_findNodePropByActorId(enum actor_e actor_id, s32 position[3]);
extern NodeProp *cubeList_findNodePropByActorIdAndPosition_s32(enum actor_e actor_id, s32 position[3]);
typedef struct
{
@@ -157,7 +157,7 @@ void __baMarker_8028B9A8(s32 arg0){
NodeProp *tmp_v0;
s32 ideal_yaw[3];
tmp_v0 = cubeList_findNodePropByActorId(0x1F6, 0);
tmp_v0 = cubeList_findNodePropByActorIdAndPosition_s32(0x1F6, NULL);
nodeprop_getPosition_s32(tmp_v0, &ideal_yaw);
func_802CA1CC(arg0);
actor_spawnWithYaw_s32(ACTOR_47_EMPTY_HONEYCOMB, &ideal_yaw, 0);

2
src/core2/bs/bFlap.c
View File

@@ -196,5 +196,5 @@ void bsbflap_end(void) {
baphysics_reset_gravity();
baphysics_reset_terminal_velocity();
func_8029E090(0, 0.2f);
func_8030DA44(D_8037D30C);
sfxsource_freeSfxsourceByIndex(D_8037D30C);
}

4
src/core2/bs/bLongLeg.c
View File

@@ -152,7 +152,7 @@ void bsblongleg_enter_update(void){
void bsblongleg_enter_end(void){
func_802A5404();
func_8030DA44(D_8037D361);
sfxsource_freeSfxsourceByIndex(D_8037D361);
}
void bsblongleg_stand_enter(void){
@@ -308,7 +308,7 @@ void bsblongleg_exit_update(void){
}
void bsblongleg_exit_end(void){
func_8030DA44(D_8037D361);
sfxsource_freeSfxsourceByIndex(D_8037D361);
func_802A5404();
}

2
src/core2/bs/bShock.c
View File

@@ -116,7 +116,7 @@ void bsbshock_charge_update(void){
}
void bsbshock_charge_end(void){
func_8030DA44(D_8037D382);
sfxsource_freeSfxsourceByIndex(D_8037D382);
func_8029E064(0);
func_8029E070(0);
if(baModel_80292230() != 0.0f){

2
src/core2/ch/bigbutt.c
View File

@@ -263,7 +263,7 @@ void func_802C6240(Actor *this){
if (0.0f == this->actor_specific_1_f) {
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
subaddie_set_state_with_direction(this, 1, 0.65f, 1);
func_8030DA44(this->unk44_31);
sfxsource_freeSfxsourceByIndex(this->unk44_31);
this->unk44_31 = 0;
sfxsource_playHighPriority(SFX_19_BANJO_LANDING_08);
}

2
src/core2/ch/gravestone.c
View File

@@ -91,7 +91,7 @@ void func_8035EDB0(f32 position[3], s32 count, enum asset_e sprite) {
void func_8035EE48(Actor *this){
u8 val = this->unk44_31;
if(val != 0){
func_8030DA44(val);
sfxsource_freeSfxsourceByIndex(val);
this->unk44_31 = 0;
}
}

6
src/core2/ch/mole.c
View File

@@ -294,7 +294,7 @@ void chmole_spawnMolehill(ActorMarker *marker){
void func_802D9C90(Actor *this){
u8 tmp_a1 = this->unk44_31;
if(tmp_a1){
func_8030DA44(tmp_a1);
sfxsource_freeSfxsourceByIndex(tmp_a1);
}
}
@@ -413,7 +413,7 @@ void chmole_update(Actor *this){
}//L802DA128
if(actor_animationIsAt(this, 0.9999f)){
chmole_setFacingDirection(this);
func_8030DA44(this->unk44_31);
sfxsource_freeSfxsourceByIndex(this->unk44_31);
this->unk44_31 = 0;
}
else if(actor_animationIsAt(this, 0.14f)){//L802DA154
@@ -466,7 +466,7 @@ void chmole_update(Actor *this){
}
else if(actor_animationIsAt(this, 0.9999f)){//L802DA45C
func_802D9600(this);
func_8030DA44(this->unk44_31);
sfxsource_freeSfxsourceByIndex(this->unk44_31);
this->unk44_31 = 0;
}
break;

2
src/core2/ch/snacker.c
View File

@@ -333,7 +333,7 @@ void chSnacker_spawn(void) {
_player_getPosition(spawn_position);
if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) != 0) {
nodeprop_getPosition(func_80304CAC(0x3CB, spawn_position), spawn_position);
nodeprop_getPosition(nodeprop_findByActorIdAndPosition_f32(ACTOR_3CB_UNKNOWN, spawn_position), spawn_position);
}
else{
spawn_angle_rad = randf2(0.0f, 3.28f);

2
src/core2/ch/soundsource.c
View File

@@ -47,7 +47,7 @@ void func_802D0500(Actor *this){
void func_802D05A0(Actor *this, s32 next_state){
ActorLocal_Core2_49570 *local = (ActorLocal_Core2_49570 *)this->local;
if(this->state == 2 && local->sfxsourceIdx){
func_8030DA44(local->sfxsourceIdx);
sfxsource_freeSfxsourceByIndex(local->sfxsourceIdx);
local->sfxsourceIdx = 0;
}
if(next_state == 2){

14
src/core2/code_126C0.c
View File

@@ -77,7 +77,7 @@ void func_802997E8(void){
if(D_8037C6D0.sfxsourceIdx){
D_8037C6D0.unk4 += time_getDelta();
if(D_8037C6D0.unk8 <= D_8037C6D0.unk4){
func_8030DA44(D_8037C6D0.sfxsourceIdx);
sfxsource_freeSfxsourceByIndex(D_8037C6D0.sfxsourceIdx);
D_8037C6D0.sfxsourceIdx = 0;
}
else{
@@ -127,13 +127,13 @@ void func_80299900(void){
}
void func_80299A20(void){
func_8030DA44(D_8037C6C1);
func_8030DA44(D_8037C6C0);
func_8030DA44(D_8037C6C3);
func_8030DA44(D_8037C6C2);
func_8030DA44(D_8037C6C4);
sfxsource_freeSfxsourceByIndex(D_8037C6C1);
sfxsource_freeSfxsourceByIndex(D_8037C6C0);
sfxsource_freeSfxsourceByIndex(D_8037C6C3);
sfxsource_freeSfxsourceByIndex(D_8037C6C2);
sfxsource_freeSfxsourceByIndex(D_8037C6C4);
if(D_8037C6D0.sfxsourceIdx){
func_8030DA44(D_8037C6D0.sfxsourceIdx);
sfxsource_freeSfxsourceByIndex(D_8037C6D0.sfxsourceIdx);
}
}

2
src/core2/code_16010.c
View File

@@ -19,7 +19,7 @@ bool func_8029CFA0(void){
}
void func_8029CFF8(void){
func_8030DA44(D_8037D210);
sfxsource_freeSfxsourceByIndex(D_8037D210);
}
void func_8029D01C(void){

4
src/core2/code_34790.c
View File

@@ -9,7 +9,7 @@ extern Actor *func_80328230(enum actor_e, f32[3], f32[3]);
extern void func_802BEA4C(f32[3], f32[3], f32, f32[3]);
extern void func_802BEBE8(f32[3], f32[3], f32, f32[3]);
extern void func_802BEAAC(f32[3], f32[3], f32, f32[3], f32[3], f32[3], f32[3]);
extern NodeProp *cubeList_findNodePropByActorId(enum actor_e, s32[3]);
extern NodeProp *cubeList_findNodePropByActorIdAndPosition_s32(enum actor_e, s32[3]);
extern BKCollisionTri *func_80320B98(f32[3], f32[3], f32[3], s32);
f32 func_802BB938(f32[3], f32[3]);
f32 func_802BBD48(void);
@@ -60,7 +60,7 @@ bool func_802BB720(s32 arg0, f32 arg1[3], f32 arg2[3], s32 *arg3) {
if ((arg0 >= 0x5B) && (arg0 < 0x63)) {
arg0 -= 0x40;
}
temp_v0 = cubeList_findNodePropByActorId(D_803657E0[arg0], NULL);
temp_v0 = cubeList_findNodePropByActorIdAndPosition_s32(D_803657E0[arg0], NULL);
if (temp_v0 != NULL) {
nodeprop_getPosition(temp_v0, arg1);
*arg3 = func_80304DB8(temp_v0);

4
src/core2/code_45310.c
View File

@@ -262,7 +262,7 @@ void func_802CCBC8(Actor *this) {
local = (ActorLocal_Core2_45310 * )&this->local;
if(local->unk0 != 0){
func_8030DA44(local->unk0);
sfxsource_freeSfxsourceByIndex(local->unk0);
}
}
@@ -324,7 +324,7 @@ void func_802CCC5C(Actor *this) {
}
if (!subaddie_playerIsWithinSphere(this, 4000)) {
if (local->unk0 != 0) {
func_8030DA44(local->unk0);
sfxsource_freeSfxsourceByIndex(local->unk0);
local->unk0 = 0;
}
} else {

2
src/core2/code_47BD0.c
View File

@@ -385,7 +385,7 @@ void chBeeSwarm_update(Actor *this) {
return;
if (!subaddie_playerIsWithinSphere(this, 0x5DC)) {
if ((u8)this->unk44_31 != 0) {
func_8030DA44(this->unk44_31);
sfxsource_freeSfxsourceByIndex(this->unk44_31);
this->unk44_31 = 0;
D_8037DCBC = 0;
}

2
src/core2/code_4A6F0.c
View File

@@ -105,7 +105,7 @@ bool chMumbo_withinHorzDistToPlayer(s32 x, s32 z, s32 dist) {
bool chMumbo_func_802D181C(s32 arg0) {
s32 search_start_cube[3] = D_80367504;
return BOOL(cubeList_findNodePropByActorId(arg0, search_start_cube));
return BOOL(cubeList_findNodePropByActorIdAndPosition_s32(arg0, search_start_cube));
}
void chMumbo_func_802D186C(Actor *this) {

6
src/core2/code_66FB0.c
View File

@@ -23,14 +23,14 @@ s32 D_80368860[] = {
};
s32 D_8036889C[] = {
0x608,
ASSET_608_UNKNOWN,
ASSET_702_SPRITE_UNKNOWN,
0x712,
ASSET_712_SPRITE_SPARKLE_GREEN,
ASSET_713_SPRITE_SPARKLE_YELLOW,
ASSET_717_SPRITE_SPARKLE_YELLOW_2,
ASSET_710_SPRITE_SPARKLE_PURPLE,
ASSET_711_SPRITE_SPARKLE_DARK_BLUE,
0x714,
ASSET_714_SPRITE_UNKNOWN,
ASSET_715_SPRITE_SPARKLE_RED,
ASSET_716_SPRITE_SPARKLE_WHITE,
ASSET_718_SPRITE_SPARKLE_WHITE_2,

2
src/core2/code_6D270.c
View File

@@ -49,7 +49,7 @@ ParticleEmitter *func_802F4274(f32 arg0[3]) {
if (sp20 != 0) {
func_802EFAB0(temp_v0, sp20, sp2C[1]);
}
particleEmitter_setSprite(temp_v0, 0x42A);
particleEmitter_setSprite(temp_v0, ASSET_42A_UNKNOWN);
particleEmitter_setAlpha(temp_v0, 0xFF);
particleEmitter_setFade(temp_v0, 0, 0.78f);
particleEmitter_setStartingFrameRange(temp_v0, 0, 0);

4
src/core2/code_6D490.c
View File

@@ -155,8 +155,8 @@ void func_802F46F4(Struct5Ds *this){
}
void func_802F4798(Struct5Ds *this){
func_8030DA44(this->unk1C);
func_8030DA44(this->unk1D);
sfxsource_freeSfxsourceByIndex(this->unk1C);
sfxsource_freeSfxsourceByIndex(this->unk1D);
free(this);
}

8
src/core2/code_7060.c
View File

@@ -98,8 +98,8 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
case 1:
sp68 = 1;
ml_vec3f_copy(sp40, sp7C);
nodeprop_getPosition(func_80304CAC(0x156, sp40), sp58);
nodeprop_getPosition(func_80304CAC(0x157, sp40), sp4C);
nodeprop_getPosition(nodeprop_findByActorIdAndPosition_f32(ACTOR_156_UNKNOWN, sp40), sp58);
nodeprop_getPosition(nodeprop_findByActorIdAndPosition_f32(ACTOR_157_UNKNOWN, sp40), sp4C);
sp40[0] = ((sp4C[0] - sp58[0]) * D_8037BFB0[0]) + sp58[0];
sp40[2] = ((sp4C[2] - sp58[2]) * D_8037BFB0[1]) + sp58[2];
ml_vec3f_copy(sp7C, sp40);
@@ -107,8 +107,8 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
case 2:
sp64 = 1;
ml_vec3f_copy(sp1C, sp7C);
nodeprop_getPosition(func_80304CAC(0x154, sp1C), sp34);
nodeprop_getPosition(func_80304CAC(0x155, sp1C), sp28);
nodeprop_getPosition(nodeprop_findByActorIdAndPosition_f32(ACTOR_154_UNKNOWN, sp1C), sp34);
nodeprop_getPosition(nodeprop_findByActorIdAndPosition_f32(ACTOR_155_UNKNOWN, sp1C), sp28);
sp1C[1] = ((sp28[1] - sp34[1]) * D_8037BFB0[0]) + sp34[1];
ml_vec3f_copy(sp7C, sp1C);
break;

2
src/core2/code_72B10.c
View File

@@ -86,7 +86,7 @@ void func_802F9D38(s32 arg0){
ptr = vector_at(D_803810A0, arg0);
if(ptr->unk0){
func_8030E394(ptr->unk0);
func_8030DA44(ptr->unk0);
sfxsource_freeSfxsourceByIndex(ptr->unk0);
ptr->unk0 = 0;
}
}

56
src/core2/code_7AF80.c
View File

@@ -32,7 +32,7 @@ typedef struct {
Struct_core2_7AF80_2 *unk8;
} Struct_core2_7AF80_1;
NodeProp *cubeList_findNodePropByActorId(enum actor_e actor_id, s32 arg1[3]);
NodeProp *cubeList_findNodePropByActorIdAndPosition_s32(enum actor_e actor_id, s32 arg1[3]);
s32 func_80304FC4(enum actor_e *actor_id_list, NodeProp **node_list, s32 arg2);
void cube_positionToIndices(s32 arg0[3], f32 arg1[3]);
NodeProp *func_803080C8(s32 arg0);
@@ -932,18 +932,18 @@ s32 func_803048E0(s32 arg0[3], s32 arg1[3], s32 arg2, s32 arg3, s32 arg4) {
return func_8032F170(arg1, arg2);
}
s32 func_80304984(s32 arg0, u32 *arg1) {
NodeProp *temp_v0;
s32 func_80304984(s32 actor_id, u32 *arg1) {
NodeProp *temp_v0 = cubeList_findNodePropByActorIdAndPosition_s32(actor_id, NULL);
temp_v0 = cubeList_findNodePropByActorId(arg0, 0);
if (temp_v0 != 0) {
*arg1 = temp_v0->unk6.radius;
return 1;
}
return 0;
}
NodeProp *cubeList_findNodePropByActorId(enum actor_e actor_id, s32 position[3]) {
NodeProp *cubeList_findNodePropByActorIdAndPosition_s32(enum actor_e actor_id, s32 position[3]) {
s32 cube_indices[3];
s32 i;
f32 position_f32[3];
@@ -995,42 +995,42 @@ NodeProp *cubeList_findNodePropByActorId(enum actor_e actor_id, s32 position[3])
return NULL;
}
NodeProp *nodeprop_findByActorIdAndActorPosition(enum actor_e actor_id, Actor *actor){
s32 tmp_position[3];
NodeProp *nodeprop_findByActorIdAndActorPosition(enum actor_e actor_id, Actor *actor_ptr) {
s32 pos_s32[3];
s32 *position;
if (actor != NULL) {
tmp_position[0] = actor->position_x;
tmp_position[1] = actor->position_y;
tmp_position[2] = actor->position_z;
if (actor_ptr != NULL) {
pos_s32[0] = actor_ptr->position_x;
pos_s32[1] = actor_ptr->position_y;
pos_s32[2] = actor_ptr->position_z;
}
if (actor == NULL) {
if (actor_ptr == NULL) {
position = NULL;
}
else {
position = tmp_position;
position = pos_s32;
}
return cubeList_findNodePropByActorId(actor_id, position);
return cubeList_findNodePropByActorIdAndPosition_s32(actor_id, position);
}
NodeProp *func_80304CAC(s32 arg0, f32 *arg1) {
s32 vec[3];
NodeProp *nodeprop_findByActorIdAndPosition_f32(enum actor_e actor_id, f32 *position) {
s32 pos_s32[3];
vec[0] = (s32)arg1[0];
vec[1] = (s32)arg1[1];
vec[2] = (s32)arg1[2];
return cubeList_findNodePropByActorId(arg0, vec);
pos_s32[0] = (s32) position[0];
pos_s32[1] = (s32) position[1];
pos_s32[2] = (s32) position[2];
return cubeList_findNodePropByActorIdAndPosition_s32(actor_id, pos_s32);
}
NodeProp *func_80304D04(s32 arg0, s16 *arg1) {
s32 arr[3];
NodeProp *nodeprop_findByActorIdAndPosition_s16(enum actor_e actor_id, s16 *position) {
s32 pos_s32[3];
arr[0] = (s32)arg1[0];
arr[1] = (s32)arg1[1];
arr[2] = (s32)arg1[2];
return cubeList_findNodePropByActorId(arg0, arr);
pos_s32[0] = (s32) position[0];
pos_s32[1] = (s32) position[1];
pos_s32[2] = (s32) position[2];
return cubeList_findNodePropByActorIdAndPosition_s32(actor_id, pos_s32);
}
s32 nodeprop_getRadius(NodeProp *arg0) {
@@ -1056,7 +1056,7 @@ s32 func_80304DB8(NodeProp *arg0) {
bool _nodeProp_findPositionFromActorId(enum actor_e actor_id, s32 *position) {
NodeProp *node_prop;
node_prop = cubeList_findNodePropByActorId(actor_id, NULL);
node_prop = cubeList_findNodePropByActorIdAndPosition_s32(actor_id, NULL);
if (node_prop != 0) {
position[0] = (s32) node_prop->x;
position[1] = (s32) node_prop->y;
@@ -1187,7 +1187,7 @@ bool func_80305290(bool (* arg0)(NodeProp *), bool (* arg1)(Prop *)){
bool func_80305344(s32 arg0, u32 *arg1) {
NodeProp *temp_v0;
temp_v0 = cubeList_findNodePropByActorId(arg0, NULL);
temp_v0 = cubeList_findNodePropByActorIdAndPosition_s32(arg0, NULL);
if (temp_v0 != NULL) {
*arg1 = temp_v0->unkC_31;
return 1;

8
src/core2/code_85800.c
View File

@@ -358,7 +358,7 @@ void func_8030D310(u8 indx){
switch(func_8030C7E8(ptr)){
case 1://L8030D468
if( func_8030C814(ptr, 0) || (func_8030C814(ptr, 1) && !ptr->unk40))
func_8030DA44(indx);
sfxsource_freeSfxsourceByIndex(indx);
break;
case 2://L8030D4A4
if(func_8030C814(ptr, 1) && sfxsource_isFlagCleared(ptr, 1))
@@ -444,7 +444,7 @@ void func_8030D778(void){
int temp_s1;
for(i = 1; i < 35; i++){
if(sfxsources[i].busy)
func_8030DA44(i);
sfxsource_freeSfxsourceByIndex(i);
}
do{
temp_s1 = 0;
@@ -511,8 +511,8 @@ u8 sfxsource_createSfxsourceAndReturnIndex(void){
return s1;
}
void func_8030DA44(u8 indx){
SfxSource * sp1C = sfxsource_at(indx);
void sfxsource_freeSfxsourceByIndex(u8 indx) {
SfxSource *sp1C = sfxsource_at(indx);
func_8030E394(indx);
func_8030C7F8(sp1C, 3);
}

4
src/core2/code_956B0.c
View File

@@ -737,8 +737,8 @@ void func_8031E204(NodeProp *node, s32 arg1, s32 arg2){
f32 sp28[3];
f32 sp1C[3];
nodeprop_getPosition(func_80304D04(0x154, &node->x), sp34);
nodeprop_getPosition(func_80304D04(0x155, &node->x), sp28);
nodeprop_getPosition(nodeprop_findByActorIdAndPosition_s16(ACTOR_154_UNKNOWN, &node->x), sp34);
nodeprop_getPosition(nodeprop_findByActorIdAndPosition_s16(ACTOR_155_UNKNOWN, &node->x), sp28);
player_getPosition(sp1C);
if(sp28[1] < sp1C[1]){
sp1C[1] = sp28[1];

2
src/core2/code_9900.c
View File

@@ -44,7 +44,7 @@ f32 func_80290920(f32 arg0, f32 arg1, f32 arg2){
}
void func_8029099C(void){
func_8030DA44(D_8037C040);
sfxsource_freeSfxsourceByIndex(D_8037C040);
D_8037C040 = 0;
}

2
src/core2/code_9B180.c
View File

@@ -130,7 +130,7 @@ void func_803223AC(void) {
func_80244A98(1);
for(i_ptr = D_8036DE00; i_ptr != &D_8036DE00[6]; i_ptr++){
i_ptr->unk4 = cubeList_findNodePropByActorId(i_ptr->unk0, 0);
i_ptr->unk4 = cubeList_findNodePropByActorIdAndPosition_s32(i_ptr->unk0, NULL);
if(i_ptr->unk4 != 0 && i_ptr->unk8 != NULL){
i_ptr->unk8(i_ptr);
}

2
src/core2/code_9C170.c
View File

@@ -31,7 +31,7 @@ void func_80323190(void){
}
void func_803231E8(void){
func_8030DA44(D_80383370);
sfxsource_freeSfxsourceByIndex(D_80383370);
}
void func_8032320C(void){

2
src/core2/code_9E370.c
View File

@@ -376,7 +376,7 @@ void func_80325FE8(Actor *this) {
}
temp_v0 = this->unk44_31;
if (temp_v0 != 0) {
func_8030DA44(temp_v0);
sfxsource_freeSfxsourceByIndex(temp_v0);
}
this->animctrl = NULL;
this->unk44_31 = 0;

8
src/core2/code_B9770.c
View File

@@ -528,7 +528,7 @@ void func_80341A54(void) {
for(var_s0 = 0; var_s0 < 0x40; var_s0++){
if (D_803858A0[var_s0] != 0) {
func_8030DA44(D_803858A0[var_s0]);
sfxsource_freeSfxsourceByIndex(D_803858A0[var_s0]);
}
}
@@ -801,7 +801,7 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, SplineList *arg2){
sfxsource_setSampleRate(sfxsourceIdx, sp74);
func_8030E2C4(sfxsourceIdx);
if (D_803858A0[sp70] != 0){
func_8030DA44(D_803858A0[sp70]);
sfxsource_freeSfxsourceByIndex(D_803858A0[sp70]);
}
D_803858A0[sp70] = sfxsourceIdx;
} else {
@@ -836,7 +836,7 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, SplineList *arg2){
case 5:
if (D_803858A0[arg1->t0.unk10.common.bit7] != 0){
func_8030DA44(D_803858A0[arg1->t0.unk10.common.bit7]);
sfxsource_freeSfxsourceByIndex(D_803858A0[arg1->t0.unk10.common.bit7]);
D_803858A0[arg1->t0.unk10.common.bit7] = 0;
}
break;
@@ -1274,7 +1274,7 @@ void func_80343E20(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
sfxsource_setSampleRate(temp_v0, arg1);
func_8030E2C4(temp_v0);
if (D_803858A0[arg3] != 0) {
func_8030DA44(D_803858A0[arg3]);
sfxsource_freeSfxsourceByIndex(D_803858A0[arg3]);
}
D_803858A0[arg3] = temp_v0;
}

4
src/core2/code_C62B0.c
View File

@@ -127,7 +127,7 @@ bool func_8034DC80(Struct6Ds *arg0, f32 arg1[3]) {
void func_8034DD48(Struct6Ds *arg0){
if(arg0->unk0 != 0){
func_8030DA44(arg0->unk0);
sfxsource_freeSfxsourceByIndex(arg0->unk0);
}
}
@@ -359,7 +359,7 @@ void func_8034E26C(Struct6Ds *arg0, BKModel *model, s32 mesh_id) {
arg0->unk10(arg0);
}
if (arg0->unk0 != 0) {
func_8030DA44(arg0->unk0);
sfxsource_freeSfxsourceByIndex(arg0->unk0);
arg0->unk0 = 0;
}
}

2
src/core2/code_C8760.c
View File

@@ -21,7 +21,7 @@ void func_8034F6F0(Gfx **gdl, Mtx **mptr, s32 vptr){
void func_8034F734(void){
if(D_803720A0.unk0){
func_8030DA44(D_803720A0.sfxsourceIdx);
sfxsource_freeSfxsourceByIndex(D_803720A0.sfxsourceIdx);
particleEmitter_free(D_803720A0.unk0);
}
}

2
src/core2/code_C9F00.c
View File

@@ -345,7 +345,7 @@ void func_803518E8(void){
void func_80351954(Struct68s *arg0){
if(arg0->unk0){
func_8030E394(arg0->unk0);
func_8030DA44(arg0->unk0);
sfxsource_freeSfxsourceByIndex(arg0->unk0);
arg0->unk0 = 0;
}
}

4
src/core2/code_D0CA0.c
View File

@@ -221,7 +221,7 @@ void func_80358490(Actor *this) {
local = (ActorLocal_core2_D0CA0 *)&this->local;
if(local->sfxsourceIdx != 0){
func_8030DA44(local->sfxsourceIdx);
sfxsource_freeSfxsourceByIndex(local->sfxsourceIdx);
}
}
@@ -307,7 +307,7 @@ void func_80358684(Actor *this) {
if (!subaddie_playerIsWithinSphere(this, 4000)) {
if (local->sfxsourceIdx != 0) {
func_8030DA44(local->sfxsourceIdx);
sfxsource_freeSfxsourceByIndex(local->sfxsourceIdx);
local->sfxsourceIdx = 0U;
}
return;

18
src/core2/code_DB010.c
View File

@@ -62,7 +62,7 @@ void func_80362084(f32 position[3]) {
ParticleEmitter *pCtrl;
pCtrl = partEmitMgr_newEmitter(1U);
particleEmitter_setSprite(pCtrl, 0x702);
particleEmitter_setSprite(pCtrl, ASSET_702_SPRITE_UNKNOWN);
particleEmitter_setStartingFrameRange(pCtrl, 3, 5);
particleEmitter_setRGB(pCtrl, D_8037337C);
particleEmitter_setAlpha(pCtrl, 0xA0);
@@ -86,7 +86,7 @@ void func_8036215C(f32 arg0[3]) {
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(0xFU);
particleEmitter_setSprite(pCtrl, 0x700);
particleEmitter_setSprite(pCtrl, ASSET_700_SPRITE_DUST);
particleEmitter_setStartingFrameRange(pCtrl, 3, 4);
particleEmitter_setRGB(pCtrl, D_803733E8);
particleEmitter_setAlpha(pCtrl, 0x28);
@@ -105,7 +105,7 @@ void func_803621F0(f32 arg0[3]) {
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(0x12U);
particleEmitter_setSprite(pCtrl, 0x702);
particleEmitter_setSprite(pCtrl, ASSET_702_SPRITE_UNKNOWN);
particleEmitter_setStartingFrameRange(pCtrl, 3, 5);
particleEmitter_setAlpha(pCtrl, 0xD2);
particleEmitter_setPosition(pCtrl, arg0);
@@ -162,7 +162,7 @@ void func_80362404(f32 arg0[3]) {
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1U);
particleEmitter_setSprite(pCtrl, 0x6DD);
particleEmitter_setSprite(pCtrl, ASSET_6DD_UNKNOWN);
particleEmitter_setStartingFrameRange(pCtrl, 2, 2);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_80373604);
@@ -179,7 +179,7 @@ void func_8036247C(f32 arg0[3]) {
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1U);
particleEmitter_setSprite(pCtrl, 0x70D);
particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1);
particleEmitter_setStartingFrameRange(pCtrl, 1, 6);
particleEmitter_setRGB(pCtrl, &D_80373634);
particleEmitter_setAlpha(pCtrl, 0x64);
@@ -196,7 +196,7 @@ void func_80362510(Actor *actor) {
f32 sp30[3];
pCtrl = partEmitMgr_newEmitter(0x19U);
particleEmitter_setSprite(pCtrl, 0x70D);
particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1);
particleEmitter_setStartingFrameRange(pCtrl, 0, 5);
particleEmitter_setRGB(pCtrl, D_803736A0);
particleEmitter_setAlpha(pCtrl, 0x1E);
@@ -224,7 +224,7 @@ void func_80362680(f32 arg0[3]) {
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1U);
particleEmitter_setSprite(pCtrl, 0x45A);
particleEmitter_setSprite(pCtrl, ASSET_45A_SPRITE_GREEN_GLOW);
particleEmitter_setStartingFrameRange(pCtrl, 2, 2);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8037370C);
@@ -241,7 +241,7 @@ void func_803626F8(f32 arg0[3]) {
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1U);
particleEmitter_setSprite(pCtrl, 0x713);
particleEmitter_setSprite(pCtrl, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setStartingFrameRange(pCtrl, 1, 6);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8037376C);
@@ -259,7 +259,7 @@ void func_80362770(f32 arg0[3]) {
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(0x10U);
particleEmitter_setSprite(pCtrl, 0x714);
particleEmitter_setSprite(pCtrl, ASSET_714_SPRITE_UNKNOWN);
particleEmitter_setStartingFrameRange(pCtrl, 7, 8);
particleEmitter_setRGB(pCtrl, &D_803737B4);
particleEmitter_setPosition(pCtrl, arg0);

4
src/core2/gc/zoombox.c
View File

@@ -429,7 +429,7 @@ s32 D_8036D924[] = { 70, 35, 18, 9, 4, 2, 1};
/* .bss */
char D_803830B0[0x30];
void func_8030DA44(u8);
void sfxsource_freeSfxsourceByIndex(u8);
void func_80338338(s32, s32, s32);
void func_803382FC(u8);
@@ -443,7 +443,7 @@ void func_80315200(GcZoombox *this){
}else{
for(s1 =0; s1 < 5; s1++){
if(this->unk108[s1]){
func_8030DA44(this->unk108[s1]);
sfxsource_freeSfxsourceByIndex(this->unk108[s1]);
this->sfx_count--;
}
}

2
src/core2/nc/dynamicCam12.c
View File

@@ -231,7 +231,7 @@ void func_802C16CC(s32 arg0) {
if(sp38 != D_8037DBE0.unk28 && D_8037DBE0.unk28 != -1){
player_getPosition(sp54);
ml_vec3f_to_vec3w(sp48, sp54);
sp30 = cubeList_findNodePropByActorId(sp38, sp48);
sp30 = cubeList_findNodePropByActorIdAndPosition_s32(sp38, sp48);
if(sp30 != NULL) {
nodeprop_getPosition(sp30, sp54);
switch (func_80304DB8(sp30)) { /* irregular */