From a0d8f24f0dd4fbcfd322646c9af199e46cd33de5 Mon Sep 17 00:00:00 2001 From: Fazana <52551480+FazanaJ@users.noreply.github.com> Date: Sun, 22 May 2022 11:44:24 +0100 Subject: [PATCH] more accurate sequence names based on the official ost names --- include/sequence_ids.h | 76 ++++++++++++++++++------------------- include/sound_ids.h | 86 +++++++++++++++++++++--------------------- src/menu.c | 20 +++++----- src/object_functions.c | 2 +- src/racer.c | 2 +- 5 files changed, 94 insertions(+), 92 deletions(-) diff --git a/include/sequence_ids.h b/include/sequence_ids.h index 9d490210..a9cdfe76 100644 --- a/include/sequence_ids.h +++ b/include/sequence_ids.h @@ -4,46 +4,46 @@ enum SequenceID { SEQUENCE_NONE, SEQUENCE_NONE2, - SEQUENCE_TROPHY, - SEQUENCE_BALLOON_AWARD, - SEQUENCE_KEY_CUTSCENE, - SEQUENCE_AMBIENT, + SEQUENCE_AMULET_THEME, + SEQUENCE_VICTORY_THEME, + SEQUENCE_TROPHY_THEME, + SEQUENCE_AMBIENT_GRASS, SEQUENCE_INTRO_CUTSCENE, SEQUENCE_TITLE_THEME, SEQUENCE_DARKMOON_CAVERNS, SEQUENCE_JUNGLE_FALLS, SEQUENCE_ANCIENT_LAKE, SEQUENCE_FROSTY_VILLAGE, - SEQUENCE_UNUSED12, + SEQUENCE_SECRET_TUNE, SEQUENCE_FOSSIL_CANYON, SEQUENCE_HOT_TOP_VOLCANO, SEQUENCE_WHALE_BAY, SEQUENCE_WALRUS_COVE, - SEQUENCE_LOCKED, - SEQUENCE_WIZPIGSTONE, - SEQUENCE_TAJTIP, - SEQUENCE_TIMBERSISLAND, - SEQUENCE_CREDITS, + SEQUENCE_NO_TROPHY_FOR_YOU, + SEQUENCE_GOLD_BALLOONS, + SEQUENCE_COLLECTION_TUNE, + SEQUENCE_MAIN_LOBBY_AREA, + SEQUENCE_PARTY_POOPER, SEQUENCE_EVERFROST_PEAK, - SEQUENCE_UNUSED23, - SEQUENCE_LOBBY, - SEQUENCE_RACE_WIN, - SEQUENCE_CHARACTER_SELECT, + SEQUENCE_WIZPIG_ATTACKS, + SEQUENCE_MAIN_MENU, + SEQUENCE_FIRST_PLACE, + SEQUENCE_CHOOSE_YOUR_RACER, SEQUENCE_UNK27, - SEQUENCE_BOSS_INTRO, - SEQUENCE_TAJ_RACE, - SEQUENCE_RACE_START, - SEQUENCE_WINDMILL_PLAINS, - SEQUENCE_TAJ, - SEQUENCE_AMBIENT2, - SEQUENCE_CHALLENGE, - SEQUENCE_AMBIENT3, - SEQUENCE_TT, + SEQUENCE_BOSS_CHALLENGE_VICTORY, + SEQUENCE_TAJS_RACES, + SEQUENCE_RACE_START_FANFARE, + SEQUENCE_GREENWOOD_VILLAGE, + SEQUENCE_ENTRANCED, + SEQUENCE_AMBIENT_NIGHT, + SEQUENCE_BATTLE_THEME, + SEQUENCE_AMBIENT_BEACH, + SEQUENCE_TTS_THEME, SEQUENCE_CRESCENT_ISLAND, - SEQUENCE_UNUSED38, - SEQUENCE_SPACEDUST_ALLEY, + SEQUENCE_BOSS_CHALLENGE_FAILURE, + SEQUENCE_STAR_CITY, SEQUENCE_BOULDER_CANYON, - SEQUENCE_AMBIENT4, + SEQUENCE_AMBIENT_UNK, SEQUENCE_SPACEPORT_ALPHA, SEQUENCE_SILVER_COIN_1, SEQUENCE_SILVER_COIN_2, @@ -53,20 +53,20 @@ enum SequenceID { SEQUENCE_SILVER_COIN_6, SEQUENCE_SILVER_COIN_7, SEQUENCE_SILVER_COIN_8, - SEQUENCE_WIZPIG_THEME, - SEQUENCE_BOSS_UNLOCKED, - SEQUENCE_WIZPIG_INTRO, + SEQUENCE_WIZPIGS_TERROR, + SEQUENCE_BOSS_DOOR_UNLOCKED, + SEQUENCE_WIZPIGS_FIMAL_CHALLENGE, SEQUENCE_KEY_COLLECT, - SEQUENCE_WIZPIG_RACE, - SEQUENCE_WIZPIG_WIN, - SEQUENCE_BOSS_RACE, - SEQUENCE_UNK57, - SEQUENCE_UNK58, - SEQUENCE_UNK59, - SEQUENCE_BOSS_WIN, - SEQUENCE_BOSS_LOSE, + SEQUENCE_WIZPIGS_RACES, + SEQUENCE_WIZPIGS_DEFEAT, + SEQUENCE_BOSS_CHALLENGES, + SEQUENCE_WIZPIG_IS_BLASTED_OFF, + SEQUENCE_ENDING_PARTY_1, + SEQUENCE_ENDING_PARTY_2, + SEQUENCE_BATTLE_VICTORY, + SEQUENCE_BATTLE_LOSE, SEQUENCE_HAUNTED_WOODS, - SEQUENCE_AMBIENT5, + SEQUENCE_AMBIENT_HAUNTED_WOODS, SEQUENCE_PIRATE_LAGOON, NUM_SEQUENCE_IDS diff --git a/include/sound_ids.h b/include/sound_ids.h index 576d71db..6f23a0c5 100644 --- a/include/sound_ids.h +++ b/include/sound_ids.h @@ -5,6 +5,7 @@ // Interestingly, there's two unused ID's for each set, implying two characters that were cut. #define SOUND_VOICE_CHARACTER_POSITIVE SOUND_VOICE_KRUNCH_POSITIVE1 #define SOUND_VOICE_CHARACTER_NEGATIVE SOUND_VOICE_KRUNCH_NEGATIVE1 +#define SOUND_HORN_CHARACTER SOUND_HORN_KRUNCH /// Cannot stress enough that these names are very temporary, preliminary, expendable and other words that imply that they are not final. // Also might be worth thinking of a better way of laying this out, because scrolling through hundreds of sound ID's isn't particularly pleasant. @@ -353,18 +354,18 @@ enum SoundID { SOUND_VOICE_TT_DARKWATER_BEACH, SOUND_VOICE_TT_FIRE_MOUNTAIN, SOUND_POP, - SOUND_HORN1, - SOUND_HORN2, - SOUND_HORN3, - SOUND_HORN4, - SOUND_HORN5, - SOUND_HORN6, - SOUND_HORN7, - SOUND_HORN8, - SOUND_HORN9, - SOUND_HORN10, - SOUND_UNK352, - SOUND_UNK353, + SOUND_HORN_KRUNCH, + SOUND_HORN_BUMPER, + SOUND_HORN_TIPTUP, + SOUND_HORN_CONKER, + SOUND_HORN_TIMBER, + SOUND_HORN_BANJO, + SOUND_HORN_DRUMSTICK, + SOUND_HORN_PIPSY, + SOUND_HORN_TT, + SOUND_HORN_DIDDY, + SOUND_HORN_UNUSED1, + SOUND_HORN_UNUSED2, SOUND_VOICE_KRUNCH_POSITIVE1, SOUND_VOICE_BUMPER_POSITIVE1, SOUND_VOICE_TIPTUP_POSITIVE1, @@ -375,8 +376,8 @@ enum SoundID { SOUND_VOICE_PIPSY_POSITIVE1, SOUND_VOICE_TT_POSITIVE1, SOUND_VOICE_DIDDY_POSITIVE1, - SOUND_UNK364, - SOUND_UNK365, + SOUND_VOICE_UNUSED1_POSITIVE1, + SOUND_VOICE_UNUSED2_POSITIVE1, SOUND_VOICE_KRUNCH_POSITIVE2, SOUND_VOICE_BUMPER_POSITIVE2, SOUND_VOICE_TIPTUP_POSITIVE2, @@ -387,8 +388,8 @@ enum SoundID { SOUND_VOICE_PIPSY_POSITIVE2, SOUND_VOICE_TT_POSITIVE2, SOUND_VOICE_DIDDY_POSITIVE2, - SOUND_UNK376, - SOUND_UNK377, + SOUND_VOICE_UNUSED1_POSITIVE2, + SOUND_VOICE_UNUSED2_POSITIVE2, SOUND_VOICE_KRUNCH_POSITIVE3, SOUND_VOICE_BUMPER_POSITIVE3, SOUND_VOICE_TIPTUP_POSITIVE3, @@ -399,8 +400,8 @@ enum SoundID { SOUND_VOICE_PIPSY_POSITIVE3, SOUND_VOICE_TT_POSITIVE3, SOUND_VOICE_DIDDY_POSITIVE3, - SOUND_UNK388, - SOUND_UNK389, + SOUND_VOICE_UNUSED1_POSITIVE3, + SOUND_VOICE_UNUSED2_POSITIVE3, SOUND_VOICE_KRUNCH_POSITIVE4, SOUND_VOICE_BUMPER_POSITIVE4, SOUND_VOICE_TIPTUP_POSITIVE4, @@ -411,8 +412,8 @@ enum SoundID { SOUND_VOICE_PIPSY_POSITIVE4, SOUND_VOICE_TT_POSITIVE4, SOUND_VOICE_DIDDY_POSITIVE4, - SOUND_UNK400, - SOUND_UNK401, + SOUND_VOICE_UNUSED1_POSITIVE4, + SOUND_VOICE_UNUSED2_POSITIVE4, SOUND_VOICE_KRUNCH_POSITIVE5, SOUND_VOICE_BUMPER_POSITIVE5, SOUND_VOICE_TIPTUP_POSITIVE5, @@ -423,8 +424,8 @@ enum SoundID { SOUND_VOICE_PIPSY_POSITIVE5, SOUND_VOICE_TT_POSITIVE5, SOUND_VOICE_DIDDY_POSITIVE5, - SOUND_UNK412, - SOUND_UNK413, + SOUND_VOICE_UNUSED1_POSITIVE5, + SOUND_VOICE_UNUSED2_POSITIVE5, SOUND_VOICE_KRUNCH_POSITIVE6, SOUND_VOICE_BUMPER_POSITIVE6, SOUND_VOICE_TIPTUP_POSITIVE6, @@ -435,8 +436,8 @@ enum SoundID { SOUND_VOICE_PIPSY_POSITIVE6, SOUND_VOICE_TT_POSITIVE6, SOUND_VOICE_DIDDY_POSITIVE6, - SOUND_UNK424, - SOUND_UNK425, + SOUND_VOICE_UNUSED1_POSITIVE6, + SOUND_VOICE_UNUSED2_POSITIVE6, SOUND_VOICE_KRUNCH_POSITIVE7, SOUND_VOICE_BUMPER_POSITIVE7, SOUND_VOICE_TIPTUP_POSITIVE7, @@ -447,8 +448,8 @@ enum SoundID { SOUND_VOICE_PIPSY_POSITIVE7, SOUND_VOICE_TT_POSITIVE7, SOUND_VOICE_DIDDY_POSITIVE7, - SOUND_UNK436, - SOUND_UNK437, + SOUND_VOICE_UNUSED1_POSITIVE7, + SOUND_VOICE_UNUSED2_POSITIVE7, SOUND_VOICE_KRUNCH_POSITIVE8, SOUND_VOICE_BUMPER_POSITIVE8, SOUND_VOICE_TIPTUP_POSITIVE8, @@ -459,8 +460,8 @@ enum SoundID { SOUND_VOICE_PIPSY_POSITIVE8, SOUND_VOICE_TT_POSITIVE8, SOUND_VOICE_DIDDY_POSITIVE8, - SOUND_UNK448, - SOUND_UNK449, + SOUND_VOICE_UNUSED1_POSITIVE8, + SOUND_VOICE_UNUSED2_POSITIVE8, SOUND_VOICE_KRUNCH_NEGATIVE1, SOUND_VOICE_BUMPER_NEGATIVE1, SOUND_VOICE_TIPTUP_NEGATIVE1, @@ -471,8 +472,8 @@ enum SoundID { SOUND_VOICE_PIPSY_NEGATIVE1, SOUND_VOICE_TT_NEGATIVE1, SOUND_VOICE_DIDDY_NEGATIVE1, - SOUND_UNK460, - SOUND_UNK461, + SOUND_VOICE_UNUSED1_NEGATIVE1, + SOUND_VOICE_UNUSED2_NEGATIVE1, SOUND_VOICE_KRUNCH_NEGATIVE2, SOUND_VOICE_BUMPER_NEGATIVE2, SOUND_VOICE_TIPTUP_NEGATIVE2, @@ -483,8 +484,8 @@ enum SoundID { SOUND_VOICE_PIPSY_NEGATIVE2, SOUND_VOICE_TT_NEGATIVE2, SOUND_VOICE_DIDDY_NEGATIVE2, - SOUND_UNK472, - SOUND_UNK473, + SOUND_VOICE_UNUSED1_NEGATIVE2, + SOUND_VOICE_UNUSED2_NEGATIVE2, SOUND_VOICE_KRUNCH_NEGATIVE3, SOUND_VOICE_BUMPER_NEGATIVE3, SOUND_VOICE_TIPTUP_NEGATIVE3, @@ -495,8 +496,8 @@ enum SoundID { SOUND_VOICE_PIPSY_NEGATIVE3, SOUND_VOICE_TT_NEGATIVE3, SOUND_VOICE_DIDDY_NEGATIVE3, - SOUND_UNK484, - SOUND_UNK485, + SOUND_VOICE_UNUSED1_NEGATIVE3, + SOUND_VOICE_UNUSED2_NEGATIVE3, SOUND_VOICE_KRUNCH_NEGATIVE4, SOUND_VOICE_BUMPER_NEGATIVE4, SOUND_VOICE_TIPTUP_NEGATIVE4, @@ -507,8 +508,8 @@ enum SoundID { SOUND_VOICE_PIPSY_NEGATIVE4, SOUND_VOICE_TT_NEGATIVE4, SOUND_VOICE_DIDDY_NEGATIVE4, - SOUND_UNK496, - SOUND_UNK497, + SOUND_VOICE_UNUSED1_NEGATIVE4, + SOUND_VOICE_UNUSED2_NEGATIVE4, SOUND_VOICE_KRUNCH_NEGATIVE5, SOUND_VOICE_BUMPER_NEGATIVE5, SOUND_VOICE_TIPTUP_NEGATIVE5, @@ -519,8 +520,8 @@ enum SoundID { SOUND_VOICE_PIPSY_NEGATIVE5, SOUND_VOICE_TT_NEGATIVE5, SOUND_VOICE_DIDDY_NEGATIVE5, - SOUND_UNK508, - SOUND_UNK509, + SOUND_VOICE_UNUSED1_NEGATIVE5, + SOUND_VOICE_UNUSED2_NEGATIVE5, SOUND_VOICE_KRUNCH_NEGATIVE6, SOUND_VOICE_BUMPER_NEGATIVE6, SOUND_VOICE_TIPTUP_NEGATIVE6, @@ -531,8 +532,8 @@ enum SoundID { SOUND_VOICE_PIPSY_NEGATIVE6, SOUND_VOICE_TT_NEGATIVE6, SOUND_VOICE_DIDDY_NEGATIVE6, - SOUND_UNK520, - SOUND_UNK521, + SOUND_VOICE_UNUSED1_NEGATIVE6, + SOUND_VOICE_UNUSED2_NEGATIVE6, SOUND_VOICE_KRUNCH_NEGATIVE7, SOUND_VOICE_BUMPER_NEGATIVE7, SOUND_VOICE_TIPTUP_NEGATIVE7, @@ -543,8 +544,8 @@ enum SoundID { SOUND_VOICE_PIPSY_NEGATIVE7, SOUND_VOICE_TT_NEGATIVE7, SOUND_VOICE_DIDDY_NEGATIVE7, - SOUND_UNK532, - SOUND_UNK533, + SOUND_VOICE_UNUSED1_NEGATIVE7, + SOUND_VOICE_UNUSED2_NEGATIVE7, SOUND_VOICE_KRUNCH_NEGATIVE8, SOUND_VOICE_BUMPER_NEGATIVE8, SOUND_VOICE_TIPTUP_NEGATIVE8, @@ -555,6 +556,7 @@ enum SoundID { SOUND_VOICE_PIPSY_NEGATIVE8, SOUND_VOICE_TT_NEGATIVE8, SOUND_VOICE_DIDDY_NEGATIVE8, + //Betting these are unused, because they sit in the spot where character ID's should be. SOUND_VOICE_BLUEY_REMATCH4, // "If you can beat me again..." SOUND_VOICE_BLUEY_TROPHY2, // "Goodbye kid" SOUND_UNK546, // I'm guessing rolling snowballs diff --git a/src/menu.c b/src/menu.c index e9c2b7ea..7b217047 100644 --- a/src/menu.c +++ b/src/menu.c @@ -2360,7 +2360,7 @@ void menu_options_init(void) { load_font(2); set_text_font(ASSET_FONTS_BIGFONT); set_music_player_voice_limit(0x18); - play_music(SEQUENCE_LOBBY); + play_music(SEQUENCE_MAIN_MENU); func_80000B18(); } @@ -2648,7 +2648,7 @@ s32 menu_audio_options_loop(s32 arg0) { } else { func_80000B28(); set_music_player_voice_limit(0x18); - play_music(SEQUENCE_LOBBY); + play_music(SEQUENCE_MAIN_MENU); func_80000B18(); } } @@ -2701,7 +2701,7 @@ void func_800851FC(void) { } if (D_801263D8 >= 0) { set_music_player_voice_limit(0x18); - play_music(SEQUENCE_LOBBY); + play_music(SEQUENCE_MAIN_MENU); set_music_fade_timer(0x100); func_80000B18(); } @@ -3741,7 +3741,7 @@ void menu_character_select_init(void) { D_801263B8.unk0 = -1; D_801263B8.unk2 = 0; D_801263B8.unk1 = 0; - play_music(SEQUENCE_CHARACTER_SELECT); + play_music(SEQUENCE_CHOOSE_YOUR_RACER); for (i = 0; i < 10; i++) { temp = D_800DFDB4[i]; if (i != D_801263C0.unk0) { @@ -4013,7 +4013,7 @@ void menu_game_select_init(void) { func_8009C6D4(0x43); func_8007FFEC(3); load_font(2); - play_music(SEQUENCE_CHARACTER_SELECT); + play_music(SEQUENCE_CHOOSE_YOUR_RACER); for (i = 0; i < 10; i++) { if (i != D_801263B4.unk0) { @@ -4201,7 +4201,7 @@ void menu_file_select_init(void) { D_80126CC0 = 0; func_800C01D8(&sMenuTransitionFadeOut); load_font(2); - play_music(SEQUENCE_CHARACTER_SELECT); + play_music(SEQUENCE_CHOOSE_YOUR_RACER); for (i = 0; i < 10; i++) { if (i != D_801263B4.unk0) { func_80001114(D_800DFDB4[i][0]); @@ -4958,7 +4958,7 @@ void menu_5_init(void) { func_80000FDC(temp, 0, 0.5f); } set_music_player_voice_limit(0x18); - play_music(SEQUENCE_LOBBY); + play_music(SEQUENCE_MAIN_MENU); func_80000B18(); D_801263E0 = 0; func_8009C674(D_800E0FB4); @@ -5235,7 +5235,7 @@ void func_80094C14(s32 arg0) { case 1: if (normalise_time(0x12C) < D_801263D8) { set_music_player_voice_limit(0x18); - play_music(SEQUENCE_LOBBY); + play_music(SEQUENCE_MAIN_MENU); set_music_fade_timer(0x100); } break; @@ -5337,7 +5337,7 @@ void menu_11_init(void) { load_font(2); func_800C01D8(&sMenuTransitionFadeOut); set_music_player_voice_limit(0x18); - play_music(SEQUENCE_LOBBY); + play_music(SEQUENCE_MAIN_MENU); set_music_fade_timer(0x80); } @@ -5505,7 +5505,7 @@ void menu_trophy_race_round_init(void) { D_800E0980 = 10; load_font(2); set_music_player_voice_limit(0x18); - play_music(SEQUENCE_LOBBY); + play_music(SEQUENCE_MAIN_MENU); set_music_fade_timer(0x100); } #else diff --git a/src/object_functions.c b/src/object_functions.c index 03406a73..16471ed2 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -631,7 +631,7 @@ void obj_loop_trophycab(Object *obj, s32 speed) { obj64->unk0 = 140; set_sndfx_player_voice_limit(16); set_music_fade_timer(-8); - play_sequence(SEQUENCE_LOCKED); + play_sequence(SEQUENCE_NO_TROPHY_FOR_YOU); } } if ((obj64->unk0 != 0) && (func_80001C08() == 0)) { diff --git a/src/racer.c b/src/racer.c index 9454be55..81b2d4b9 100644 --- a/src/racer.c +++ b/src/racer.c @@ -1612,7 +1612,7 @@ void play_char_horn_sound(Object *obj, Object_Racer *racer) { func_800570B8(obj, SOUND_VOICE_CHARACTER_POSITIVE, 8, 130); } else { // Play character's horn sound - racer_play_sound(obj, racer->characterId + SOUND_HORN1); + racer_play_sound(obj, racer->characterId + SOUND_HORN_CHARACTER); } }