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

refac: rename func_8025A70C to comusic_playTrack

Browse Source
This commit is contained in:
Bl00D4NGEL
2024-09-09 23:05:11 +02:00
parent b77274c9ea
commit 345c41152c
24 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MMM/code_DC0.c
View File

@@ -82,11 +82,11 @@ bool MMM_func_80387340(ActorMarker *marker){
if(sp1C == 0){
ml_vec3f_copy(sp20, actor->position);
sp20[1] += 80.0f;
func_8025A70C(COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
comusic_playTrack(COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
jiggy_spawn(JIGGY_63_MMM_FLOWER_POTS, sp20);
}
else{
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
}
}
func_803871D4(sp1C);

2
src/SM/code_2990.c
View File

@@ -199,7 +199,7 @@ static void __chsmmole_additionalAbilityLearnActions(ActorMarker *marker, enum a
timed_setStaticCameraToNode(0.0f, 0x12);
break;
case 6:
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
break;
case 0xff:
chsmmole_setSpiralMountainStaticCamera(actor);

4
src/TTC/ch/leaky.c
View File

@@ -41,7 +41,7 @@ void chLeaky_update(Actor *this) {
this->marker->propPtr->unk8_3 = FALSE;
if (levelSpecificFlags_get(5) != 0) {
levelSpecificFlags_set(5, FALSE);
timedFunc_set_1(0.5f, (GenFunction_1)func_8025A70C, COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
timedFunc_set_1(0.5f, (GenFunction_1)comusic_playTrack, COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
}
if (levelSpecificFlags_get(2) != 0) {
temp_v0_2 = func_8034C5AC(300);
@@ -104,7 +104,7 @@ bool chLeaky_eggCollision(ActorMarker *marker){
if(levelSpecificFlags_get(2))
return TRUE;
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
this->unk38_31++;
if(this->unk38_31 < 2)
return TRUE;

4
src/core1/code_1BE90.c
View File

@@ -410,7 +410,7 @@ void func_8025A6EC(enum comusic_e track_id, s32 arg1){
}
//comusic_queueTrack
void func_8025A70C(enum comusic_e track_id){
void comusic_playTrack(enum comusic_e track_id){
CoMusic *trackPtr;
s32 indx;
@@ -430,7 +430,7 @@ void func_8025A70C(enum comusic_e track_id){
}
void func_8025A788(enum comusic_e comusic_id, f32 delay1, f32 delay2){
timedFunc_set_1(delay1, (GenFunction_1) func_8025A70C, comusic_id);
timedFunc_set_1(delay1, (GenFunction_1) comusic_playTrack, comusic_id);
timedFunc_set_1(delay1 + delay2, (GenFunction_1) func_8025A7DC, comusic_id);
}

2
src/core2/abilityprogress.c
View File

@@ -64,7 +64,7 @@ void ability_use(s32 arg0){
break;
}//L80295744
if(sp28)
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
if(sp2C)
func_80311480(sp2C, 4, NULL, NULL, NULL, 0);

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

@@ -622,7 +622,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
sns_set_item_and_update_payload(SNS_ITEM_EGG_PINK, 0, 1);
break;
}
func_8025A70C(COMUSIC_88_BIG_SNS_FANFARE);
comusic_playTrack(COMUSIC_88_BIG_SNS_FANFARE);
FUNC_8030E624(SFX_114_BRICKWALL_BREAKING, 0.8f, 15000);
tmp_v0_2 = 3*(actor->unkF4_8 - 1);
@@ -666,7 +666,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
break;
case MARKER_168_ICE_KEY: //L8028CC7C
sns_set_item_and_update_payload(SNS_ITEM_ICE_KEY, 0, 1);
func_8025A70C(COMUSIC_88_BIG_SNS_FANFARE);
comusic_playTrack(COMUSIC_88_BIG_SNS_FANFARE);
func_80324DBC(2.5f, 0xDB5, 0x20, 0, 0, 0, 0);
marker_despawn(marker);
break;

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

@@ -16,7 +16,7 @@ void func_802B6270(void){
yaw_setIdeal(func_8029B41C() + 35.0f);
ncDynamicCamD_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
func_8029E070(1);
baMarker_collisionOff();
@@ -57,7 +57,7 @@ void func_802B63F8(void){
yaw_setIdeal(func_8029B41C() + 35.0f);
ncDynamicCamD_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
baMarker_collisionOff();
func_8029E3C0(0, 2.9f);

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

@@ -468,7 +468,7 @@ void bswalrus_die_init(void){
ncDynamicCamD_func_802BF2C0(30.0f);
func_8025AB00();
func_8025A2FC(0, 0xfa0);
func_8025A70C(0x1A);
comusic_playTrack(0x1A);
baMarker_collisionOff();
func_80292E48();
func_8029E3C0(0, 1.5f);
@@ -731,7 +731,7 @@ void bswalrus_timeout_init(void) {
func_802914CC(0xD);
ncDynamicCamD_func_802BF2C0(60.0f);
func_8025A58C(0, 4000);
func_8025A70C(COMUSIC_3C_MINIGAME_LOSS);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
baMarker_collisionOff();
func_8029E3C0(0, 2.9f);

2
src/core2/code_14420.c
View File

@@ -822,7 +822,7 @@ void func_8029C848(AnimCtrl *arg0) {
void func_8029C984(void){
func_8025AB00();
func_8025A2FC(0, 4000);
func_8025A70C(COMUSIC_1A_DEATH);
comusic_playTrack(COMUSIC_1A_DEATH);
func_8024BD08(0);
}

2
src/core2/code_4A6F0.c
View File

@@ -380,7 +380,7 @@ void chMumbo_update(Actor *this) {
func_8030E6D4(1);
}
if (actor_animationIsAt(this, 0.01f)) {
func_8025A70C(COMUSIC_1D_MUMBO_TRANSFORMATION);
comusic_playTrack(COMUSIC_1D_MUMBO_TRANSFORMATION);
func_8025A58C(0, 1000);
}
if (actor_animationIsAt(this, 0.01f)) {

6
src/core2/code_4C020.c
View File

@@ -139,7 +139,7 @@ void func_802D2FB0(Actor *this, s32 arg1, s32 arg2, s32 arg3, f32 arg4, s32 arg5
// collision function if player shoots egg at spider webs
void func_802D3138(ActorMarker *marker, ActorMarker *other_marker) {
if(marker->id == MARKER_224_BREAKABLE_FLOOR_COBWEB || marker->id == MARKER_225_BREAKABLE_WALL_COBWEB) {
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
}
}
@@ -185,7 +185,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) {
break;
case MARKER_224_BREAKABLE_FLOOR_COBWEB:
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
func_8030E6A4(SFX_129_SWOOSH, (sp2C->scale < 0.45) ? 1.0 : 0.8, 0x7FF8);
subaddie_set_state_looped(sp2C, 0xC);
func_802D2FB0(sp2C, 8, -0x3C, 0xC8, 2.0f, 0xFA, 0x3C, 0x64);
@@ -193,7 +193,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) {
break;
case MARKER_225_BREAKABLE_WALL_COBWEB:
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
func_8030E540(SFX_129_SWOOSH);
subaddie_set_state_looped(sp2C, 0xF);
func_802D2FB0(sp2C, 0xE, -0x3C, 0xC8, 2.0f, 0xFA, 0x3C, 0x64);

4
src/core2/code_91E10.c
View File

@@ -431,9 +431,9 @@ void func_803197AC(s32 arg0){
case 8: //80319CFC
if (D_803830E0->unk0 != -1) {
func_8025A70C((D_803830E0->unk11 == 1)? COMUSIC_2B_DING_B : COMUSIC_2C_BUZZER);
comusic_playTrack((D_803830E0->unk11 == 1)? COMUSIC_2B_DING_B : COMUSIC_2C_BUZZER);
} else {
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
}
timedFunc_set_1(1.0f, func_803197AC, 9);
break;

2
src/core2/code_935F0.c
View File

@@ -136,7 +136,7 @@ void __chMinigame_setState(Actor *this, u32 arg1) {
volatileFlag_set(VOLATILE_FLAG_4, 1);
func_8028F918(2);
func_8025AB00();
func_8025A70C((volatileFlag_get(VOLATILE_FLAG_5_FF_MINIGAME_WON)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS);
comusic_playTrack((volatileFlag_get(VOLATILE_FLAG_5_FF_MINIGAME_WON)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS);
func_802E4A70();
volatileFlag_set(VOLATILE_FLAG_21, TRUE);
timedFunc_set_3(2.0f, (GenFunction_3)func_802E4078, MAP_8E_GL_FURNACE_FUN, 1, 1);

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

@@ -197,7 +197,7 @@ void gcparade_setState(enum parade_state_e next_state) {
D_803830F0.indx = 0;
D_803830F0.parade_id = PARADE_0_POST_FURNACE_FUN;
D_803830F0.count = 0x1B;
func_8025A70C(COMUSIC_8E_CREDITS);
comusic_playTrack(COMUSIC_8E_CREDITS);
next_state = PARADE_STATE_3_WARP;
gcparade_8031AC8C();
break;
@@ -209,7 +209,7 @@ void gcparade_setState(enum parade_state_e next_state) {
D_803830F0.count = 0x3A;
func_8025A55C(0, 0x1388, 0xB);
func_8025AB00();
func_8025A70C(COMUSIC_8E_CREDITS);
comusic_playTrack(COMUSIC_8E_CREDITS);
next_state = PARADE_STATE_3_WARP;
gcparade_8031AC8C();
break;

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

@@ -209,7 +209,7 @@ void _gctranstion_changeState(s32 state, TransitionInfo *desc){
if(state == TRANSITION_STATE_4_FADE_IN){
if(func_802D4608()==0){
func_8025A70C(COMUSIC_4E_IN_TRANSITION);
comusic_playTrack(COMUSIC_4E_IN_TRANSITION);
func_8025AC20(COMUSIC_4E_IN_TRANSITION, 0, 1000, 0.4f, "gctransition.c", 0x12d);
func_8025AABC(COMUSIC_4E_IN_TRANSITION);
}
@@ -220,7 +220,7 @@ void _gctranstion_changeState(s32 state, TransitionInfo *desc){
}
else{
if(func_802D4608() == 0){
func_8025A70C(COMUSIC_4F_OUT_TRANSITION);
comusic_playTrack(COMUSIC_4F_OUT_TRANSITION);
func_8025AC20(COMUSIC_4F_OUT_TRANSITION, 0, 1000, 0.2f, "gctransition.c", 0x13a);
func_8025AABC(COMUSIC_4F_OUT_TRANSITION);
}

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

@@ -706,7 +706,7 @@ void func_80315C90(GcZoombox *this, s32 arg1) {
if (this->unk110[0] == -1.0f) {
if (func_8025AD7C(this->unk108[0]) == 0) {
func_8025A70C(this->unk108[0]);
comusic_playTrack(this->unk108[0]);
}
} else {

2
src/fight/chbossjinjobase.c
View File

@@ -71,7 +71,7 @@ void chBossJinjoBase_getHitByEgg(ActorMarker *this, ActorMarker *other) {
actor_base = marker_getActor(this);
if (actor_base->state != CHBOSSJINJOBASE_STATE_3_SPAWNED_BOSS_JINJO) {
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
actor_base->unk38_31++; // hit count
if (actor_base->unk38_31 >= 3) { // spawn Jjnjonator

2
src/fight/chjinjonatorbase.c
View File

@@ -78,7 +78,7 @@ void func_8038E120(ActorMarker * marker, ActorMarker *arg1){
if(actor->state != 3){
if(local->unk0[indx]){
local->unk0[indx]--;
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
if(local->unk0[indx] <= 0){
func_8038E0D4(actor, indx + 0x19a, -100.0f, 0.0f, 1.2f);
func_80324D54(1.2f, SFX_90_SWITCH_PRESS, 1.0f, 32000, actor->position, 1000.0f, 2000.0f);

4
src/lair/ch/brentilda.c
View File

@@ -144,7 +144,7 @@ void chBrentilda_update(Actor *this) {
if (sp74 < 0xFF) {
sp74 = (sp74 + 0xC < 0xFF) ? sp74 + 0xC : 0xFF;
if (!this->unk138_24) {
func_8025A70C(COMUSIC_81_ACTIVATING_BRENTILDA);
comusic_playTrack(COMUSIC_81_ACTIVATING_BRENTILDA);
func_80324D2C(1.0f, COMUSIC_81_ACTIVATING_BRENTILDA);
this->unk138_24 = TRUE;
this->unk138_23 = FALSE;
@@ -156,7 +156,7 @@ void chBrentilda_update(Actor *this) {
if (sp74 >= 0x41) {
sp74 = (sp74 - 0xC >= 0x41) ? sp74 - 0xC : 0x40;
if (!this->unk138_23) {
func_8025A70C(COMUSIC_8B_DEACTIVATE_BRENTILDA);
comusic_playTrack(COMUSIC_8B_DEACTIVATE_BRENTILDA);
func_80324D2C(1.0f, COMUSIC_8B_DEACTIVATE_BRENTILDA);
this->unk138_23 = TRUE;
this->unk138_24 = FALSE;

14
src/lair/code_5ED0.c
View File

@@ -1010,7 +1010,7 @@ void func_8038D670(enum FF_Action next_state) {
if (fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE) == 0) {
func_8025A55C(0, 0x1388, 0xB);
func_8025AB00();
func_8025A70C(JINGLE_DOOR_OF_GRUNTY_OPENED);
comusic_playTrack(JINGLE_DOOR_OF_GRUNTY_OPENED);
fileProgressFlag_set(FILEPROG_A6_FURNACE_FUN_COMPLETE, TRUE);
volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, FALSE);
volatileFlag_set(VOLATILE_FLAG_A6_FF_FOUND_HONEYCOMB, TRUE);
@@ -1178,23 +1178,23 @@ void lair_func_8038E0B0(void) {
if (D_8037DCB8->unk11) {
switch(sp38){
case FFTT_6_SKULL://L8038E26C
func_8025A70C(COMUSIC_7B_STEP_ON_SKULL_TILE);
comusic_playTrack(COMUSIC_7B_STEP_ON_SKULL_TILE);
break;
case FFTT_5_GRUNTY://L8038E280
func_8025A70C(COMUSIC_7C_STEP_ON_GRUNTY_TILE);
comusic_playTrack(COMUSIC_7C_STEP_ON_GRUNTY_TILE);
break;
case FFTT_1_BANJO://L8038E294
func_8025A70C(COMUSIC_7D_STEP_ON_BK_TILE);
comusic_playTrack(COMUSIC_7D_STEP_ON_BK_TILE);
break;
case FFTT_7_JOKER://L8038E2A8
func_8025A70C(COMUSIC_7E_STEP_ON_MINIGAME_TILE);
comusic_playTrack(COMUSIC_7E_STEP_ON_MINIGAME_TILE);
break;
case FFTT_3_MUSIC://L8038E2BC
func_8025A70C(COMUSIC_7F_STEP_ON_JOKER_TILE);
comusic_playTrack(COMUSIC_7F_STEP_ON_JOKER_TILE);
break;
case FFTT_2_PICTURE://L8038E2D0
@@ -1261,7 +1261,7 @@ void lair_func_8038E0B0(void) {
func_8038D670(8);
}
} else {
func_8025A70C(COMUSIC_2C_BUZZER);
comusic_playTrack(COMUSIC_2C_BUZZER);
}
}
}

12
src/lair/code_86F0.c
View File

@@ -311,7 +311,7 @@ void func_8038F350(Actor *this, s32 next_state){
case 8: //L8038F4AC
if (local->unk4 > 0) {
func_8025A70C(SFX_REMOVE_JIGGY);
comusic_playTrack(SFX_REMOVE_JIGGY);
this->unk60 = 1.0f;
temp_s1 = func_8038F0EC(this);
func_8038F1EC(this, temp_s1, 0);
@@ -324,7 +324,7 @@ void func_8038F350(Actor *this, s32 next_state){
case 5: //L8038F550
if (local->unk4 < func_8038EB24(this)) {
func_8025A70C(COMUSIC_67_INSERTING_JIGGY);
comusic_playTrack(COMUSIC_67_INSERTING_JIGGY);
this->unk60 = 1.0f;
local->unk4++;
temp_s1 = func_8038F0EC(this);
@@ -344,7 +344,7 @@ void func_8038F350(Actor *this, s32 next_state){
else{
sp4C = item_getCount(ITEM_26_JIGGY_TOTAL);
}
func_8025A70C(COMUSIC_67_INSERTING_JIGGY);
comusic_playTrack(COMUSIC_67_INSERTING_JIGGY);
this->unk60 = 1.0f;
for(phi_s0 = 0; phi_s0 < sp4C; phi_s0++){
local->unk4++;
@@ -359,7 +359,7 @@ void func_8038F350(Actor *this, s32 next_state){
break;
case 7: //L8038F724
func_8025A70C(COMUSIC_65_WORLD_OPENING_B);
comusic_playTrack(COMUSIC_65_WORLD_OPENING_B);
if (this->unkF4_8 == 1) {
func_80324DBC(1.0f, 0xF7E, 4, NULL, this->marker, func_8038F0C0, NULL);
} else if (this->unkF4_8 == 0xA) {
@@ -390,7 +390,7 @@ void lair_func_8038F894(Actor *this, s32 arg1) {
func_8038F350(this, arg1);
return;
}
func_8025A70C(COMUSIC_2C_BUZZER);
comusic_playTrack(COMUSIC_2C_BUZZER);
if (fileProgressFlag_get(FILEPROG_DE_USED_ALL_YOUR_PUZZLE_PIECES) != 0) {
func_8038F350(this, 1);
return;
@@ -503,7 +503,7 @@ void lair_func_8038F924(Actor *this) {
if (local->unk4) {
func_8038F350(this, 8);
} else {
func_8025A70C(COMUSIC_2C_BUZZER);
comusic_playTrack(COMUSIC_2C_BUZZER);
func_8038F350(this, 1);
}
}

2
src/lair/code_C1C0.c
View File

@@ -65,7 +65,7 @@ void func_80392700(Actor *this) {
mapSpecificFlags_set(4, 0);
}
if (mapSpecificFlags_get(6)) {
func_8025A70C(COMUSIC_A8_KLUNGO_BY_FALLEN_GRUNTY);
comusic_playTrack(COMUSIC_A8_KLUNGO_BY_FALLEN_GRUNTY);
func_802BC280();
ncStaticCamera_setToNode(9);
mapSpecificFlags_set(9, 1);

2
src/lair/code_C6C0.c
View File

@@ -46,7 +46,7 @@ void func_80392B6C(Actor *this) {
}
if (mapSpecificFlags_get(7) != 0) {
sp28 = ml_distance_vec3f(this->position, this->unk1C) / 350.0;
func_8025A70C(COMUSIC_A9_TOOTY);
comusic_playTrack(COMUSIC_A9_TOOTY);
mapSpecificFlags_set(7, 0);
mapSpecificFlags_set(9, 1);
ncStaticCamera_setToNode(0x10);