diff --git a/src/game/hud.c b/src/game/hud.c index 20924e9b..eb94390b 100644 --- a/src/game/hud.c +++ b/src/game/hud.c @@ -295,7 +295,7 @@ void render_hud_coins(void) { print_text_fmt_int(198, HUD_TOP_Y, "%d", gHudDisplay.coins); } -#define HUD_STARS_X ROM_JP ? 73 : 78 +#define HUD_STARS_X (ROM_JP ? 73 : 78) /** * Renders the amount of stars collected. diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index 8311f0f6..eadde543 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -920,15 +920,9 @@ void reset_dialog_render_state(void) { gDialogResponse = DIALOG_RESPONSE_NONE; } -#if defined(VERSION_JP) || defined(VERSION_SH) -#define X_VAL1 -5.0f -#define Y_VAL1 2.0 -#define Y_VAL2 4 -#else -#define X_VAL1 -7.0f -#define Y_VAL1 5.0 -#define Y_VAL2 5.0f -#endif +#define X_VAL1 (ROM_JP ? -5.0f : -7.0f) +#define Y_VAL1 (ROM_JP ? 2.0 : 5.0) +#define Y_VAL2 (ROM_JP ? 4 : 5.0f) void render_dialog_box_type(struct DialogEntry *dialog, s8 linesPerBox) { UNUSED u8 filler[4]; @@ -1020,13 +1014,8 @@ void render_generic_dialog_char_at_pos(struct DialogEntry *dialog, s16 x, s16 y, } #endif -#if defined(VERSION_JP) || defined(VERSION_SH) -#define X_VAL3 5.0f -#define Y_VAL3 20 -#else -#define X_VAL3 0.0f -#define Y_VAL3 16 -#endif +#define X_VAL3 (ROM_JP ? 5.0f : 0.0f) +#define Y_VAL3 (ROM_JP ? 20 : 16) #ifdef VERSION_EU void handle_dialog_scroll_page_state(s8 lineNum, s8 totalLines, s8 *pageState, s8 *xMatrix) @@ -1343,17 +1332,10 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l gLastDialogLineNum = lineNum; } -#if defined(VERSION_JP) || defined(VERSION_SH) -#define X_VAL4_1 50 -#define X_VAL4_2 25 -#define Y_VAL4_1 1 -#define Y_VAL4_2 20 -#else -#define X_VAL4_1 56 -#define X_VAL4_2 47 -#define Y_VAL4_1 2 -#define Y_VAL4_2 16 -#endif +#define X_VAL4_1 (ROM_JP ? 50 : 56) +#define X_VAL4_2 (ROM_JP ? 25 : 47) +#define Y_VAL4_1 (ROM_JP ? 1 : 2) +#define Y_VAL4_2 (ROM_JP ? 20 : 16) void render_dialog_triangle_choice(void) { if (gDialogBoxState == DIALOG_STATE_VERTICAL) { @@ -1371,15 +1353,10 @@ void render_dialog_triangle_choice(void) { gSPDisplayList(gDisplayListHead++, dl_draw_triangle); } -#if defined(VERSION_JP) || defined(VERSION_SH) -#define X_VAL5 123.0f -#define Y_VAL5_1 -20 -#define Y_VAL5_2 2 -#define X_Y_VAL6 0.8f -#elif defined(VERSION_US) -#define X_VAL5 118.0f -#define Y_VAL5_1 -16 -#define Y_VAL5_2 5 +#if defined(VERSION_US) +#define X_VAL5 (ROM_JP ? 123.0f : 118.0f) +#define Y_VAL5_1 (ROM_JP ? -20 : -16) +#define Y_VAL5_2 (ROM_JP ? 2 : 5) #define X_Y_VAL6 0.8f #elif defined(VERSION_EU) #define X_VAL5 122.0f @@ -1531,21 +1508,10 @@ s16 gCutsceneMsgTimer = 0; s8 gDialogCameraAngleIndex = CAM_SELECTION_MARIO; s8 gDialogCourseActNum = 1; -#if defined(VERSION_JP) || defined(VERSION_SH) -#define DIAG_VAL1 20 +#define DIAG_VAL1 (ROM_JP ? 20 : 16) #define DIAG_VAL2 240 -#define DIAG_VAL3 130 -#define DIAG_VAL4 4 -#else -#define DIAG_VAL1 16 -#ifdef VERSION_US -#define DIAG_VAL2 240 -#else -#define DIAG_VAL2 238 -#endif -#define DIAG_VAL3 132 -#define DIAG_VAL4 5 -#endif +#define DIAG_VAL3 (ROM_JP ? 130 : 132) +#define DIAG_VAL4 (ROM_JP ? 4 : 5) void render_dialog_entries(void) { #ifdef VERSION_EU @@ -1841,19 +1807,10 @@ void do_cutscene_handler(void) { gCutsceneMsgTimer++; } -#ifdef VERSION_JP -#define PEACH_MESSAGE_TIMER 170 -#else -#define PEACH_MESSAGE_TIMER 250 -#endif +#define PEACH_MESSAGE_TIMER (ROM_JP ? 170 : 250) -#if defined(VERSION_JP) || defined(VERSION_SH) -#define STR_X 53 -#define STR_Y 136 -#else -#define STR_X 38 -#define STR_Y 142 -#endif +#define STR_X (ROM_JP ? 53 : 38) +#define STR_Y (ROM_JP ? 136 : 142) // "Dear Mario" message handler void print_peach_letter_message(void) { @@ -2022,21 +1979,19 @@ u8 gTextCourse[][7] = { #define textCourse gTextCourse #endif -#if defined(VERSION_JP) || defined(VERSION_SH) -#define CRS_NUM_X1 93 -#elif defined(VERSION_US) -#define CRS_NUM_X1 100 +#if defined(VERSION_US) +#define CRS_NUM_X1 (ROM_JP ? 93 : 100) #elif defined(VERSION_EU) #define CRS_NUM_X1 get_string_width(GameEngine_LoadTranslation(textCourse)) + 51 #endif #ifdef VERSION_EU #define TXT_COURSE_X 48 - #define TXT_STAR_X 89 - #define ACT_NAME_X 107 - #define LVL_NAME_X 108 - #define SECRET_LVL_NAME_X get_str_x_pos_from_center(159, &courseName[3], 10.0f) - #define MYSCORE_X 48 +#define TXT_STAR_X 89 +#define ACT_NAME_X 107 +#define LVL_NAME_X 108 +#define SECRET_LVL_NAME_X get_str_x_pos_from_center(159, &courseName[3], 10.0f) +#define MYSCORE_X 48 #else #define TXT_COURSE_X 63 #define TXT_STAR_X 98 @@ -2126,15 +2081,9 @@ void render_pause_my_score_coins(void) { gSPDisplayList(gDisplayListHead++, dl_ia_text_end); } -#if defined(VERSION_JP) || defined(VERSION_SH) -#define TXT1_X 4 -#define TXT2_X 116 -#define Y_VAL7 0 -#else -#define TXT1_X 3 -#define TXT2_X 119 -#define Y_VAL7 2 -#endif +#define TXT1_X (ROM_JP ? 4 : 3) +#define TXT2_X (ROM_JP ? 116 : 119) +#define Y_VAL7 (ROM_JP ? 0 : 2) void render_pause_camera_options(s16 x, s16 y, s8 *index, s16 xIndex) { handle_menu_scrolling(MENU_SCROLL_HORIZONTAL, index, 1, 2); @@ -2163,13 +2112,8 @@ void render_pause_camera_options(s16 x, s16 y, s8 *index, s16 xIndex) { } } -#if defined(VERSION_JP) || defined(VERSION_SH) -#define X_VAL8 0 -#define Y_VAL8 4 -#else -#define X_VAL8 4 -#define Y_VAL8 2 -#endif +#define X_VAL8 (ROM_JP ? 0 : 4) +#define Y_VAL8 (ROM_JP ? 4 : 2) void render_pause_course_options(s16 x, s16 y, s8 *index, s16 yIndex) { @@ -2464,14 +2408,10 @@ s16 render_pause_courses_and_castle(void) { return MENU_OPT_NONE; } -#if defined(VERSION_JP) -#define TXT_HISCORE_X 112 -#define TXT_HISCORE_Y 48 -#define TXT_CONGRATS_X 60 -#elif defined(VERSION_US) -#define TXT_HISCORE_X 109 -#define TXT_HISCORE_Y 36 -#define TXT_CONGRATS_X 70 +#if defined(VERSION_US) +#define TXT_HISCORE_X (ROM_JP ? 112 : 109) +#define TXT_HISCORE_Y (ROM_JP ? 48 : 36) +#define TXT_CONGRATS_X (ROM_JP ? 60 : 70) #elif defined(VERSION_EU) #define TXT_HISCORE_X get_str_x_pos_from_center_scale(160, GameEngine_LoadTranslation(textHiScore), 12.0f) #define TXT_HISCORE_Y 36 @@ -2549,23 +2489,16 @@ void play_star_fanfare_and_flash_hud(s32 arg, u8 starNum) { #ifdef VERSION_EU #define TXT_NAME_X1 centerX - #define TXT_NAME_X2 centerX - 1 +#define TXT_NAME_X2 centerX - 1 #else #define TXT_NAME_X1 71 #define TXT_NAME_X2 TXT_NAME_X1 - 2 #endif -#if defined(VERSION_JP) || defined(VERSION_SH) -#define CRS_NUM_X2 95 +#define CRS_NUM_X2 (ROM_JP ? 95 : 104) #define CRS_NUM_X3 CRS_NUM_X2 - 2 -#define TXT_CLEAR_X1 205 +#define TXT_CLEAR_X1 (ROM_JP ? 205 : get_string_width(name) + 81) #define TXT_CLEAR_X2 TXT_CLEAR_X1 - 2 -#else -#define CRS_NUM_X2 104 -#define CRS_NUM_X3 CRS_NUM_X2 - 2 -#define TXT_CLEAR_X1 get_string_width(name) + 81 -#define TXT_CLEAR_X2 TXT_CLEAR_X1 - 2 -#endif void render_course_complete_lvl_info_and_hud_str(void) { u8 *name; diff --git a/src/menu/file_select.c b/src/menu/file_select.c index 78be8a06..5aa6c0a8 100644 --- a/src/menu/file_select.c +++ b/src/menu/file_select.c @@ -1370,7 +1370,7 @@ void bhv_menu_button_manager_init(void) { sTextBaseAlpha = 0; } -#define SAVE_FILE_SOUND ( ROM_JP ? SOUND_MENU_STAR_SOUND : SOUND_MENU_STAR_SOUND_OKEY_DOKEY) +#define SAVE_FILE_SOUND (ROM_JP ? SOUND_MENU_STAR_SOUND : SOUND_MENU_STAR_SOUND_OKEY_DOKEY) /** * In the main menu, check if a button was clicked to play it's button growing state. @@ -1768,11 +1768,11 @@ void print_save_file_star_count(s8 fileIndex, s16 x, s16 y) { } #if defined(VERSION_US) - #define SELECT_FILE_X ROM_JP ? 96 : 93 - #define SCORE_X ROM_JP ? 50 : 52 - #define COPY_X ROM_JP ? 115 : 117 - #define ERASE_X ROM_JP ? 180 : 177 - #define SOUNDMODE_X1 ROM_JP ? 235 : sSoundTextX + #define SELECT_FILE_X (ROM_JP ? 96 : 93) + #define SCORE_X (ROM_JP ? 50 : 52) + #define COPY_X (ROM_JP ? 115 : 117) + #define ERASE_X (ROM_JP ? 180 : 177) + #define SOUNDMODE_X1 (ROM_JP ? 235 : sSoundTextX) #define SAVEFILE_X1 92 #define SAVEFILE_X2 209 #define MARIOTEXT_X1 92 @@ -1868,8 +1868,8 @@ void print_main_lang_strings(void) { #endif #if defined(VERSION_US) - #define CHECK_FILE_X ROM_JP ? 90 : 95 - #define NOSAVE_DATA_X1 ROM_JP ? 90 : 99 + #define CHECK_FILE_X (ROM_JP ? 90 : 95) + #define NOSAVE_DATA_X1 (ROM_JP ? 90 : 99) #elif defined(VERSION_EU) #define CHECK_FILE_X checkFileX #define NOSAVE_DATA_X1 noSaveDataX @@ -1901,8 +1901,8 @@ void score_menu_display_message(s8 messageID) { #if defined(VERSION_US) #define RETURN_X 44 - #define COPYFILE_X1 ROM_JP ? 128 : 135 - #define ERASEFILE_X1 ROM_JP ? 228 : 231 + #define COPYFILE_X1 (ROM_JP ? 128 : 135) + #define ERASEFILE_X1 (ROM_JP ? 228 : 231) #elif defined(VERSION_EU) #define RETURN_X centeredX #define COPYFILE_X1 centeredX @@ -1980,12 +1980,12 @@ void print_score_menu_strings(void) { } #if defined(VERSION_US) - #define NOFILE_COPY_X ROM_JP ? 90 : 119 - #define COPY_FILE_X ROM_JP ? 90 : 104 - #define COPYIT_WHERE_X ROM_JP ? 90 : 109 - #define NOSAVE_DATA_X2 ROM_JP ? 90 : 101 - #define COPYCOMPLETE_X ROM_JP ? 90 : 110 - #define SAVE_EXISTS_X1 ROM_JP ? 90 : 110 + #define NOFILE_COPY_X (ROM_JP ? 90 : 119) + #define COPY_FILE_X (ROM_JP ? 90 : 104) + #define COPYIT_WHERE_X (ROM_JP ? 90 : 109) + #define NOSAVE_DATA_X2 (ROM_JP ? 90 : 101) + #define COPYCOMPLETE_X (ROM_JP ? 90 : 110) + #define SAVE_EXISTS_X1 (ROM_JP ? 90 : 110) #elif defined(VERSION_EU) #define NOFILE_COPY_X centeredX #define COPY_FILE_X centeredX @@ -2092,8 +2092,8 @@ void copy_menu_update_message(void) { } #if defined(VERSION_US) - #define VIEWSCORE_X1 ROM_JP ? 133 : 128 - #define ERASEFILE_X2 ROM_JP ? 220 : 230 + #define VIEWSCORE_X1 (ROM_JP ? 133 : 128) + #define ERASEFILE_X2 (ROM_JP ? 220 : 230) #elif defined(VERSION_EU) #define VIEWSCORE_X1 centeredX #define ERASEFILE_X2 centeredX @@ -2154,9 +2154,9 @@ void print_copy_menu_strings(void) { #endif } -#define CURSOR_X ROM_JP ? 160.0f : (x + 70) -#define MENU_ERASE_YES_MIN_X ROM_JP ? 145 : 140 -#define MENU_ERASE_YES_MAX_X ROM_JP ? 164 : 169 +#define CURSOR_X (ROM_JP ? 160.0f : (x + 70)) +#define MENU_ERASE_YES_MIN_X (ROM_JP ? 145 : 140) +#define MENU_ERASE_YES_MAX_X (ROM_JP ? 164 : 169) #define MENU_ERASE_YES_NO_MIN_Y 191 #define MENU_ERASE_YES_NO_MAX_Y 210 @@ -2241,11 +2241,11 @@ void print_erase_menu_prompt(s16 x, s16 y) { // M a r i o A --- マ リ オ Ａ // 0 1 2 3 4 5 6 --- 0 1 2 3 #if defined(VERSION_US) - #define ERASE_FILE_X ROM_JP ? 96 : 98 - #define NOSAVE_DATA_X3 ROM_JP ? 90 : 100 - #define MARIO_ERASED_VAR ROM_JP ? 3 : 6 - #define MARIO_ERASED_X ROM_JP ? 90 : 100 - #define SAVE_EXISTS_X2 ROM_JP ? 90 : 100 + #define ERASE_FILE_X (ROM_JP ? 96 : 98) + #define NOSAVE_DATA_X3 (ROM_JP ? 90 : 100) + #define MARIO_ERASED_VAR (ROM_JP ? 3 : 6) + #define MARIO_ERASED_X (ROM_JP ? 90 : 100) + #define SAVE_EXISTS_X2 (ROM_JP ? 90 : 100) #elif defined(VERSION_EU) #define ERASE_FILE_X centeredX #define NOSAVE_DATA_X3 centeredX @@ -2342,8 +2342,8 @@ void erase_menu_update_message(void) { } } -#define VIEWSCORE_X2 ROM_JP ? 133 : 127 -#define COPYFILE_X2 ROM_JP ? 223 : 233 +#define VIEWSCORE_X2 (ROM_JP ? 133 : 127) +#define COPYFILE_X2 (ROM_JP ? 223 : 233) /** * Prints erase menu strings that shows on the red background menu screen. @@ -2403,7 +2403,7 @@ void print_erase_menu_strings(void) { } #if defined(VERSION_US) - #define SOUND_HUD_X ROM_JP ? 96 : 88 + #define SOUND_HUD_X (ROM_JP ? 96 : 88) #endif /** @@ -2503,9 +2503,9 @@ void print_score_file_castle_secret_stars(s8 fileIndex, s16 x, s16 y) { #endif } -#define HISCORE_COIN_ICON_X ROM_JP ? 0 : 18 -#define HISCORE_COIN_TEXT_X ROM_JP ? 16 : 34 -#define HISCORE_COIN_NAMES_X ROM_JP ? 45 : 60 +#define HISCORE_COIN_ICON_X (ROM_JP ? 0 : 18) +#define HISCORE_COIN_TEXT_X (ROM_JP ? 16 : 34) +#define HISCORE_COIN_NAMES_X (ROM_JP ? 45 : 60) /** * Prints course coins collected in a score menu save file. @@ -2531,9 +2531,7 @@ void print_score_file_course_coin_score(s8 fileIndex, s16 courseIndex, s16 x, s1 if (stars & (1 << 6)) { print_menu_generic_string(x + 70, y, textStar); } - } - // HISCORE - else { + } else { // HISCORE // Print "[coin] x" print_menu_generic_string(x + HISCORE_COIN_ICON_X, y, textCoinX); // Print coin highscore @@ -2567,18 +2565,18 @@ void print_score_file_star_score(s8 fileIndex, s16 courseIndex, s16 x, s16 y) { } #if defined(VERSION_US) - #define MARIO_X ROM_JP ? 28 : 25 - #define FILE_LETTER_X ROM_JP ? 86 : 95 - #define LEVEL_NUM_PAD ROM_JP ? 0 : 3 - #define SECRET_STARS_PAD ROM_JP ? 0 : 6 + #define MARIO_X (ROM_JP ? 28 : 25) + #define FILE_LETTER_X (ROM_JP ? 86 : 95) + #define LEVEL_NUM_PAD (ROM_JP ? 0 : 3) + #define SECRET_STARS_PAD (ROM_JP ? 0 : 6) #define LEVEL_NAME_X 23 - #define STAR_SCORE_X ROM_JP ? 152 : 171 + #define STAR_SCORE_X (ROM_JP ? 152 : 171) #ifdef VERSION_EU #define MYSCORE_X get_str_x_pos_from_center(257, textMyScore[sLanguageMode], 10.0f) #define HISCORE_X get_str_x_pos_from_center(257, textHiScore[sLanguageMode], 10.0f) #else - #define MYSCORE_X ROM_JP ? 237 : 238 - #define HISCORE_X ROM_JP ? 237 : 231 + #define MYSCORE_X (ROM_JP ? 237 : 238) + #define HISCORE_X (ROM_JP ? 237 : 231) #endif #endif @@ -2654,7 +2652,7 @@ void print_save_file_scores(s8 fileIndex) { // Print castle secret stars text print_menu_generic_string(LEVEL_NAME_X + SECRET_STARS_PAD, 23 + 12 * 16, - GameEngine_LoadLevelName(25)); + GameEngine_LoadLevelName(25)); // Print castle secret stars score print_score_file_castle_secret_stars(fileIndex, STAR_SCORE_X, 23 + 12 * 16); @@ -2662,7 +2660,7 @@ void print_save_file_scores(s8 fileIndex) { if (sScoreFileCoinScoreMode == 0) { print_menu_generic_string(MYSCORE_X, 24, textMyScore); } else { - print_menu_generic_string(HISCORE_X, 24, GameEngine_LoadTranslation(textHiScore)); + print_menu_generic_string(HISCORE_X, 24, textHiScore); } gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_end);