From cf4d602714bb125b09aebd8ac4950ee13b4d8d3d Mon Sep 17 00:00:00 2001 From: Fazana <52551480+FazanaJ@users.noreply.github.com> Date: Sat, 21 May 2022 21:08:29 +0100 Subject: [PATCH] character voice offset identification --- include/sequence_ids.h | 2 +- include/sound_ids.h | 325 +++++++++++++++++++++-------------------- src/audio.c | 6 +- src/audio.h | 2 +- src/menu.c | 72 ++++----- src/racer.c | 18 +-- src/racer.h | 2 +- 7 files changed, 216 insertions(+), 211 deletions(-) diff --git a/include/sequence_ids.h b/include/sequence_ids.h index b5159d89..9d490210 100644 --- a/include/sequence_ids.h +++ b/include/sequence_ids.h @@ -40,7 +40,7 @@ enum SequenceID { SEQUENCE_AMBIENT3, SEQUENCE_TT, SEQUENCE_CRESCENT_ISLAND, - SEQUENCE_UNUSED37, + SEQUENCE_UNUSED38, SEQUENCE_SPACEDUST_ALLEY, SEQUENCE_BOULDER_CANYON, SEQUENCE_AMBIENT4, diff --git a/include/sound_ids.h b/include/sound_ids.h index 6866fc58..f946e90a 100644 --- a/include/sound_ids.h +++ b/include/sound_ids.h @@ -1,6 +1,11 @@ #ifndef SOUND_IDS_H #define SOUND_IDS_H +// Since the game uses a lot of random selection for playing character voice clips, here are two offsets to refer to for that purpose. +// 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 + // Anything I've labelled as UNK, without a comment, is something I didn't get an audible sound from. enum SoundID { SOUND_UNK0, @@ -357,196 +362,196 @@ enum SoundID { SOUND_HORN10, SOUND_UNK352, SOUND_UNK353, - SOUND_VOICE_KRUNCH_BAA, - SOUND_VOICE_BUMPER_YOW, - SOUND_VOICE_TIPTUP_OW, - SOUND_VOICE_CONKER_YOWOW, - SOUND_VOICE_TIMBER_YEAH2, - SOUND_VOICE_BANJO_YAHOO2, - SOUND_VOICE_DRUMSTICK_WEH, - SOUND_VOICE_PIPSY_YAHOO, - SOUND_VOICE_TT_WAHEY, - SOUND_VOICE_DIDDY_HOOHOO, + SOUND_VOICE_KRUNCH_POSITIVE1, + SOUND_VOICE_BUMPER_POSITIVE1, + SOUND_VOICE_TIPTUP_POSITIVE1, + SOUND_VOICE_CONKER_POSITIVE1, + SOUND_VOICE_TIMBER_POSITIVE1, + SOUND_VOICE_BANJO_POSITIVE1, + SOUND_VOICE_DRUMSTICK_POSITIVE1, + SOUND_VOICE_PIPSY_POSITIVE1, + SOUND_VOICE_TT_POSITIVE1, + SOUND_VOICE_DIDDY_POSITIVE1, SOUND_UNK364, SOUND_UNK365, - SOUND_VOICE_KRUNCH_HAHA, - SOUND_VOICE_BUMPER_YEAH, - SOUND_VOICE_TIPTIP_WOHOAH, - SOUND_VOICE_CONKER_HEHE, - SOUND_VOICE_TIMBER_YIPPEE, - SOUND_VOICE_BANJO_WOAH2, - SOUND_VOICE_DRUMSTICK_BWAK2, - SOUND_VOICE_PIPSY_YIPPEE, - SOUND_VOICE_TT_HOHO, - SOUND_VOICE_DIDDY_HAHA, + SOUND_VOICE_KRUNCH_POSITIVE2, + SOUND_VOICE_BUMPER_POSITIVE2, + SOUND_VOICE_TIPTUP_POSITIVE2, + SOUND_VOICE_CONKER_POSITIVE2, + SOUND_VOICE_TIMBER_POSITIVE2, + SOUND_VOICE_BANJO_POSITIVE2, + SOUND_VOICE_DRUMSTICK_POSITIVE2, + SOUND_VOICE_PIPSY_POSITIVE2, + SOUND_VOICE_TT_POSITIVE2, + SOUND_VOICE_DIDDY_POSITIVE2, SOUND_UNK376, SOUND_UNK377, - SOUND_VOICE_KRUNCH_HEY, - SOUND_VOICE_BUMPER_WOOHOO, - SOUND_VOICE_TIPTUP_WOW, - SOUND_VOICE_CONKER_HEEHEE, - SOUND_VOICE_TIMBER_WOAH, - SOUND_VOICE_BANJO_WAHOY, - SOUND_VOICE_DRUMSTICK_WAH2, - SOUND_VOICE_PIPSY_YOW, - SOUND_VOICE_TT_WAHEE, - SOUND_VOICE_DIDDY_LAUGH3, + SOUND_VOICE_KRUNCH_POSITIVE3, + SOUND_VOICE_BUMPER_POSITIVE3, + SOUND_VOICE_TIPTUP_POSITIVE3, + SOUND_VOICE_CONKER_POSITIVE3, + SOUND_VOICE_TIMBER_POSITIVE3, + SOUND_VOICE_BANJO_POSITIVE3, + SOUND_VOICE_DRUMSTICK_POSITIVE3, + SOUND_VOICE_PIPSY_POSITIVE3, + SOUND_VOICE_TT_POSITIVE3, + SOUND_VOICE_DIDDY_POSITIVE3, SOUND_UNK388, SOUND_UNK389, - SOUND_VOICE_KRUNCH_HAHA2, - SOUND_VOICE_BUMPER_HOHO, - SOUND_VOICE_TIPTUP_HAHA, - SOUND_VOICE_CONKER_LAUGH, - SOUND_VOICE_TIMBER_LAUGH, - SOUND_VOICE_BANJO_HAHOO, - SOUND_VOICE_DRUMSTICK_BWAK3, - SOUND_VOICE_PIPSY_WAHOO, - SOUND_VOICE_TT_HEHE, - SOUND_VOICE_DIDDY_HEHEHAHA, + SOUND_VOICE_KRUNCH_POSITIVE4, + SOUND_VOICE_BUMPER_POSITIVE4, + SOUND_VOICE_TIPTUP_POSITIVE4, + SOUND_VOICE_CONKER_POSITIVE4, + SOUND_VOICE_TIMBER_POSITIVE4, + SOUND_VOICE_BANJO_POSITIVE4, + SOUND_VOICE_DRUMSTICK_POSITIVE4, + SOUND_VOICE_PIPSY_POSITIVE4, + SOUND_VOICE_TT_POSITIVE4, + SOUND_VOICE_DIDDY_POSITIVE4, SOUND_UNK400, SOUND_UNK401, - SOUND_VOICE_VOICE_KRUNCH_HAHA2, - SOUND_VOICE_BUMPER_LAUGH, - SOUND_VOICE_TIPTUP_LAUGH, - SOUND_VOICE_CONKER_WOOPDEEDOO, - SOUND_VOICE_TIMBER_LAUGH2, - SOUND_VOICE_BANJO_HOHO, - SOUND_VOICE_DRUMSTICK_BWAH, - SOUND_VOICE_PIPSY_HEHE, - SOUND_VOICE_TT_YIPPEE, - SOUND_VOICE_DIDDY_WOOHOO, + SOUND_VOICE_KRUNCH_POSITIVE5, + SOUND_VOICE_BUMPER_POSITIVE5, + SOUND_VOICE_TIPTUP_POSITIVE5, + SOUND_VOICE_CONKER_POSITIVE5, + SOUND_VOICE_TIMBER_POSITIVE5, + SOUND_VOICE_BANJO_POSITIVE5, + SOUND_VOICE_DRUMSTICK_POSITIVE5, + SOUND_VOICE_PIPSY_POSITIVE5, + SOUND_VOICE_TT_POSITIVE5, + SOUND_VOICE_DIDDY_POSITIVE5, SOUND_UNK412, SOUND_UNK413, - SOUND_VOICE_KRUNCH_LAUGH2, - SOUND_VOICE_BUMPER_WOOHOO2, - SOUND_VOICE_TIPTUP_HOHO, - SOUND_VOICE_CONKER_YEHAHA2, - SOUND_VOICE_TIMBER_COOL, - SOUND_VOICE_BANJO_HAHOO2, - SOUND_VOICE_DRUMSTICK_BWAK4, - SOUND_VOICE_PIPSY_LAUGH2, - SOUND_VOICE_TT_YAHOO, - SOUND_VOICE_DIDDY_YEE, + SOUND_VOICE_KRUNCH_POSITIVE6, + SOUND_VOICE_BUMPER_POSITIVE6, + SOUND_VOICE_TIPTUP_POSITIVE6, + SOUND_VOICE_CONKER_POSITIVE6, + SOUND_VOICE_TIMBER_POSITIVE6, + SOUND_VOICE_BANJO_POSITIVE6, + SOUND_VOICE_DRUMSTICK_POSITIVE6, + SOUND_VOICE_PIPSY_POSITIVE6, + SOUND_VOICE_TT_POSITIVE6, + SOUND_VOICE_DIDDY_POSITIVE6, SOUND_UNK424, SOUND_UNK425, - SOUND_VOICE_KRUNCH_LAUGH3, - SOUND_VOICE_BUMPER_LAUGH2, - SOUND_VOICE_TIPTUP_YEAH, - SOUND_VOICE_CONKER_YOO, - SOUND_VOICE_TIMBER_WOW2, - SOUND_VOICE_BANJO_GUHHUH2, - SOUND_VOICE_DRUMSTICK_BWAK5, - SOUND_VOICE_PIPSY_EEKEEK, - SOUND_VOICE_TT_WAHEY2, - SOUND_VOICE_DIDDY_HEHEHAHA2, + SOUND_VOICE_KRUNCH_POSITIVE7, + SOUND_VOICE_BUMPER_POSITIVE7, + SOUND_VOICE_TIPTUP_POSITIVE7, + SOUND_VOICE_CONKER_POSITIVE7, + SOUND_VOICE_TIMBER_POSITIVE7, + SOUND_VOICE_BANJO_POSITIVE7, + SOUND_VOICE_DRUMSTICK_POSITIVE7, + SOUND_VOICE_PIPSY_POSITIVE7, + SOUND_VOICE_TT_POSITIVE7, + SOUND_VOICE_DIDDY_POSITIVE7, SOUND_UNK436, SOUND_UNK437, - SOUND_VOICE_KRUNCH_HOHOO2, - SOUND_VOICE_BUMPER_WAHEY, - SOUND_VOICE_TIPTUP_HAHAHO, - SOUND_VOICE_CONKER_WOO, - SOUND_VOICE_TIMBER_RAGH2, - SOUND_VOICE_BANJO_YAHOO3, - SOUND_VOICE_DRUMSTICK_BWAK6, - SOUND_VOICE_PIPSY_EEK, - SOUND_VOICE_TT_HEHOO, - SOUND_VOICE_DIDDY_WOHOHA, + SOUND_VOICE_KRUNCH_POSITIVE8, + SOUND_VOICE_BUMPER_POSITIVE8, + SOUND_VOICE_TIPTUP_POSITIVE8, + SOUND_VOICE_CONKER_POSITIVE8, + SOUND_VOICE_TIMBER_POSITIVE8, + SOUND_VOICE_BANJO_POSITIVE8, + SOUND_VOICE_DRUMSTICK_POSITIVE8, + SOUND_VOICE_PIPSY_POSITIVE8, + SOUND_VOICE_TT_POSITIVE8, + SOUND_VOICE_DIDDY_POSITIVE8, SOUND_UNK448, SOUND_UNK449, - SOUND_VOICE_KRUNCH_ACK, - SOUND_VOICE_BUMPER_OHNO2, - SOUND_VOICE_TIPTUP_HEY, - SOUND_VOICE_CONKER_ACK, - SOUND_VOICE_TIMBER_WAH, - SOUND_VOICE_BANJO_GUHHUH3, - SOUND_VOICE_DRUMSTICK_BWAH2, - SOUND_VOICE_PIPSY_UHOH2, - SOUND_VOICE_TT_OW, - SOUND_VOICE_DIDDY_EEK, + SOUND_VOICE_KRUNCH_NEGATIVE1, + SOUND_VOICE_BUMPER_NEGATIVE1, + SOUND_VOICE_TIPTUP_NEGATIVE1, + SOUND_VOICE_CONKER_NEGATIVE1, + SOUND_VOICE_TIMBER_NEGATIVE1, + SOUND_VOICE_BANJO_NEGATIVE1, + SOUND_VOICE_DRUMSTICK_NEGATIVE1, + SOUND_VOICE_PIPSY_NEGATIVE1, + SOUND_VOICE_TT_NEGATIVE1, + SOUND_VOICE_DIDDY_NEGATIVE1, SOUND_UNK460, SOUND_UNK461, - SOUND_VOICE_KRUNCH_ARGH, - SOUND_VOICE_BUMPER_UH2, - SOUND_VOICE_TIPTUP_OW2, - SOUND_VOICE_CONKER_YOO2, - SOUND_VOICE_TIMBER_UHOH, - SOUND_VOICE_BANJO_WOAH3, - SOUND_VOICE_DRUMSTICK_AGH, - SOUND_VOICE_PIPSY_OW, - SOUND_VOICE_TT_OW2, - SOUND_VOICE_DIDDY_OOH, + SOUND_VOICE_KRUNCH_NEGATIVE2, + SOUND_VOICE_BUMPER_NEGATIVE2, + SOUND_VOICE_TIPTUP_NEGATIVE2, + SOUND_VOICE_CONKER_NEGATIVE2, + SOUND_VOICE_TIMBER_NEGATIVE2, + SOUND_VOICE_BANJO_NEGATIVE2, + SOUND_VOICE_DRUMSTICK_NEGATIVE2, + SOUND_VOICE_PIPSY_NEGATIVE2, + SOUND_VOICE_TT_NEGATIVE2, + SOUND_VOICE_DIDDY_NEGATIVE2, SOUND_UNK472, SOUND_UNK473, - SOUND_VOICE_KRUNCH_HEY2, - SOUND_VOICE_BUMPER_YOW2, - SOUND_VOICE_TIPTUP_WOW2, - SOUND_VOICE_CONKER_YOO3, - SOUND_VOICE_TIMBER_UHUH, - SOUND_VOICE_BANJO_WOAH4, - SOUND_VOICE_DRUMSTICK_BWAH3, - SOUND_VOICE_PIPSY_OOH, - SOUND_VOICE_TT_WOAH2, - SOUND_VOICE_DIDDY_OOH2, + SOUND_VOICE_KRUNCH_NEGATIVE3, + SOUND_VOICE_BUMPER_NEGATIVE3, + SOUND_VOICE_TIPTUP_NEGATIVE3, + SOUND_VOICE_CONKER_NEGATIVE3, + SOUND_VOICE_TIMBER_NEGATIVE3, + SOUND_VOICE_BANJO_NEGATIVE3, + SOUND_VOICE_DRUMSTICK_NEGATIVE3, + SOUND_VOICE_PIPSY_NEGATIVE3, + SOUND_VOICE_TT_NEGATIVE3, + SOUND_VOICE_DIDDY_NEGATIVE3, SOUND_UNK484, SOUND_UNK485, - SOUND_VOICE_KRUNCH_AH, - SOUND_VOICE_BUMPER_UH3, - SOUND_VOICE_TIPTUP_OW3, - SOUND_VOICE_CONKER_AHH2, - SOUND_VOICE_TIMBER_UHOH2, - SOUND_VOICE_BANJO_HOHO2, - SOUND_VOICE_DRUMSTICK_BWAK7, - SOUND_VOICE_PIPSY_OW2, - SOUND_VOICE_TT_OW3, - SOUND_VOICE_DIDDY_NARGH, + SOUND_VOICE_KRUNCH_NEGATIVE4, + SOUND_VOICE_BUMPER_NEGATIVE4, + SOUND_VOICE_TIPTUP_NEGATIVE4, + SOUND_VOICE_CONKER_NEGATIVE4, + SOUND_VOICE_TIMBER_NEGATIVE4, + SOUND_VOICE_BANJO_NEGATIVE4, + SOUND_VOICE_DRUMSTICK_NEGATIVE4, + SOUND_VOICE_PIPSY_NEGATIVE4, + SOUND_VOICE_TT_NEGATIVE4, + SOUND_VOICE_DIDDY_NEGATIVE4, SOUND_UNK496, SOUND_UNK497, - SOUND_VOICE_KRUNCH_HOHOO3, - SOUND_VOICE_BUMPER_OW, - SOUND_VOICE_TIPTUP_AHH2, - SOUND_VOICE_CONKER_YOO4, - SOUND_VOICE_TIMBER_RAGH3, - SOUND_VOICE_BANJO_AWW, - SOUND_VOICE_DRUMSTICK_AGH2, - SOUND_VOICE_PIPSY_EEKEEK2, - SOUND_VOICE_TT_HAHOW, - SOUND_VOICE_DIDDY_HEY, + SOUND_VOICE_KRUNCH_NEGATIVE5, + SOUND_VOICE_BUMPER_NEGATIVE5, + SOUND_VOICE_TIPTUP_NEGATIVE5, + SOUND_VOICE_CONKER_NEGATIVE5, + SOUND_VOICE_TIMBER_NEGATIVE5, + SOUND_VOICE_BANJO_NEGATIVE5, + SOUND_VOICE_DRUMSTICK_NEGATIVE5, + SOUND_VOICE_PIPSY_NEGATIVE5, + SOUND_VOICE_TT_NEGATIVE5, + SOUND_VOICE_DIDDY_NEGATIVE5, SOUND_UNK508, SOUND_UNK509, - SOUND_VOICE_KRUNCH_BAH, - SOUND_VOICE_BUMPER_WOAH, - SOUND_VOICE_TIPTUP_AHH3, - SOUND_VOICE_CONKER_YOO5, - SOUND_VOICE_TIMBER_WOW3, - SOUND_VOICE_BANJO_DOH, - SOUND_VOICE_DRUMSTICK_BWAK8, - SOUND_VOICE_PIPSY_YOW2, - SOUND_VOICE_TT_OOH, - SOUND_VOICE_DIDDY_WOAH2, + SOUND_VOICE_KRUNCH_NEGATIVE6, + SOUND_VOICE_BUMPER_NEGATIVE6, + SOUND_VOICE_TIPTUP_NEGATIVE6, + SOUND_VOICE_CONKER_NEGATIVE6, + SOUND_VOICE_TIMBER_NEGATIVE6, + SOUND_VOICE_BANJO_NEGATIVE6, + SOUND_VOICE_DRUMSTICK_NEGATIVE6, + SOUND_VOICE_PIPSY_NEGATIVE6, + SOUND_VOICE_TT_NEGATIVE6, + SOUND_VOICE_DIDDY_NEGATIVE6, SOUND_UNK520, SOUND_UNK521, - SOUND_VOICE_KRUNCH_EHH2, - SOUND_VOICE_BUMPER_YOW3, - SOUND_VOICE_TIPTUP_WATCHOUT, - SOUND_VOICE_CONKER_ACK2, - SOUND_VOICE_TIMBER_AH, - SOUND_VOICE_BANJO_OW, - SOUND_VOICE_DRUMSTICK_WAH3, - SOUND_VOICE_PIPSY_UHOH3, - SOUND_UNK530, - SOUND_VOICE_DIDDY_OW, + SOUND_VOICE_KRUNCH_NEGATIVE7, + SOUND_VOICE_BUMPER_NEGATIVE7, + SOUND_VOICE_TIPTUP_NEGATIVE7, + SOUND_VOICE_CONKER_NEGATIVE7, + SOUND_VOICE_TIMBER_NEGATIVE7, + SOUND_VOICE_BANJO_NEGATIVE7, + SOUND_VOICE_DRUMSTICK_NEGATIVE7, + SOUND_VOICE_PIPSY_NEGATIVE7, + SOUND_VOICE_TT_NEGATIVE7, + SOUND_VOICE_DIDDY_NEGATIVE7, SOUND_UNK532, SOUND_UNK533, - SOUND_VOICE_KRUNCH_HEY3, - SOUND_VOICE_BUMPER_OOH, - SOUND_VOICE_TIPTUP_HOHO2, - SOUND_VOICE_CONKER_YOO6, - SOUND_VOICE_TIMBER_RAGH4, - SOUND_VOICE_BANJO_OW2, - SOUND_VOICE_DRUMSTICK_BOK, - SOUND_VOICE_PIPSY_EEKEEK3, - SOUND_VOICE_TT_WOAH3, - SOUND_VOICE_DIDDY_OW2, + SOUND_VOICE_KRUNCH_NEGATIVE8, + SOUND_VOICE_BUMPER_NEGATIVE8, + SOUND_VOICE_TIPTUP_NEGATIVE8, + SOUND_VOICE_CONKER_NEGATIVE8, + SOUND_VOICE_TIMBER_NEGATIVE8, + SOUND_VOICE_BANJO_NEGATIVE8, + SOUND_VOICE_DRUMSTICK_NEGATIVE8, + SOUND_VOICE_PIPSY_NEGATIVE8, + SOUND_VOICE_TT_NEGATIVE8, + SOUND_VOICE_DIDDY_NEGATIVE8, SOUND_VOICE_BLUEY_REMATCH4, // "If you can beat me again..." SOUND_VOICE_BLUEY_TROPHY2, // "Goodbye kid" diff --git a/src/audio.c b/src/audio.c index ab245a87..ddf5a84d 100644 --- a/src/audio.c +++ b/src/audio.c @@ -233,10 +233,10 @@ void func_80000B28(void) { D_800DC648 = 0; } -void play_music(u8 arg0) { +void play_music(u8 seqID) { if (D_800DC648 == 0 && musicVolumeSliderPercentage != 0) { - D_80115D04 = arg0; - musicRelativeVolume = 0x7F; + D_80115D04 = seqID; + musicRelativeVolume = 127; if (D_800DC640 != 0) { func_800022BC(D_80115D04, gMusicPlayer); } diff --git a/src/audio.h b/src/audio.h index 5d95df85..97c149fb 100644 --- a/src/audio.h +++ b/src/audio.h @@ -68,7 +68,7 @@ void func_80000890(u8 arg0); void func_80000968(s32 arg0); void func_80000B18(void); void func_80000B28(void); -void play_music(u8 arg0); +void play_music(u8 seqID); void set_music_player_voice_limit(u8 voiceLimit); void func_80000C1C(void); void func_80000C2C(void); diff --git a/src/menu.c b/src/menu.c index 5aa5ec3b..e9c2b7ea 100644 --- a/src/menu.c +++ b/src/menu.c @@ -80,9 +80,9 @@ s32 D_80126438[4]; //bit 24 = Unknown, but it's set as a default high bit. //bit 25 = Seems to be a flag for whether subtitles are enabled or not. //bits 26-55 = Unknown, but it could be a set of flags for unlocked tracks -//bits 56-63 = Checksum bits. These are calculated from the previous bits, +//bits 56-63 = Checksum bits. These are calculated from the previous bits, // and validated using calculate_eeprom_settings_checksum. -// If the checksum fails, the settings are reset to just +// If the checksum fails, the settings are reset to just // bits 24/25 being high. u64 sEepromSettings; @@ -366,7 +366,7 @@ unk800DF510 sMenuImageProperties[18] = { { 0, 0, 0, 0x5D, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, { 0 } }, }; -s16 *gAssetsMenuElementIds[1] = { NULL }; // This is probably not correct. +s16 *gAssetsMenuElementIds[1] = { NULL }; // This is probably not correct. s16 D_800DF754 = 0; s16 D_800DF758 = 0; unk800DF510 *gMenuImageStack = NULL; @@ -1921,7 +1921,7 @@ void show_timestamp(s32 frameCount, s32 xPos, s32 yPos, u8 red, u8 green, u8 blu get_timestamp_from_frames(frameCount, &minutes, &seconds, &hundredths); func_80068508(1); func_8007BF1C(0); - + gMenuImageStack[imageIndex].unk18 = minutes / 10; gMenuImageStack[imageIndex].unkC = xPos; func_8009CA60(imageIndex); @@ -1944,21 +1944,21 @@ void show_timestamp(s32 frameCount, s32 xPos, s32 yPos, u8 red, u8 green, u8 blu gMenuImageStack[imageIndex].unk18 = seconds % 10; gMenuImageStack[imageIndex].unkC = xPos; func_8009CA60(imageIndex); - + xPos += xOffset2; gMenuImageStack[imageIndex2].unkC = xPos; func_8009CA60(imageIndex2); - xPos += xOffset3; + xPos += xOffset3; gMenuImageStack[imageIndex].unk18 = hundredths / 10; gMenuImageStack[imageIndex].unkC = xPos; func_8009CA60(imageIndex); - xPos += xOffset1; + xPos += xOffset1; gMenuImageStack[imageIndex].unk18 = hundredths % 10; gMenuImageStack[imageIndex].unkC = xPos; func_8009CA60(imageIndex); - + func_80068508(0); func_8007BF1C(1); sMenuGuiColourR = (u8)255; @@ -2305,7 +2305,7 @@ void menu_title_screen_init(void) { gTitleScreenCurrentOption = 0; gNumberOfActivePlayers = 4; initialise_player_ids(); - play_music(1); + play_music(SEQUENCE_NONE2); sMenuMusicVolume = musicGetRelativeVolume(); if (D_800DF458) { D_8012686C = 0; @@ -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(0x18); + play_music(SEQUENCE_LOBBY); func_80000B18(); } @@ -2648,7 +2648,7 @@ s32 menu_audio_options_loop(s32 arg0) { } else { func_80000B28(); set_music_player_voice_limit(0x18); - play_music(0x18); + play_music(SEQUENCE_LOBBY); func_80000B18(); } } @@ -2701,7 +2701,7 @@ void func_800851FC(void) { } if (D_801263D8 >= 0) { set_music_player_voice_limit(0x18); - play_music(0x18); + play_music(SEQUENCE_LOBBY); set_music_fade_timer(0x100); func_80000B18(); } @@ -2748,7 +2748,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_80085B9C.s") s32 func_800860A8(s32 controllerIndex, s32 *arg1, unk800860A8 *arg2, s32 *arg3, s32 fileSize, UNUSED s32 arg5) { s32 ret = 0; - + if (*arg1 != 0) { ret = get_free_space(controllerIndex, &arg2[*arg3].cPakBytesFree, &sControllerPakNotesFree[controllerIndex]); if (ret == CONTROLLER_PAK_GOOD) { @@ -2762,9 +2762,9 @@ s32 func_800860A8(s32 controllerIndex, s32 *arg1, unk800860A8 *arg2, s32 *arg3, if ((*arg1 < 0) && status == RUMBLE_PAK) { *arg1 = 0; ret = 0; - } else if - (status != CONTROLLER_PAK_WITH_BAD_ID && - status != CONTROLLER_PAK_INCONSISTENT && + } else if + (status != CONTROLLER_PAK_WITH_BAD_ID && + status != CONTROLLER_PAK_INCONSISTENT && status != CONTROLLER_PAK_BAD_DATA) { ret = 0; @@ -2937,13 +2937,13 @@ SIDeviceStatus func_80087F14(s32 *controllerIndex, s32 arg1) { } } } - if ( (pakStatusSuccess == 0) - || (pakStatusError3 != 0) - || (pakStatusErrorNoFreeSpace != 0) + if ( (pakStatusSuccess == 0) + || (pakStatusError3 != 0) + || (pakStatusErrorNoFreeSpace != 0) || (pakStatusError9 != 0)) { return NO_CONTROLLER_PAK; // Return unsuccessfully? } - + controllerIndexVal = *controllerIndex; if (controllerIndexVal < 0) { i = controllerIndexVal; @@ -2976,7 +2976,7 @@ SIDeviceStatus func_80087F14(s32 *controllerIndex, s32 arg1) { } } while (sControllerPakIssueNotFound[i] == 0); } - + *controllerIndex = controllerIndexVal; ret = get_controller_pak_file_list(controllerIndexVal, 16, &sCurrentControllerPakAllFileNames, &sCurrentControllerPakAllFileExtensions, &sCurrentControllerPakAllFileSizes, &sCurrentControllerPakAllFileTypes); @@ -2990,7 +2990,7 @@ SIDeviceStatus func_80087F14(s32 *controllerIndex, s32 arg1) { for (; sCurrentControllerPakAllFileNames[i][k] != 0; j++, k++) { D_80126AA0[i][j] = sCurrentControllerPakAllFileNames[i][k]; } - + if ((sCurrentControllerPakAllFileExtensions[i] != 0) && (*sCurrentControllerPakAllFileExtensions[i] != 0)) { D_80126AA0[i][j] = '.'; j++; @@ -3050,7 +3050,7 @@ s32 menu_boot_loop(s32 arg0) { if (osTvType == TV_TYPE_PAL) { y = 132; } - + temp = y; switch (D_80126C20) { @@ -3165,10 +3165,10 @@ void func_80088938(s32 arg0) { set_text_colour(255, 255, 255, 0, 255); draw_text(&sMenuCurrDisplayList, 160, 30, gMenuText[35], ALIGN_MIDDLE_CENTER); assign_dialogue_box_id(6); - + //HERE! set_current_dialogue_box_coords(6, 58, yPos, 262, yPos + 30); - + if (D_800DF460 == -1) { set_current_dialogue_background_colour(6, 255, 255, 255, (alpha >> 1) + 128); @@ -3240,7 +3240,7 @@ void func_80088938(s32 arg0) { set_dialogue_font(6, 0); set_current_dialogue_box_coords(6, 76, yPos - 28, 244, yPos + 28); set_current_dialogue_background_colour(6, 0, 0, 0, 160); - + for (yPos = 4, i = 0; i < 3; i++) { if (i == 0) { set_current_text_colour(6, 255, 0, 255, 64, 255); @@ -3741,7 +3741,7 @@ void menu_character_select_init(void) { D_801263B8.unk0 = -1; D_801263B8.unk2 = 0; D_801263B8.unk1 = 0; - play_music(0x1A); + play_music(SEQUENCE_CHARACTER_SELECT); 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(0x1A); + play_music(SEQUENCE_CHARACTER_SELECT); 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(0x1A); + play_music(SEQUENCE_CHARACTER_SELECT); 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(0x18); + play_music(SEQUENCE_LOBBY); 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(0x18); + play_music(SEQUENCE_LOBBY); 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(0x18); + play_music(SEQUENCE_LOBBY); 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(0x18); + play_music(SEQUENCE_LOBBY); set_music_fade_timer(0x100); } #else @@ -5897,19 +5897,19 @@ void menu_credits_init(void) { set_music_player_voice_limit(0x18); D_800E18F8 = (u16)0x1000; if (gViewingCreditsFromCheat) { - play_music(8); + play_music(SEQUENCE_DARKMOON_CAVERNS); gCreditsArray[84] = gCreditsLastMessageArray[2]; // "THE END" gCreditsArray[85] = gCreditsLastMessageArray[3]; // "NO CHEAT" gCreditsArray[86] = gCreditsLastMessageArray[4]; // "THIS TIME." gViewingCreditsFromCheat = 0; } else { if (settings->bosses & 0x20) { - play_music(0x25); + play_music(SEQUENCE_CRESCENT_ISLAND); gCreditsArray[84] = gCreditsLastMessageArray[1]; // "TO BE CONTINUED ..." D_800E18F8 = (u16)0x61F4; D_80126BCC = 9; } else { - play_music(8); + play_music(SEQUENCE_DARKMOON_CAVERNS); gCreditsArray[84] = gCreditsLastMessageArray[0]; // "THE END?" } diff --git a/src/racer.c b/src/racer.c index 0b06a434..dee43107 100644 --- a/src/racer.c +++ b/src/racer.c @@ -565,7 +565,7 @@ void func_8004C140(Object *obj, Object_Racer *racer) { racer->unk1C9 = 0; } if (racer->unk1D6 < 5) { - func_800570B8(obj, 450, 8, 129); + func_800570B8(obj, SOUND_VOICE_CHARACTER_NEGATIVE, 8, 129); switch (racer->unk187) { case 1: case 2: @@ -1609,7 +1609,7 @@ GLOBAL_ASM("asm/non_matchings/racer/func_80055EC0.s") void play_char_horn_sound(Object *obj, Object_Racer *racer) { if (get_filtered_cheats() & CHEAT_HORN_CHEAT) { // Play character voice instead of horn. - func_800570B8(obj, 0x162, 8, 0x82); + func_800570B8(obj, SOUND_VOICE_CHARACTER_POSITIVE, 8, 130); } else { // Play character's horn sound racer_play_sound(obj, racer->characterId + SOUND_HORN1); @@ -1635,25 +1635,25 @@ void func_800570A4(Object *obj, s32 arg1, s32 arg2) { temp->unk210 = arg2; } -void func_800570B8(Object *obj, s32 arg1, s32 arg2, s32 arg3) { +void func_800570B8(Object *obj, s32 soundID, s32 arg2, s32 arg3) { s32 temp_v1; Object_64 *temp_s2; temp_s2 = obj->unk64; if ((temp_s2->racer.unk108 == 0) && ((!(arg3 & 0x80)) || (D_8011D55C != -1))) { if (arg3 == 2) { - if ((temp_s2->racer.unk24 != 0) && (arg1 != temp_s2->racer.unk2A)) { + if ((temp_s2->racer.unk24 != 0) && (soundID != temp_s2->racer.unk2A)) { func_800096F8(temp_s2->racer.unk24); temp_s2->racer.unk24 = 0; } } if ((temp_s2->racer.unk24 == 0) && ((arg3 != 3) || (get_random_number_from_range(0, 1) != 0))) { - temp_s2->racer.unk2A = arg1; - arg1 += temp_s2->racer.characterId; - temp_v1 = (get_random_number_from_range(0, arg2 - 1) * 12) + arg1; + temp_s2->racer.unk2A = soundID; + soundID += temp_s2->racer.characterId; + temp_v1 = (get_random_number_from_range(0, arg2 - 1) * 12) + soundID; if (arg2 - 1 > 0) { while (temp_v1 == temp_s2->racer.unk28) { - temp_v1 = (get_random_number_from_range(0, arg2 - 1) * 12) + arg1; + temp_v1 = (get_random_number_from_range(0, arg2 - 1) * 12) + soundID; } } func_80009558(temp_v1, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, &temp_s2->racer.unk24); @@ -1753,7 +1753,7 @@ f32 handle_racer_top_speed(Object *obj, Object_Racer *racer) { if (!gRaceStartTimer) { if (racer->boost_sound & BOOST_RACE_START) { racer->boost_sound &= ~BOOST_RACE_START; - func_800570B8(obj, 354, 8, 130); + func_800570B8(obj, SOUND_VOICE_CHARACTER_POSITIVE, 8, 130); racer_play_sound(obj, SOUND_NITRO_BOOST); } } diff --git a/src/racer.h b/src/racer.h index b90d9d57..008c657e 100644 --- a/src/racer.h +++ b/src/racer.h @@ -224,7 +224,7 @@ s32 func_80052388(Object *obj1, Object_Racer *racer, Object *obj2, f32 distance) void func_80055A84(Object *obj, Object_Racer *racer, s32 arg2); void func_8005C270(Object_Racer *racer); f32 handle_racer_top_speed(Object *obj, Object_Racer *racer); -void func_800570B8(Object *obj, s32 arg1, s32 arg2, s32 arg3); +void func_800570B8(Object *obj, s32 soundID, s32 arg2, s32 arg3); void apply_vehicle_rotation_offset(Object_Racer *obj, s32 max, s16 yRotation, s16 xRotation, s16 zRotation); void func_80059080(Object *obj, Object_Racer *racer, f32 *velX, f32 *velY, f32 *velZ); void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 arg3);