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

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 {