From 3bf535c46277b08175baceb2b02444dc8cf6eda3 Mon Sep 17 00:00:00 2001 From: Fazana <52551480+FazanaJ@users.noreply.github.com> Date: Sun, 22 May 2022 13:17:19 +0100 Subject: [PATCH] last of the sound labels --- src/game_ui.c | 4 ++-- src/object_functions.c | 6 +++--- src/weather.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game_ui.c b/src/game_ui.c index 7d4466f7..72329cd0 100644 --- a/src/game_ui.c +++ b/src/game_ui.c @@ -396,9 +396,9 @@ void func_800A6DB4(s16 *arg0) { if (arg0 != NULL) { if (settings->racers[*arg0].best_times & 0x80) { - play_sound_global(0x145, &D_80126D40); + play_sound_global(SOUND_VOICE_TT_RACE_RECORD, &D_80126D40); } else { - play_sound_global(0x102, &D_80126D40); + play_sound_global(SOUND_VOICE_TT_FINISH, &D_80126D40); } } } diff --git a/src/object_functions.c b/src/object_functions.c index 4d676e94..a24e98e6 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -292,7 +292,7 @@ void obj_loop_fireball_octoweapon(Object *obj, s32 speed) { obj4C_obj64->unk204 = 60; obj->unk7C.word = -60; obj->unk78 = obj4C_obj; - play_sound_global(586, &obj64->unk1C); + play_sound_global(SOUND_BUBBLE_RISE, &obj64->unk1C); } } } @@ -621,7 +621,7 @@ void obj_loop_trophycab(Object *obj, s32 speed) { // A hit has been detected at this point. if (isTrophyRaceAvaliable) { obj->unk78 = 1; - play_sound_global(303, 0); + play_sound_global(SOUND_VOICE_TT_TROPHY_RACE, 0); func_800A3870(); } else @@ -1468,7 +1468,7 @@ void obj_loop_teleport(Object *obj, UNUSED s32 speed) { if (obj->unk4C->unk13 < 0x78) { func_8006F338(temp->unk8); obj->unk78 = 0; - play_sound_global(0x30, 0); + play_sound_global(SOUND_WHOOSH2, 0); func_80000FDC(0x12A, 0, 1.0f); } } diff --git a/src/weather.c b/src/weather.c index 8a47c3e2..e1e99754 100644 --- a/src/weather.c +++ b/src/weather.c @@ -472,7 +472,7 @@ void func_800ADAB8(s32 arg0) { if (D_800E2C6C >= 32769 && func_800C018C() == 0) { func_800C01D8(&D_800E2C98); } - play_sound_global(39, 0); + play_sound_global(SOUND_LIGHTNING, 0); D_800E2C80 = 0; } } else if (D_800E2C60 >= 48000) { @@ -480,7 +480,7 @@ void func_800ADAB8(s32 arg0) { D_800E2C7C -= arg0; return; } - play_sound_global(575, 0); + play_sound_global(SOUND_UNK575, 0); D_800E2C80 = 600 - ((s32) (D_800E2C60 + -48000) >> 5); D_800E2C7C = get_random_number_from_range(900, 1140) - ((s32) (D_800E2C60 + -48000) >> 5); }