diff --git a/src/menu/file_select.c b/src/menu/file_select.c index 7c485218..b6426eb2 100644 --- a/src/menu/file_select.c +++ b/src/menu/file_select.c @@ -23,10 +23,6 @@ #include "text_strings.h" #include "eu_translation.h" -#ifdef VERSION_EU -#undef LANGUAGE_FUNCTION -#define LANGUAGE_FUNCTION sLanguageMode -#endif /** * @file file_select.c @@ -35,19 +31,13 @@ * special menu messages and phases, button states and button clicked checks. */ -#ifdef VERSION_US // The current sound mode is automatically centered on US and Shindou. static s16 sSoundTextX; -#endif //! @Bug (UB Array Access) For EU, more buttons were added than the array was extended. //! This causes no currently known issues on console (as the other variables are not changed //! while this is used) but can cause issues with other compilers. -#if defined(VERSION_EU) && !defined(AVOID_UB) -#define NUM_BUTTONS (MENU_BUTTON_OPTION_MAX - 1) -#else #define NUM_BUTTONS MENU_BUTTON_OPTION_MAX -#endif // Amount of main menu buttons defined in the code called by spawn_object_rel_with_rot. // See file_select.h for the names in MenuButtonTypes. @@ -101,9 +91,6 @@ static s8 sSoundMode = 0; // Active language for EU arrays, values defined similar to sSoundMode // 0: English | 1: French | 2: German -#ifdef VERSION_EU -static s8 sLanguageMode = LANGUAGE_ENGLISH; -#endif // Tracks which button will be pressed in the erase confirmation prompt (yes/no). static s8 sEraseYesNoHoverState = MENU_ERASE_HOVER_NONE; @@ -121,169 +108,55 @@ static s8 sSelectedFileNum = 0; static s8 sScoreFileCoinScoreMode = 0; // In EU, if no save file exists, open the language menu so the user can find it. -#ifdef VERSION_EU -static s8 sOpenLangSettings = FALSE; -#endif -#ifndef VERSION_EU static unsigned char textReturn[] = { TEXT_RETURN }; -#else -static unsigned char textReturn[][8] = {{ TEXT_RETURN }, { TEXT_RETURN_FR }, { TEXT_RETURN_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textViewScore[] = { TEXT_CHECK_SCORE }; -#else -static unsigned char textViewScore[][12] = {{ TEXT_CHECK_SCORE }, {TEXT_CHECK_SCORE_FR}, {TEXT_CHECK_SCORE_DE}}; -#endif -#ifndef VERSION_EU static unsigned char textCopyFileButton[] = { TEXT_COPY_FILE_BUTTON }; -#else -static unsigned char textCopyFileButton[][15] = {{ TEXT_COPY_FILE }, { TEXT_COPY_FILE_FR }, { TEXT_COPY_FILE_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textEraseFileButton[] = { TEXT_ERASE_FILE_BUTTON }; -#else -static unsigned char textEraseFileButton[][16] = { {TEXT_ERASE_FILE}, {TEXT_ERASE_FILE_FR}, {TEXT_ERASE_FILE_DE} }; -#endif -#ifndef VERSION_EU static unsigned char textSoundModes[][8] = { { TEXT_STEREO }, { TEXT_MONO }, { TEXT_HEADSET } }; -#endif static unsigned char textMarioA[] = { TEXT_FILE_MARIO_A }; static unsigned char textMarioB[] = { TEXT_FILE_MARIO_B }; static unsigned char textMarioC[] = { TEXT_FILE_MARIO_C }; static unsigned char textMarioD[] = { TEXT_FILE_MARIO_D }; -#ifndef VERSION_EU static unsigned char textNew[] = { TEXT_NEW }; static unsigned char starIcon[] = { GLYPH_STAR, GLYPH_SPACE }; static unsigned char xIcon[] = { GLYPH_MULTIPLY, GLYPH_SPACE }; -#endif -#ifndef VERSION_EU static unsigned char textSelectFile[] = { TEXT_SELECT_FILE }; -#else -static unsigned char textSelectFile[][17] = {{ TEXT_SELECT_FILE }, { TEXT_SELECT_FILE_FR }, { TEXT_SELECT_FILE_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textScore[] = { TEXT_SCORE }; -#else -static unsigned char textScore[][9] = {{ TEXT_SCORE }, { TEXT_SCORE_FR }, { TEXT_SCORE_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textCopy[] = { TEXT_COPY }; -#else -static unsigned char textCopy[][9] = {{ TEXT_COPY }, { TEXT_COPY_FR }, { TEXT_COPY_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textErase[] = { TEXT_ERASE }; -#else -static unsigned char textErase[][8] = {{ TEXT_ERASE }, { TEXT_ERASE_FR }, { TEXT_ERASE_DE }}; -#endif -#ifdef VERSION_EU -static unsigned char textOption[][9] = {{ TEXT_OPTION }, { TEXT_OPTION_FR }, { TEXT_OPTION_DE } }; -#endif -#ifndef VERSION_EU static unsigned char textCheckFile[] = { TEXT_CHECK_FILE }; -#else -static unsigned char textCheckFile[][18] = {{ TEXT_CHECK_FILE }, { TEXT_CHECK_FILE_FR }, { TEXT_CHECK_FILE_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textNoSavedDataExists[] = { TEXT_NO_SAVED_DATA_EXISTS }; -#else -static unsigned char textNoSavedDataExists[][30] = {{ TEXT_NO_SAVED_DATA_EXISTS }, { TEXT_NO_SAVED_DATA_EXISTS_FR }, { TEXT_NO_SAVED_DATA_EXISTS_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textCopyFile[] = { TEXT_COPY_FILE }; -#else -static unsigned char textCopyFile[][16] = {{ TEXT_COPY_FILE_BUTTON }, { TEXT_COPY_FILE_BUTTON_FR }, { TEXT_COPY_FILE_BUTTON_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textCopyItToWhere[] = { TEXT_COPY_IT_TO_WHERE }; -#else -static unsigned char textCopyItToWhere[][18] = {{ TEXT_COPY_IT_TO_WHERE }, { TEXT_COPY_IT_TO_WHERE_FR }, { TEXT_COPY_IT_TO_WHERE_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textNoSavedDataExistsCopy[] = { TEXT_NO_SAVED_DATA_EXISTS }; -#endif -#ifndef VERSION_EU static unsigned char textCopyCompleted[] = { TEXT_COPYING_COMPLETED }; -#else -static unsigned char textCopyCompleted[][18] = {{ TEXT_COPYING_COMPLETED }, { TEXT_COPYING_COMPLETED_FR }, { TEXT_COPYING_COMPLETED_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textSavedDataExists[] = { TEXT_SAVED_DATA_EXISTS }; -#else -static unsigned char textSavedDataExists[][20] = {{ TEXT_SAVED_DATA_EXISTS }, { TEXT_SAVED_DATA_EXISTS_FR }, { TEXT_SAVED_DATA_EXISTS_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textNoFileToCopyFrom[] = { TEXT_NO_FILE_TO_COPY_FROM }; -#else -static unsigned char textNoFileToCopyFrom[][21] = {{ TEXT_NO_FILE_TO_COPY_FROM }, { TEXT_NO_FILE_TO_COPY_FROM_FR }, { TEXT_NO_FILE_TO_COPY_FROM_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textYes[] = { TEXT_YES }; -#else -static unsigned char textYes[][4] = {{ TEXT_YES }, { TEXT_YES_FR }, { TEXT_YES_DE }}; -#endif -#ifndef VERSION_EU static unsigned char textNo[] = { TEXT_NO }; -#else -static unsigned char textNo[][5] = {{ TEXT_NO }, { TEXT_NO_FR }, { TEXT_NO_DE }}; -#endif -#ifdef VERSION_EU -// In EU, Erase File and Sound Select strings are outside it's print string function -static unsigned char textEraseFile[][17] = { - { TEXT_ERASE_FILE_BUTTON }, { TEXT_ERASE_FILE_BUTTON_FR }, { TEXT_ERASE_FILE_BUTTON_DE } -}; -static unsigned char textSure[][8] = {{ TEXT_SURE }, { TEXT_SURE_FR }, { TEXT_SURE_DE }}; -static unsigned char textMarioAJustErased[][20] = { - { TEXT_FILE_MARIO_A_JUST_ERASED }, { TEXT_FILE_MARIO_A_JUST_ERASED_FR }, { TEXT_FILE_MARIO_A_JUST_ERASED_DE } -}; - -static unsigned char textSoundSelect[][13] = { - { TEXT_SOUND_SELECT }, { TEXT_SOUND_SELECT_FR }, { TEXT_SOUND_SELECT_DE } -}; - -static unsigned char textLanguageSelect[][17] = { - { TEXT_LANGUAGE_SELECT }, { TEXT_LANGUAGE_SELECT_FR }, { TEXT_LANGUAGE_SELECT_DE } -}; - -static unsigned char textSoundModes[][10] = { - { TEXT_STEREO }, { TEXT_MONO }, { TEXT_HEADSET }, - { TEXT_STEREO_FR }, { TEXT_MONO_FR }, { TEXT_HEADSET_FR }, - { TEXT_STEREO_DE }, { TEXT_MONO_DE }, { TEXT_HEADSET_DE } -}; - -static unsigned char textLanguage[][9] = {{ TEXT_ENGLISH }, { TEXT_FRENCH }, { TEXT_GERMAN }}; - -static unsigned char textMario[] = { TEXT_MARIO }; -static unsigned char textHiScore[][15] = {{ TEXT_HI_SCORE }, { TEXT_HI_SCORE_FR }, { TEXT_HI_SCORE_DE }}; -static unsigned char textMyScore[][10] = {{ TEXT_MY_SCORE }, { TEXT_MY_SCORE_FR }, { TEXT_MY_SCORE_DE }}; - -static unsigned char textNew[][5] = {{ TEXT_NEW }, { TEXT_NEW_FR }, { TEXT_NEW_DE }}; -static unsigned char starIcon[] = { GLYPH_STAR, GLYPH_SPACE }; -static unsigned char xIcon[] = { GLYPH_MULTIPLY, GLYPH_SPACE }; -#endif /** * Yellow Background Menu Initial Action @@ -622,11 +495,7 @@ void render_score_menu_buttons(struct Object *scoreButton) { sMainMenuButtons[MENU_BUTTON_SCORE_ERASE_FILE]->oMenuButtonScale = 0.11111111f; } -#ifdef VERSION_EU - #define SCORE_TIMER 46 -#else #define SCORE_TIMER 31 -#endif /** * In the score menu, checks if a button was clicked to play a sound, button state and other functions. */ @@ -741,11 +610,7 @@ void render_copy_menu_buttons(struct Object *copyButton) { sMainMenuButtons[MENU_BUTTON_COPY_ERASE_FILE]->oMenuButtonScale = 0.11111111f; } -#ifdef VERSION_EU - #define BUZZ_TIMER 36 -#else #define BUZZ_TIMER 21 -#endif /** * Copy Menu phase actions that handles what to do when a file button is clicked. @@ -818,13 +683,8 @@ void copy_action_file_button(struct Object *copyButton, s32 copyFileButtonID) { } } -#ifdef VERSION_EU - #define ACTION_TIMER 41 - #define MAIN_RETURN_TIMER 36 -#else #define ACTION_TIMER 31 #define MAIN_RETURN_TIMER 31 -#endif /** * In the copy menu, checks if a button was clicked to play a sound, button state and other functions. @@ -1028,11 +888,7 @@ void check_erase_menu_clicked_buttons(struct Object *eraseButton) { #undef ACTION_TIMER #undef MAIN_RETURN_TIMER -#ifdef VERSION_EU - #define SOUND_BUTTON_Y 388 -#else #define SOUND_BUTTON_Y 0 -#endif /** * Render buttons for the sound mode menu. @@ -1051,28 +907,8 @@ void render_sound_mode_menu_buttons(struct Object *soundModeButton) { soundModeButton, MODEL_MAIN_MENU_GENERIC_BUTTON, bhvMenuButton, -533, SOUND_BUTTON_Y, -100, 0, -0x8000, 0); sMainMenuButtons[MENU_BUTTON_HEADSET]->oMenuButtonScale = 0.11111111f; -#ifdef VERSION_EU - // English option button - sMainMenuButtons[MENU_BUTTON_LANGUAGE_ENGLISH] = spawn_object_rel_with_rot( - soundModeButton, MODEL_MAIN_MENU_GENERIC_BUTTON, bhvMenuButton, 533, -111, -100, 0, -0x8000, 0); - sMainMenuButtons[MENU_BUTTON_LANGUAGE_ENGLISH]->oMenuButtonScale = 0.11111111f; - // French option button - sMainMenuButtons[MENU_BUTTON_LANGUAGE_FRENCH] = spawn_object_rel_with_rot( - soundModeButton, MODEL_MAIN_MENU_GENERIC_BUTTON, bhvMenuButton, 0, -111, -100, 0, -0x8000, 0); - sMainMenuButtons[MENU_BUTTON_LANGUAGE_FRENCH]->oMenuButtonScale = 0.11111111f; - // German option button - sMainMenuButtons[MENU_BUTTON_LANGUAGE_GERMAN] = spawn_object_rel_with_rot( - soundModeButton, MODEL_MAIN_MENU_GENERIC_BUTTON, bhvMenuButton, -533, -111, -100, 0, -0x8000, 0); - sMainMenuButtons[MENU_BUTTON_LANGUAGE_GERMAN]->oMenuButtonScale = 0.11111111f; - - // Return button - sMainMenuButtons[MENU_BUTTON_LANGUAGE_RETURN] = spawn_object_rel_with_rot( - soundModeButton, MODEL_MAIN_MENU_YELLOW_FILE_BUTTON, bhvMenuButton, 0, -533, -100, 0, -0x8000, 0); - sMainMenuButtons[MENU_BUTTON_LANGUAGE_RETURN]->oMenuButtonScale = 0.11111111f; -#else // Zoom in current selection sMainMenuButtons[MENU_BUTTON_OPTION_MIN + sSoundMode]->oMenuButtonState = MENU_BUTTON_STATE_ZOOM_IN; -#endif } #undef SOUND_BUTTON_Y @@ -1098,33 +934,13 @@ void check_sound_mode_menu_clicked_buttons(struct Object *soundModeButton) { queue_rumble_data(5, 80); #endif sMainMenuButtons[buttonID]->oMenuButtonState = MENU_BUTTON_STATE_ZOOM_IN_OUT; -#ifndef VERSION_EU // Sound menu buttons don't return to Main Menu in EU // because they don't have a case in bhv_menu_button_manager_loop sSelectedButtonID = buttonID; -#endif sSoundMode = buttonID - MENU_BUTTON_OPTION_MIN; save_file_set_sound_mode(sSoundMode); } } -#ifdef VERSION_EU - // If language mode button clicked, select it and change language - if (buttonID == MENU_BUTTON_LANGUAGE_ENGLISH || buttonID == MENU_BUTTON_LANGUAGE_FRENCH - || buttonID == MENU_BUTTON_LANGUAGE_GERMAN) { - if (soundModeButton->oMenuButtonActionPhase == SOUND_MODE_PHASE_MAIN) { - play_sound(SOUND_MENU_CLICK_FILE_SELECT, gGlobalSoundSource); - sMainMenuButtons[buttonID]->oMenuButtonState = MENU_BUTTON_STATE_ZOOM_IN_OUT; - sLanguageMode = buttonID - MENU_BUTTON_LANGUAGE_MIN; - eu_set_language(sLanguageMode); - } - } - // If neither of the buttons above are pressed, return to main menu - if (buttonID == MENU_BUTTON_LANGUAGE_RETURN) { - play_sound(SOUND_MENU_CLICK_FILE_SELECT, gGlobalSoundSource); - sMainMenuButtons[buttonID]->oMenuButtonState = MENU_BUTTON_STATE_ZOOM_IN_OUT; - sSelectedButtonID = buttonID; - } -#endif sCurrentMenuLevel = MENU_LAYER_SUBMENU; break; @@ -1376,20 +1192,13 @@ void bhv_menu_button_manager_init(void) { sTextBaseAlpha = 0; } -#if defined(VERSION_JP) - #define SAVE_FILE_SOUND SOUND_MENU_STAR_SOUND -#else #define SAVE_FILE_SOUND SOUND_MENU_STAR_SOUND_OKEY_DOKEY -#endif /** * In the main menu, check if a button was clicked to play it's button growing state. * Also play a sound and/or render buttons depending of the button ID selected. */ void check_main_menu_clicked_buttons(void) { -#ifdef VERSION_EU - if (sMainMenuTimer >= 5) { -#endif // Sound mode menu is handled separately because the button ID for it // is not grouped with the IDs of the other submenus. if (check_clicked_button(sMainMenuButtons[MENU_BUTTON_SOUND_MODE]->oPosX, @@ -1412,14 +1221,6 @@ void check_main_menu_clicked_buttons(void) { } } } -#ifdef VERSION_EU - // Open Options Menu if sOpenLangSettings is TRUE (It's TRUE when there's no saves) - if (sOpenLangSettings == TRUE) { - sMainMenuButtons[MENU_BUTTON_SOUND_MODE]->oMenuButtonState = MENU_BUTTON_STATE_GROWING; - sSelectedButtonID = MENU_BUTTON_SOUND_MODE; - sOpenLangSettings = FALSE; - } -#endif // Play sound of the save file clicked switch (sSelectedButtonID) { @@ -1481,9 +1282,6 @@ void check_main_menu_clicked_buttons(void) { render_sound_mode_menu_buttons(sMainMenuButtons[MENU_BUTTON_SOUND_MODE]); break; } -#ifdef VERSION_EU - } -#endif } #undef SAVE_FILE_SOUND @@ -1590,11 +1388,6 @@ void bhv_menu_button_manager_loop(void) { // STEREO, MONO and HEADSET buttons are undefined so they can be selected without // exiting the Options menu, as a result they added a return button -#ifdef VERSION_EU - case MENU_BUTTON_LANGUAGE_RETURN: - return_to_main_menu(MENU_BUTTON_SOUND_MODE, sMainMenuButtons[MENU_BUTTON_LANGUAGE_RETURN]); - break; -#else case MENU_BUTTON_STEREO: return_to_main_menu(MENU_BUTTON_SOUND_MODE, sMainMenuButtons[MENU_BUTTON_STEREO]); break; @@ -1604,7 +1397,6 @@ void bhv_menu_button_manager_loop(void) { case MENU_BUTTON_HEADSET: return_to_main_menu(MENU_BUTTON_SOUND_MODE, sMainMenuButtons[MENU_BUTTON_HEADSET]); break; -#endif } sClickPos[0] = -10000; @@ -1621,11 +1413,7 @@ void handle_cursor_button_input(void) { || sSelectedButtonID == MENU_BUTTON_SCORE_FILE_C || sSelectedButtonID == MENU_BUTTON_SCORE_FILE_D) { if (gPlayer3Controller->buttonPressed -#ifdef VERSION_EU - & (B_BUTTON | START_BUTTON | Z_TRIG)) { -#else & (B_BUTTON | START_BUTTON)) { -#endif sClickPos[0] = sCursorPos[0]; sClickPos[1] = sCursorPos[1]; sCursorClickingTimer = 1; @@ -1635,11 +1423,7 @@ void handle_cursor_button_input(void) { } } else { // If cursor is clicked if (gPlayer3Controller->buttonPressed -#ifdef VERSION_EU - & (A_BUTTON | B_BUTTON | START_BUTTON | Z_TRIG)) { -#else & (A_BUTTON | B_BUTTON | START_BUTTON)) { -#endif sClickPos[0] = sCursorPos[0]; sClickPos[1] = sCursorPos[1]; sCursorClickingTimer = 1; @@ -1777,21 +1561,6 @@ void print_save_file_star_count(s8 fileIndex, s16 x, s16 y) { } } -#if defined(VERSION_JP) || defined(VERSION_SH) - #define SELECT_FILE_X 96 - #define SCORE_X 50 - #define COPY_X 115 - #define ERASE_X 180 -#ifdef VERSION_JP - #define SOUNDMODE_X1 235 -#else - #define SOUNDMODE_X1 sSoundTextX -#endif - #define SAVEFILE_X1 92 - #define SAVEFILE_X2 209 - #define MARIOTEXT_X1 92 - #define MARIOTEXT_X2 207 -#elif defined(VERSION_US) #define SELECT_FILE_X 93 #define SCORE_X 52 #define COPY_X 117 @@ -1801,12 +1570,6 @@ void print_save_file_star_count(s8 fileIndex, s16 x, s16 y) { #define SAVEFILE_X2 209 #define MARIOTEXT_X1 92 #define MARIOTEXT_X2 207 -#else // VERSION_EU - #define SAVEFILE_X1 97 - #define SAVEFILE_X2 204 - #define MARIOTEXT_X1 97 - #define MARIOTEXT_X2 204 -#endif /** * Prints main menu strings that shows on the yellow background menu screen. @@ -1816,35 +1579,25 @@ void print_save_file_star_count(s8 fileIndex, s16 x, s16 y) { * Same rule applies for score, copy and erase strings. */ void print_main_menu_strings(void) { -#ifdef VERSION_SH - // The current sound mode is automatically centered on US and Shindou. - static s16 sSoundTextX; // TODO: There should be a way to make this match on both US and Shindou. -#endif // Print "SELECT FILE" text gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); -#ifndef VERSION_EU print_hud_lut_string(HUD_LUT_DIFF, SELECT_FILE_X, 35, textSelectFile); -#endif // Print file star counts print_save_file_star_count(SAVE_FILE_A, SAVEFILE_X1, 78); print_save_file_star_count(SAVE_FILE_B, SAVEFILE_X2, 78); print_save_file_star_count(SAVE_FILE_C, SAVEFILE_X1, 118); print_save_file_star_count(SAVE_FILE_D, SAVEFILE_X2, 118); gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); -#ifndef VERSION_EU // Print menu names gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); print_generic_string(SCORE_X, 39, textScore); print_generic_string(COPY_X, 39, textCopy); print_generic_string(ERASE_X, 39, textErase); -#ifndef VERSION_JP sSoundTextX = get_str_x_pos_from_center(254, textSoundModes[sSoundMode], 10.0f); -#endif print_generic_string(SOUNDMODE_X1, 39, textSoundModes[sSoundMode]); gSPDisplayList(gDisplayListHead++, dl_ia_text_end); -#endif // Print file names gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); @@ -1855,101 +1608,35 @@ void print_main_menu_strings(void) { gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_end); } -#ifdef VERSION_EU -/** - * Prints the first part main menu strings that shows on the yellow background menu screen. - * Has the strings for the 4 buttons below the save buttons that get changed depending of the language. - * Calls print_main_menu_strings to print the remaining strings. - */ -void print_main_lang_strings(void) { - static s16 centeredX; - // Print "SELECT FILE" text - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); - centeredX = get_str_x_pos_from_center_scale(160, textSelectFile[sLanguageMode], 12.0f); - print_hud_lut_string(HUD_LUT_GLOBAL, centeredX, 35, textSelectFile[sLanguageMode]); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); - - // Print menu names - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); - centeredX = get_str_x_pos_from_center(76, textScore[sLanguageMode], 10.0f); - print_generic_string(centeredX, 39, textScore[sLanguageMode]); - centeredX = get_str_x_pos_from_center(131, textCopy[sLanguageMode], 10.0f); - print_generic_string(centeredX, 39, textCopy[sLanguageMode]); - centeredX = get_str_x_pos_from_center(189, textErase[sLanguageMode], 10.0f); - print_generic_string(centeredX, 39, textErase[sLanguageMode]); - centeredX = get_str_x_pos_from_center(245, textOption[sLanguageMode], 10.0f); - print_generic_string(centeredX, 39, textOption[sLanguageMode]); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); - - print_main_menu_strings(); -} -#endif - -#ifdef VERSION_EU -#define CHECK_FILE_X checkFileX -#define NOSAVE_DATA_X1 noSaveDataX -#elif defined(VERSION_JP) || defined(VERSION_SH) -#define CHECK_FILE_X 90 -#define NOSAVE_DATA_X1 90 -#else #define CHECK_FILE_X 95 #define NOSAVE_DATA_X1 99 -#endif /** * Defines IDs for the top message of the score menu and displays it if the ID is called in messageID. */ void score_menu_display_message(s8 messageID) { -#ifdef VERSION_EU - s16 checkFileX, noSaveDataX; -#endif switch (messageID) { case SCORE_MSG_CHECK_FILE: -#ifdef VERSION_EU - checkFileX = get_str_x_pos_from_center_scale(160, LANGUAGE_ARRAY(textCheckFile), 12.0f); -#endif print_hud_lut_string_fade(HUD_LUT_DIFF, CHECK_FILE_X, 35, LANGUAGE_ARRAY(textCheckFile)); break; case SCORE_MSG_NOSAVE_DATA: -#ifdef VERSION_EU - noSaveDataX = get_str_x_pos_from_center(160, LANGUAGE_ARRAY(textNoSavedDataExists), 10.0f); -#endif print_generic_string_fade(NOSAVE_DATA_X1, 190, LANGUAGE_ARRAY(textNoSavedDataExists)); break; } } -#if defined(VERSION_JP) || defined(VERSION_SH) - #define RETURN_X 45 - #define COPYFILE_X1 128 - #define ERASEFILE_X1 228 -#elif defined(VERSION_EU) - #define RETURN_X centeredX - #define COPYFILE_X1 centeredX - #define ERASEFILE_X1 centeredX -#else #define RETURN_X 44 #define COPYFILE_X1 135 #define ERASEFILE_X1 231 -#endif -#ifdef VERSION_EU - #define FADEOUT_TIMER 35 -#else #define FADEOUT_TIMER 20 -#endif /** * Prints score menu strings that shows on the green background menu screen. */ void print_score_menu_strings(void) { -#ifdef VERSION_EU - s16 centeredX; -#endif // Update and print the message at the top of the menu. if (sMainMenuTimer == FADEOUT_TIMER) { @@ -1965,7 +1652,6 @@ void print_score_menu_strings(void) { // Print messageID called above score_menu_display_message(sStatusMessageID); -#ifndef VERSION_EU // Print file star counts gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); @@ -1974,28 +1660,15 @@ void print_score_menu_strings(void) { print_save_file_star_count(SAVE_FILE_C, 90, 119); print_save_file_star_count(SAVE_FILE_D, 211, 119); gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); -#endif // Print menu names gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(69, textReturn[sLanguageMode], 10.0f); -#endif print_generic_string(RETURN_X, 35, LANGUAGE_ARRAY(textReturn)); -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(159, textCopyFileButton[sLanguageMode], 10.0f); -#endif print_generic_string(COPYFILE_X1, 35, LANGUAGE_ARRAY(textCopyFileButton)); -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(249, textEraseFileButton[sLanguageMode], 10.0f); -#endif print_generic_string(ERASEFILE_X1, 35, LANGUAGE_ARRAY(textEraseFileButton)); gSPDisplayList(gDisplayListHead++, dl_ia_text_end); -#ifdef VERSION_EU - print_main_menu_strings(); -#else // Print file names gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); @@ -2004,78 +1677,38 @@ void print_score_menu_strings(void) { print_menu_generic_string(89, 105, textMarioC); print_menu_generic_string(211, 105, textMarioD); gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_end); -#endif } -#if defined(VERSION_JP) || defined(VERSION_SH) - #define NOFILE_COPY_X 90 - #define COPY_FILE_X 90 - #define COPYIT_WHERE_X 90 - #define NOSAVE_DATA_X2 90 - #define COPYCOMPLETE_X 90 - #define SAVE_EXISTS_X1 90 -#elif defined(VERSION_EU) - #define NOFILE_COPY_X centeredX - #define COPY_FILE_X centeredX - #define COPYIT_WHERE_X centeredX - #define NOSAVE_DATA_X2 centeredX - #define COPYCOMPLETE_X centeredX - #define SAVE_EXISTS_X1 centeredX -#else #define NOFILE_COPY_X 119 #define COPY_FILE_X 104 #define COPYIT_WHERE_X 109 #define NOSAVE_DATA_X2 101 #define COPYCOMPLETE_X 110 #define SAVE_EXISTS_X1 110 -#endif /** * Defines IDs for the top message of the copy menu and displays it if the ID is called in messageID. */ void copy_menu_display_message(s8 messageID) { -#ifdef VERSION_EU - s16 centeredX; -#endif switch (messageID) { case COPY_MSG_MAIN_TEXT: if (sAllFilesExist == TRUE) { -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(160, textNoFileToCopyFrom[sLanguageMode], 10.0f); -#endif print_generic_string_fade(NOFILE_COPY_X, 190, LANGUAGE_ARRAY(textNoFileToCopyFrom)); } else { -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center_scale(160, textCopyFile[sLanguageMode], 12.0f); -#endif print_hud_lut_string_fade(HUD_LUT_DIFF, COPY_FILE_X, 35, LANGUAGE_ARRAY(textCopyFile)); } break; case COPY_MSG_COPY_WHERE: -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(160, textCopyItToWhere[sLanguageMode], 10.0f); -#endif print_generic_string_fade(COPYIT_WHERE_X, 190, LANGUAGE_ARRAY(textCopyItToWhere)); break; case COPY_MSG_NOSAVE_EXISTS: -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(160, textNoSavedDataExists[sLanguageMode], 10.0f); - print_generic_string_fade(NOSAVE_DATA_X2, 190, textNoSavedDataExists[sLanguageMode]); -#else print_generic_string_fade(NOSAVE_DATA_X2, 190, textNoSavedDataExistsCopy); -#endif break; case COPY_MSG_COPY_COMPLETE: -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(160, textCopyCompleted[sLanguageMode], 10.0f); -#endif print_generic_string_fade(COPYCOMPLETE_X, 190, LANGUAGE_ARRAY(textCopyCompleted)); break; case COPY_MSG_SAVE_EXISTS: -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(160, textSavedDataExists[sLanguageMode], 10.0f); -#endif print_generic_string_fade(SAVE_EXISTS_X1, 190, LANGUAGE_ARRAY(textSavedDataExists)); break; } @@ -2126,33 +1759,18 @@ void copy_menu_update_message(void) { } } -#if defined(VERSION_JP) - #define VIEWSCORE_X1 133 - #define ERASEFILE_X2 220 -#elif defined(VERSION_SH) - #define VIEWSCORE_X1 133 - #define ERASEFILE_X2 230 -#elif defined(VERSION_EU) - #define VIEWSCORE_X1 centeredX - #define ERASEFILE_X2 centeredX -#else #define VIEWSCORE_X1 128 #define ERASEFILE_X2 230 -#endif /** * Prints copy menu strings that shows on the blue background menu screen. */ void print_copy_menu_strings(void) { -#ifdef VERSION_EU - s16 centeredX; -#endif // Update and print the message at the top of the menu. copy_menu_update_message(); // Print messageID called inside a copy_menu_update_message case copy_menu_display_message(sStatusMessageID); -#ifndef VERSION_EU // Print file star counts gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); @@ -2161,26 +1779,13 @@ void print_copy_menu_strings(void) { print_save_file_star_count(SAVE_FILE_C, 90, 119); print_save_file_star_count(SAVE_FILE_D, 211, 119); gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); -#endif // Print menu names gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(69, textReturn[sLanguageMode], 10.0f); -#endif print_generic_string(RETURN_X, 35, LANGUAGE_ARRAY(textReturn)); -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(159, textViewScore[sLanguageMode], 10.0f); -#endif print_generic_string(VIEWSCORE_X1, 35, LANGUAGE_ARRAY(textViewScore)); -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(249, textEraseFileButton[sLanguageMode], 10.0f); -#endif print_generic_string(ERASEFILE_X2, 35, LANGUAGE_ARRAY(textEraseFileButton)); gSPDisplayList(gDisplayListHead++, dl_ia_text_end); -#ifdef VERSION_EU - print_main_menu_strings(); -#else // Print file names gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); @@ -2189,32 +1794,16 @@ void print_copy_menu_strings(void) { print_menu_generic_string(89, 105, textMarioC); print_menu_generic_string(211, 105, textMarioD); gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_end); -#endif } -#if defined(VERSION_JP) - #define CURSOR_X 160.0f - #define MENU_ERASE_YES_MIN_X 145 - #define MENU_ERASE_YES_MAX_X 164 -#elif defined(VERSION_SH) - #define CURSOR_X (x + 70) - #define MENU_ERASE_YES_MIN_X 145 - #define MENU_ERASE_YES_MAX_X 164 -#else #define CURSOR_X (x + 70) #define MENU_ERASE_YES_MIN_X 140 #define MENU_ERASE_YES_MAX_X 169 -#endif #define MENU_ERASE_YES_NO_MIN_Y 191 #define MENU_ERASE_YES_NO_MAX_Y 210 -#ifdef VERSION_SH - #define MENU_ERASE_NO_MIN_X 194 - #define MENU_ERASE_NO_MAX_X 213 -#else #define MENU_ERASE_NO_MIN_X 189 #define MENU_ERASE_NO_MAX_X 218 -#endif /** * Prints the "YES NO" prompt and checks if one of the prompts are hovered to do it's functions. @@ -2288,51 +1877,25 @@ void print_erase_menu_prompt(s16 x, s16 y) { // US and EU --- JP // M a r i o A --- マ リ オ Ａ // 0 1 2 3 4 5 6 --- 0 1 2 3 -#if defined(VERSION_JP) || defined(VERSION_SH) -#ifdef VERSION_SH - #define ERASE_FILE_X 111 -#else - #define ERASE_FILE_X 96 -#endif - #define NOSAVE_DATA_X3 90 - #define MARIO_ERASED_VAR 3 - #define MARIO_ERASED_X 90 - #define SAVE_EXISTS_X2 90 -#elif defined(VERSION_EU) - #define ERASE_FILE_X centeredX - #define NOSAVE_DATA_X3 centeredX - #define MARIO_ERASED_VAR 6 - #define MARIO_ERASED_X centeredX - #define SAVE_EXISTS_X2 centeredX -#else #define ERASE_FILE_X 98 #define NOSAVE_DATA_X3 100 #define MARIO_ERASED_VAR 6 #define MARIO_ERASED_X 100 #define SAVE_EXISTS_X2 100 -#endif /** * Defines IDs for the top message of the erase menu and displays it if the ID is called in messageID. */ void erase_menu_display_message(s8 messageID) { -#ifdef VERSION_EU - s16 centeredX; -#endif -#ifndef VERSION_EU unsigned char textEraseFile[] = { TEXT_ERASE_FILE }; unsigned char textSure[] = { TEXT_SURE }; unsigned char textNoSavedDataExists[] = { TEXT_NO_SAVED_DATA_EXISTS }; unsigned char textMarioAJustErased[] = { TEXT_FILE_MARIO_A_JUST_ERASED }; unsigned char textSavedDataExists[] = { TEXT_SAVED_DATA_EXISTS }; -#endif switch (messageID) { case ERASE_MSG_MAIN_TEXT: -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center_scale(160, textEraseFile[sLanguageMode], 12.0f); -#endif print_hud_lut_string_fade(HUD_LUT_DIFF, ERASE_FILE_X, 35, LANGUAGE_ARRAY(textEraseFile)); break; case ERASE_MSG_PROMPT: @@ -2340,22 +1903,13 @@ void erase_menu_display_message(s8 messageID) { print_erase_menu_prompt(90, 190); // YES NO, has functions for it too break; case ERASE_MSG_NOSAVE_EXISTS: -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(160, textNoSavedDataExists[sLanguageMode], 10.0f); -#endif print_generic_string_fade(NOSAVE_DATA_X3, 190, LANGUAGE_ARRAY(textNoSavedDataExists)); break; case ERASE_MSG_MARIO_ERASED: LANGUAGE_ARRAY(textMarioAJustErased)[MARIO_ERASED_VAR] = sSelectedFileIndex + 10; -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(160, textMarioAJustErased[sLanguageMode], 10.0f); -#endif print_generic_string_fade(MARIO_ERASED_X, 190, LANGUAGE_ARRAY(textMarioAJustErased)); break; case ERASE_MSG_SAVE_EXISTS: // unused -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(160, textSavedDataExists[sLanguageMode], 10.0f); -#endif print_generic_string_fade(SAVE_EXISTS_X2, 190, LANGUAGE_ARRAY(textSavedDataExists)); break; } @@ -2403,21 +1957,13 @@ void erase_menu_update_message(void) { } } -#if defined(VERSION_JP) || defined(VERSION_SH) -#define VIEWSCORE_X2 133 -#define COPYFILE_X2 223 -#else #define VIEWSCORE_X2 127 #define COPYFILE_X2 233 -#endif /** * Prints erase menu strings that shows on the red background menu screen. */ void print_erase_menu_strings(void) { -#ifdef VERSION_EU - s16 centeredX; -#endif // Update and print the message at the top of the menu. erase_menu_update_message(); @@ -2425,7 +1971,6 @@ void print_erase_menu_strings(void) { // Print messageID called inside a erase_menu_update_message case erase_menu_display_message(sStatusMessageID); -#ifndef VERSION_EU // Print file star counts gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); @@ -2434,29 +1979,16 @@ void print_erase_menu_strings(void) { print_save_file_star_count(SAVE_FILE_C, 90, 119); print_save_file_star_count(SAVE_FILE_D, 211, 119); gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); -#endif // Print menu names gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); -#ifdef VERSION_EU - centeredX = get_str_x_pos_from_center(69, textReturn[sLanguageMode], 10.0f); - print_generic_string(centeredX, 35, textReturn[sLanguageMode]); - centeredX = get_str_x_pos_from_center(159, textViewScore[sLanguageMode], 10.0f); - print_generic_string(centeredX, 35, textViewScore[sLanguageMode]); - centeredX = get_str_x_pos_from_center(249, textCopyFileButton[sLanguageMode], 10.0f); - print_generic_string(centeredX, 35, textCopyFileButton[sLanguageMode]); -#else print_generic_string(RETURN_X, 35, textReturn); print_generic_string(VIEWSCORE_X2, 35, textViewScore); print_generic_string(COPYFILE_X2, 35, textCopyFileButton); -#endif gSPDisplayList(gDisplayListHead++, dl_ia_text_end); -#ifdef VERSION_EU - print_main_menu_strings(); -#else // Print file names gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); @@ -2465,14 +1997,9 @@ void print_erase_menu_strings(void) { print_menu_generic_string(89, 105, textMarioC); print_menu_generic_string(211, 105, textMarioD); gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_end); -#endif } -#if defined(VERSION_JP) || defined(VERSION_SH) - #define SOUND_HUD_X 96 -#elif defined(VERSION_US) #define SOUND_HUD_X 88 -#endif /** * Prints sound mode menu strings that shows on the purple background menu screen. @@ -2482,56 +2009,20 @@ void print_erase_menu_strings(void) { void print_sound_mode_menu_strings(void) { s32 mode; -#if defined(VERSION_US) || defined(VERSION_SH) s16 textX; -#elif defined(VERSION_EU) - s32 textX; -#endif -#ifndef VERSION_EU unsigned char textSoundSelect[] = { TEXT_SOUND_SELECT }; -#endif // Print "SOUND SELECT" text gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); -#ifdef VERSION_EU - print_hud_lut_string(HUD_LUT_DIFF, 47, 32, textSoundSelect[sLanguageMode]); - print_hud_lut_string(HUD_LUT_DIFF, 47, 101, textLanguageSelect[sLanguageMode]); -#else print_hud_lut_string(HUD_LUT_DIFF, SOUND_HUD_X, 35, textSoundSelect); -#endif gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); -#ifdef VERSION_EU // In EU their X position get increased each string - // Print sound mode names - for (mode = 0, textX = 90; mode < 3; textX += 70, mode++) { - if (mode == sSoundMode) { - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); - } else { - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, sTextBaseAlpha); - } - print_generic_string( - get_str_x_pos_from_center(textX, textSoundModes[sLanguageMode * 3 + mode], 10.0f), - 141, textSoundModes[sLanguageMode * 3 + mode]); - } - - // In EU, print language mode names - for (mode = 0, textX = 90; mode < 3; textX += 70, mode++) { - if (mode == sLanguageMode) { - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); - } else { - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, sTextBaseAlpha); - } - print_generic_string( - get_str_x_pos_from_center(textX, textLanguage[mode], 10.0f), - 72, textLanguage[mode]); - } -#else // Print sound mode names for (mode = 0; mode < 3; mode++) { if (mode == sSoundMode) { @@ -2539,20 +2030,11 @@ void print_sound_mode_menu_strings(void) { } else { gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, sTextBaseAlpha); } - #ifndef VERSION_JP // Mode names are centered correctly on US and Shindou textX = get_str_x_pos_from_center(mode * 74 + 87, textSoundModes[mode], 10.0f); print_generic_string(textX, 87, textSoundModes[mode]); - #else - print_generic_string(mode * 74 + 67, 87, textSoundModes[mode]); - #endif } -#endif -#ifdef VERSION_EU - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); - print_generic_string(182, 29, textReturn[sLanguageMode]); -#endif gSPDisplayList(gDisplayListHead++, dl_ia_text_end); } @@ -2569,22 +2051,12 @@ void print_score_file_castle_secret_stars(s8 fileIndex, s16 x, s16 y) { // Print number of castle secret stars int_to_str(save_file_get_total_star_count(fileIndex, COURSE_BONUS_STAGES - 1, COURSE_MAX - 1), secretStarsText); -#ifdef VERSION_EU - print_menu_generic_string(x + 20, y, secretStarsText); -#else print_menu_generic_string(x + 16, y, secretStarsText); -#endif } -#if defined(VERSION_JP) || defined(VERSION_SH) - #define HISCORE_COIN_ICON_X 0 - #define HISCORE_COIN_TEXT_X 16 - #define HISCORE_COIN_NAMES_X 45 -#else #define HISCORE_COIN_ICON_X 18 #define HISCORE_COIN_TEXT_X 34 #define HISCORE_COIN_NAMES_X 60 -#endif /** * Prints course coins collected in a score menu save file. @@ -2594,11 +2066,7 @@ void print_score_file_course_coin_score(s8 fileIndex, s16 courseIndex, s16 x, s1 u8 stars = save_file_get_star_flags(fileIndex, courseIndex); unsigned char textCoinX[] = { TEXT_COIN_X }; unsigned char textStar[] = { TEXT_STAR }; -#if defined(VERSION_JP) || defined(VERSION_SH) - #define LENGTH 5 -#else #define LENGTH 8 -#endif unsigned char fileNames[][LENGTH] = { { TEXT_4DASHES }, // huh? { TEXT_SCORE_MARIO_A }, { TEXT_SCORE_MARIO_B }, { TEXT_SCORE_MARIO_C }, { TEXT_SCORE_MARIO_D }, @@ -2650,21 +2118,6 @@ void print_score_file_star_score(s8 fileIndex, s16 courseIndex, s16 x, s16 y) { print_menu_generic_string(x, y, starScoreText); } -#if defined(VERSION_JP) || defined(VERSION_SH) - #define MARIO_X 28 - #define FILE_LETTER_X 86 -#ifdef VERSION_JP - #define LEVEL_NUM_PAD 0 - #define SECRET_STARS_PAD 0 -#else - #define LEVEL_NUM_PAD 5 - #define SECRET_STARS_PAD 10 -#endif - #define LEVEL_NAME_X 23 - #define STAR_SCORE_X 152 - #define MYSCORE_X 237 - #define HISCORE_X 237 -#else #define MARIO_X 25 #define FILE_LETTER_X 95 #define LEVEL_NUM_PAD 3 @@ -2673,44 +2126,17 @@ void print_score_file_star_score(s8 fileIndex, s16 courseIndex, s16 x, s16 y) { #define STAR_SCORE_X 171 #define MYSCORE_X 238 #define HISCORE_X 231 -#endif -#ifdef VERSION_EU -#include "game/segment7.h" -#endif /** * Prints save file score strings that shows when a save file is chosen inside the score menu. */ void print_save_file_scores(s8 fileIndex) { -#ifndef VERSION_EU unsigned char textMario[] = { TEXT_MARIO }; -#ifdef VERSION_JP - unsigned char textFileLetter[] = { TEXT_ZERO }; - void **levelNameTable = segmented_to_virtual(seg2_course_name_table); -#endif unsigned char textHiScore[] = { TEXT_HI_SCORE }; unsigned char textMyScore[] = { TEXT_MY_SCORE }; -#if defined(VERSION_US) || defined(VERSION_SH) unsigned char textFileLetter[] = { TEXT_ZERO }; void **levelNameTable = segmented_to_virtual(seg2_course_name_table); -#endif -#else - unsigned char textFileLetter[] = { TEXT_ZERO }; - void **levelNameTable; - - switch (sLanguageMode) { - case LANGUAGE_ENGLISH: - levelNameTable = segmented_to_virtual(eu_course_strings_en_table); - break; - case LANGUAGE_FRENCH: - levelNameTable = segmented_to_virtual(eu_course_strings_fr_table); - break; - case LANGUAGE_GERMAN: - levelNameTable = segmented_to_virtual(eu_course_strings_de_table); - break; - } -#endif textFileLetter[0] = fileIndex + ASCII_TO_DIALOG('A'); // get letter of file selected @@ -2761,19 +2187,9 @@ void print_save_file_scores(s8 fileIndex) { // Print current coin score mode if (sScoreFileCoinScoreMode == 0) { -#ifdef VERSION_EU - print_menu_generic_string(get_str_x_pos_from_center(257, textMyScore[sLanguageMode], 10.0f), - 24, textMyScore[sLanguageMode]); -#else print_menu_generic_string(MYSCORE_X, 24, textMyScore); -#endif } else { -#ifdef VERSION_EU - print_menu_generic_string(get_str_x_pos_from_center(257, textHiScore[sLanguageMode], 10.0f), - 24,textHiScore[sLanguageMode]); -#else print_menu_generic_string(HISCORE_X, 24, textHiScore); -#endif } gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_end); } @@ -2789,12 +2205,7 @@ static void print_file_select_strings(void) { create_dl_ortho_matrix(); switch (sSelectedButtonID) { case MENU_BUTTON_NONE: -#ifdef VERSION_EU - // Ultimately calls print_main_menu_strings, but prints main language strings first. - print_main_lang_strings(); -#else print_main_menu_strings(); -#endif break; case MENU_BUTTON_SCORE: print_score_menu_strings(); @@ -2855,9 +2266,6 @@ Gfx *geo_file_select_strings_and_menu_cursor(s32 callContext, UNUSED struct Grap * either completing a course choosing "SAVE & QUIT" or having a game over. */ s32 lvl_init_menu_values_and_cursor_pos(UNUSED s32 arg, UNUSED s32 unused) { -#ifdef VERSION_EU - s8 fileNum; -#endif #ifdef WIDE gWidescreen = 0; #endif @@ -2896,18 +2304,6 @@ s32 lvl_init_menu_values_and_cursor_pos(UNUSED s32 arg, UNUSED s32 unused) { sMainMenuTimer = 0; sEraseYesNoHoverState = MENU_ERASE_HOVER_NONE; sSoundMode = save_file_get_sound_mode(); -#ifdef VERSION_EU - sLanguageMode = eu_get_language(); - - for (fileNum = 0; fileNum < 4; fileNum++) { - if (save_file_exists(fileNum) == TRUE) { - sOpenLangSettings = FALSE; - break; - } else { - sOpenLangSettings = TRUE; - } - } -#endif //! no return value #ifdef AVOID_UB return 0;