diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index bf7dd5c721..3bd8f4052c 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -1160,26 +1160,6 @@ void func_802A2C58(void) { battle_menu_moveState = BTL_SUBMENU_MOVES_STATE_UNK_1E; } -#if VERSION_JP -#define POS_X 32 -#define OFFSET_X_1 10 -#define OFFSET_X_2 104 -#define OFFSET_X_3 104 -#define MOVE_X 32 -#define WIDTH_1 80 -#define WIDTH_2 80 -#define WIDTH_3 242 -#else -#define POS_X 20 -#define OFFSET_X_1 16 -#define OFFSET_X_2 114 -#define OFFSET_X_3 110 -#define MOVE_X 20 -#define WIDTH_1 90 -#define WIDTH_2 100 -#define WIDTH_3 280 -#endif - #if VERSION_PAL #define MOVES_OPTIONS_W D_PAL_802AB4E4[gCurrentLanguage] #define MOVES_TITLE_X D_PAL_802AB4EC[gCurrentLanguage] @@ -1189,6 +1169,19 @@ void func_802A2C58(void) { #define STAR_SPIRITS_TITLE_X D_PAL_802AB4D8[gCurrentLanguage] #define STAR_SPIRITS_TITLE_W D_PAL_802AB4DC[gCurrentLanguage] #define STAR_SPIRITS_ICON_X 110 + D_PAL_802AB4D4[gCurrentLanguage] +#define POS_X 20 +#define WIDTH_3 280 +#elif VERSION_JP +#define MOVES_OPTIONS_W 150 +#define MOVES_TITLE_X 10 +#define MOVES_TITLE_W 80 +#define MOVES_ICON_X 104 +#define STAR_SPIRITS_OPTIONS_W 144 +#define STAR_SPIRITS_TITLE_X 10 +#define STAR_SPIRITS_TITLE_W 80 +#define STAR_SPIRITS_ICON_X 104 +#define POS_X 32 +#define WIDTH_3 242 #else #define MOVES_OPTIONS_W 150 #define MOVES_TITLE_X 16 @@ -1198,6 +1191,8 @@ void func_802A2C58(void) { #define STAR_SPIRITS_TITLE_X 10 #define STAR_SPIRITS_TITLE_W 100 #define STAR_SPIRITS_ICON_X 110 +#define POS_X 20 +#define WIDTH_3 280 #endif s32 btl_submenu_moves_update(void) { @@ -1364,13 +1359,8 @@ s32 btl_submenu_moves_update(void) { #if !VERSION_JP set_window_properties(WIN_BTL_MOVES_MENU, moveX, moveY, MOVES_OPTIONS_W, (D_802AD10E * 13) + 28, 0, btl_menu_moves_draw_content, NULL, -1); #endif -#if VERSION_JP - set_window_properties(WIN_BTL_MOVES_TITLE, moveX + OFFSET_X_1, moveY - 6, WIDTH_1, 16, 1, btl_menu_moves_show_title, NULL, -1); - set_window_properties(WIN_BTL_MOVES_ICON, moveX + OFFSET_X_2, moveY - 12, 32, 32, 1, btl_menu_moves_show_icon, NULL, -1); -#else set_window_properties(WIN_BTL_MOVES_TITLE, moveX + MOVES_TITLE_X, moveY - 6, MOVES_TITLE_W, 16, 1, btl_menu_moves_show_title, NULL, -1); set_window_properties(WIN_BTL_MOVES_ICON, moveX + MOVES_ICON_X, moveY - 12, 32, 32, 1, btl_menu_moves_show_icon, NULL, -1); -#endif } else { s16 new_var; @@ -1378,16 +1368,11 @@ s32 btl_submenu_moves_update(void) { set_window_properties(WIN_BTL_MOVES_MENU, moveX, moveY, STAR_SPIRITS_OPTIONS_W, (D_802AD10E * 13) + 28, 0, btl_menu_moves_draw_content, NULL, -1); #endif new_var = moveY; // todo required to match -#if VERSION_JP - set_window_properties(WIN_BTL_SPIRITS_TITLE, moveX + 10, new_var - 6, WIDTH_2, 16, 1, btl_menu_moves_show_title, 0, -1); - set_window_properties(WIN_BTL_SPIRITS_ICON, moveX + OFFSET_X_3, new_var - 12, 32, 35, 1, btl_menu_moves_show_icon, 0, -1); -#else set_window_properties(WIN_BTL_SPIRITS_TITLE, moveX + STAR_SPIRITS_TITLE_X, new_var - 6, STAR_SPIRITS_TITLE_W, 16, 1, btl_menu_moves_show_title, 0, -1); set_window_properties(WIN_BTL_SPIRITS_ICON, moveX + STAR_SPIRITS_ICON_X, new_var - 12, 32, 35, 1, btl_menu_moves_show_icon, 0, -1); -#endif } - moveX = MOVE_X; + moveX = POS_X; moveY = BattleMenu_Moves_PosY; set_window_properties(WIN_BTL_DESC_BOX, moveX, 186, WIDTH_3, 32, WINDOW_PRIORITY_20, btl_menu_moves_show_desc, NULL, -1); set_window_update(WIN_BTL_MOVES_MENU, WINDOW_UPDATE_SHOW); @@ -1660,16 +1645,12 @@ s32 btl_submenu_moves_update(void) { #define X_VAR3 24 #elif VERSION_JP #define MOVE_TEXT_Y 0 -#define W_VAR254 139 +#define X_VAR254 139 #define X_VAR255 35 -#define HUD_NOT_ENOUGH_FP &HES_NotEnoughFP -#define HUD_FP_COST_X 116 -#define HUD_NOT_ENOUGH_POW &HES_NotEnoughPOW -#define HUD_SP_COST_X 102 #define X_VAR3 26 #else #define MOVE_TEXT_Y 0 -#define W_VAR254 153 +#define X_VAR254 153 #define X_VAR255 31 #define FP_COST_X 108 #define SP_COST_X 93 @@ -1915,7 +1896,7 @@ void btl_menu_moves_draw_content(void* data, s32 x, s32 y) { #if VERSION_PAL #define TEXT_ABILITIES_X D_PAL_802AB4F4[gCurrentLanguage] #define TEXT_STAR_SPIRITS_X D_PAL_802AB4E0[gCurrentLanguage] -#elif VERSION_PAL +#elif VERSION_JP #define TEXT_ABILITIES_X 28 #define TEXT_STAR_SPIRITS_X 24 #else diff --git a/src/battle/player_events.c b/src/battle/player_events.c index b6f4145786..96b68e50ec 100644 --- a/src/battle/player_events.c +++ b/src/battle/player_events.c @@ -199,7 +199,7 @@ API_CALLABLE(GiveRefund) { f32 angle = 0.0f; s32 delayTime = 0; f32 posX, posY, posZ; - s32 hudElemId; + HudElemID hid; posY = player->curPos.y + player->size.y; if (player_team_is_ability_active(player, ABILITY_REFUND) && sellValue > 0) { @@ -227,22 +227,22 @@ API_CALLABLE(GiveRefund) { #if VERSION_PAL switch (gCurrentLanguage) { case LANGUAGE_EN: - HID_Refund = hudElemId = hud_element_create(&HES_Refund); + HID_Refund = hid = hud_element_create(&HES_Refund); break; case LANGUAGE_DE: - HID_Refund = hudElemId = hud_element_create(&HES_Refund_de); + HID_Refund = hid = hud_element_create(&HES_Refund_de); break; case LANGUAGE_FR: - HID_Refund = hudElemId = hud_element_create(&HES_Refund_fr); + HID_Refund = hid = hud_element_create(&HES_Refund_fr); break; case LANGUAGE_ES: - HID_Refund = hudElemId = hud_element_create(&HES_Refund_es); + HID_Refund = hid = hud_element_create(&HES_Refund_es); break; } #else - HID_Refund = hudElemId = hud_element_create(&HES_Refund); + HID_Refund = hid = hud_element_create(&HES_Refund); #endif - hud_element_set_render_pos(hudElemId, iconPosX + 36, iconPosY - 63); + hud_element_set_render_pos(hid, iconPosX + 36, iconPosY - 63); } script->varTable[0] = delayTime; diff --git a/src/pause/pause_stats.c b/src/pause/pause_stats.c index 86c70170e4..cc96b8a295 100644 --- a/src/pause/pause_stats.c +++ b/src/pause/pause_stats.c @@ -31,8 +31,8 @@ static s32 gPauseStatsIconIDs[12]; #define POS_3_X 61 #define POS_4_X 16 #define PAUSE_BOX_WIDTH 113 -#define COL_LABEL_X1 143 -#define COL_LABEL_X2 155 +#define X_VAR1 143 +#define X_VAR2 155 #elif VERSION_PAL #define NUMBER_OFFSET_Y 0 #define ROW_1_Y 51 @@ -47,8 +47,8 @@ static s32 gPauseStatsIconIDs[12]; #define POS_3_X D_PAL_80271B1C[gCurrentLanguage] #define POS_4_X D_PAL_80271B18[gCurrentLanguage] #define PAUSE_BOX_WIDTH D_PAL_80271B10[gCurrentLanguage] -#define COL_LABEL_X1 D_PAL_80271B24[gCurrentLanguage] -#define COL_LABEL_X2 D_PAL_80271B28[gCurrentLanguage] +#define X_VAR1 D_PAL_80271B24[gCurrentLanguage] +#define X_VAR2 D_PAL_80271B28[gCurrentLanguage] #elif VERSION_JP #define NUMBER_OFFSET_Y 0 #define ROW_1_Y 51 @@ -60,6 +60,11 @@ static s32 gPauseStatsIconIDs[12]; #define COL_C_X 105 #define POS_1_X 62 #define POS_2_X 92 +#define POS_3_X 53 +#define POS_4_X 16 +#define PAUSE_BOX_WIDTH 102 +#define X_VAR1 151 +#define X_VAR2 163 #else #define NUMBER_OFFSET_Y 0 #define ROW_1_Y 51 @@ -74,8 +79,36 @@ static s32 gPauseStatsIconIDs[12]; #define POS_3_X 61 #define POS_4_X 16 #define PAUSE_BOX_WIDTH 113 -#define COL_LABEL_X1 143 -#define COL_LABEL_X2 155 +#define X_VAR1 143 +#define X_VAR2 155 +#endif + +#if VERSION_JP +#define X_VAR3 239 +#define X_VAR4 233 +#define COUNT_DRAW_STYLE DRAW_NUMBER_STYLE_MONOSPACE +#define X_VAR5 239 +#define X_VAR6 248 +#define X_VAR7 127 +#define X_VAR8 151 +#define X_VAR9 164 +#define X_VAR10 128 +#define X_VAR11 128 +#define X_VAR12 138 +#define X_VAR13 150 +#else +#define X_VAR3 281 +#define X_VAR4 248 +#define COUNT_DRAW_STYLE DRAW_NUMBER_STYLE_MONOSPACE_RIGHT +#define X_VAR5 237 +#define X_VAR6 246 +#define X_VAR7 137 +#define X_VAR8 163 +#define X_VAR9 176 +#define X_VAR10 130 +#define X_VAR11 138 +#define X_VAR12 140 +#define X_VAR13 152 #endif // Probably only used here, but could theoretically be used in the main menu too @@ -234,56 +267,30 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 frameCount; s32 powFullBars; -#if VERSION_JP // draw coin count - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_COIN], baseX + 151, baseY + 109); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_COIN], baseX + X_VAR1, baseY + 109); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_COIN]); - draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_COINS), baseX + 163, baseY + 101, 255, MSG_PAL_STANDARD, 1); - draw_number(gPlayerData.coins, baseX + 239, baseY + 101 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + 233, baseY + 108); + draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_COINS), baseX + X_VAR2, baseY + 101, 255, MSG_PAL_STANDARD, 1); + draw_number(gPlayerData.coins, baseX + X_VAR3, baseY + 101 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, COUNT_DRAW_STYLE); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + X_VAR4, baseY + 108); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_TIMES]); // draw star point count - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_STAR_POINT], baseX + 151, baseY + 94); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_STAR_POINT], baseX + X_VAR1, baseY + 94); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_STAR_POINT]); - draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_STAR_POINTS), baseX + 163, baseY + 86, 255, MSG_PAL_STANDARD, 1); - draw_number(gPlayerData.starPoints, baseX + 239, baseY + 86 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + 233, baseY + 93); + draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_STAR_POINTS), baseX + X_VAR2, baseY + 86, 255, MSG_PAL_STANDARD, 1); + draw_number(gPlayerData.starPoints, baseX + X_VAR3, baseY + 86 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, COUNT_DRAW_STYLE); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + X_VAR4, baseY + 93); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_TIMES]); // draw star piece count - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_STAR_PIECE], baseX + 151, baseY + 123); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_STAR_PIECE], baseX + X_VAR1, baseY + 123); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_STAR_PIECE]); - draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_STAR_PIECES), baseX + 163, baseY + 116, 255, MSG_PAL_STANDARD, 1); - draw_number(gPlayerData.starPieces, baseX + 239, baseY + 116 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + 233, baseY + 123); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_TIMES]); -#else - // draw coin count - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_COIN], baseX + COL_LABEL_X1, baseY + 109); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_COIN]); - draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_COINS), baseX + COL_LABEL_X2, baseY + 101, 255, MSG_PAL_STANDARD, 1); - draw_number(gPlayerData.coins, baseX + 281, baseY + 101 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 3); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + 248, baseY + 108); + draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_STAR_PIECES), baseX + X_VAR2, baseY + 116, 255, MSG_PAL_STANDARD, 1); + draw_number(gPlayerData.starPieces, baseX + X_VAR3, baseY + 116 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, COUNT_DRAW_STYLE); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + X_VAR4, baseY + 123); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_TIMES]); - // draw star point count - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_STAR_POINT], baseX + COL_LABEL_X1, baseY + 94); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_STAR_POINT]); - draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_STAR_POINTS), baseX + COL_LABEL_X2, baseY + 86, 255, MSG_PAL_STANDARD, 1); - draw_number(gPlayerData.starPoints, baseX + 281, baseY + 86 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 3); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + 248, baseY + 93); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_TIMES]); - - // draw star piece count - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_STAR_PIECE], baseX + COL_LABEL_X1, baseY + 123); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_STAR_PIECE]); - draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_STAR_PIECES), baseX + COL_LABEL_X2, baseY + 116, 255, MSG_PAL_STANDARD, 1); - draw_number(gPlayerData.starPieces, baseX + 281, baseY + 116 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 3); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_TIMES], baseX + 248, baseY + 123); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_TIMES]); -#endif - // draw HP count pause_draw_menu_label(PAUSE_LBL_HP, baseX + 21, baseY + 35); hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_HP], baseX + 52, baseY + 57); @@ -313,27 +320,16 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, #define HOUR (MINUTE * 60) // draw play time -#if VERSION_JP - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_CLOCK], baseX + 151, baseY + 140); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_CLOCK], baseX + X_VAR1, baseY + 140); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_CLOCK]); - draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_TIME), baseX + 163, baseY + 133, 255, MSG_PAL_STANDARD, 1); -#else - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_CLOCK], baseX + COL_LABEL_X1, baseY + 140); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_CLOCK]); - draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_TIME), baseX + COL_LABEL_X2, baseY + 133, 255, MSG_PAL_STANDARD, 1); -#endif + draw_msg(pause_get_menu_msg(PAUSE_MSG_LBL_TIME), baseX + X_VAR2, baseY + 133, 255, MSG_PAL_STANDARD, 1); frameCount = gPlayerData.frameCounter; if (frameCount >= (100 * HOUR)) { frameCount = (100 * HOUR) - 1; } // draw hours -#if VERSION_JP - draw_number((frameCount / (10 * HOUR)) % 10, baseX + 239, baseY + 133 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); - draw_number((frameCount / HOUR) % 10, baseX + 248, baseY + 133 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); -#else - draw_number((frameCount / (10 * HOUR)) % 10, baseX + 237, baseY + 133 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); - draw_number((frameCount / HOUR) % 10, baseX + 246, baseY + 133 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); -#endif + draw_number((frameCount / (10 * HOUR)) % 10, baseX + X_VAR5, baseY + 133 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); + draw_number((frameCount / HOUR) % 10, baseX + X_VAR6, baseY + 133 + NUMBER_OFFSET_Y, 1, MSG_PAL_STANDARD, 255, 2); draw_msg(pause_get_menu_msg(PAUSE_MSG_DOT), baseX + 257, baseY + 132, 255, MSG_PAL_STANDARD, 1); draw_msg(pause_get_menu_msg(PAUSE_MSG_DOT), baseX + 257, baseY + 127, 255, MSG_PAL_STANDARD, 1); // draw minutes @@ -343,18 +339,11 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, bootsLevel = gPlayerData.bootsLevel; hammerLevel = gPlayerData.hammerLevel; level = gPlayerData.level; -#if VERSION_JP - draw_box(4, &gPauseWS_10, baseX + 7, baseY + 12, 0, level >= 10 ? 110 : 102, 17, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); -#else draw_box(4, &gPauseWS_10, baseX + 7, baseY + 12, 0, PAUSE_BOX_WIDTH + (level >= 10 ? 8 : 0), 17, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); -#endif // draw level -#if VERSION_JP - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_MARIO], baseX + 53, baseY + 21); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_MARIO]); -#elif VERSION_US || VERSION_PAL +#if !VERSION_IQUE hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_MARIO], baseX + POS_3_X, baseY + 21); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_MARIO]); #endif @@ -378,45 +367,24 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, hammerLevel = 3; } -#if VERSION_JP - pause_draw_menu_label(PAUSE_LBL_BOOTS, baseX + 127, baseY + 10); - pause_draw_menu_label(PAUSE_LBL_HAMMER, baseX + 127, baseY + 35); + pause_draw_menu_label(PAUSE_LBL_BOOTS, baseX + X_VAR7, baseY + 10); + pause_draw_menu_label(PAUSE_LBL_HAMMER, baseX + X_VAR7, baseY + 35); // draw boots hud_element_set_script(gPauseStatsIconIDs[STAT_ICON_BOOTS], gStatsBootsElements[bootsLevel]); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_BOOTS], baseX + 151, baseY + 29); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_BOOTS], baseX + X_VAR8, baseY + 29); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_BOOTS]); - draw_msg(pause_get_menu_msg(gPauseStatsBootsMessages[bootsLevel]), baseX + 164, baseY + 23, 255, MSG_PAL_WHITE, 1); + draw_msg(pause_get_menu_msg(gPauseStatsBootsMessages[bootsLevel]), baseX + X_VAR9, baseY + 23, 255, MSG_PAL_WHITE, 1); // draw hammer hud_element_set_script(gPauseStatsIconIDs[STAT_ICON_HAMMER], gStatsHammerElements[hammerLevel]); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_HAMMER], baseX + 151, baseY + 54); + hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_HAMMER], baseX + X_VAR8, baseY + 54); hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_HAMMER]); - draw_msg(pause_get_menu_msg(gPauseStatsHammerMessages[hammerLevel]), baseX + 164, baseY + 48, 255, MSG_PAL_WHITE, 1); + draw_msg(pause_get_menu_msg(gPauseStatsHammerMessages[hammerLevel]), baseX + X_VAR9, baseY + 48, 255, MSG_PAL_WHITE, 1); // draw star power bar - pause_draw_menu_label(PAUSE_LBL_STATS, baseX + 128, baseY + 69); - pause_draw_menu_label(PAUSE_LBL_ENERGY, baseX + 128, baseY + 60); -#else - pause_draw_menu_label(PAUSE_LBL_BOOTS, baseX + 137, baseY + 10); - pause_draw_menu_label(PAUSE_LBL_HAMMER, baseX + 137, baseY + 35); - - // draw boots - hud_element_set_script(gPauseStatsIconIDs[STAT_ICON_BOOTS], gStatsBootsElements[bootsLevel]); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_BOOTS], baseX + 163, baseY + 29); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_BOOTS]); - draw_msg(pause_get_menu_msg(gPauseStatsBootsMessages[bootsLevel]), baseX + 176, baseY + 23, 255, MSG_PAL_WHITE, 1); - - // draw hammer - hud_element_set_script(gPauseStatsIconIDs[STAT_ICON_HAMMER], gStatsHammerElements[hammerLevel]); - hud_element_set_render_pos(gPauseStatsIconIDs[STAT_ICON_HAMMER], baseX + 163, baseY + 54); - hud_element_draw_without_clipping(gPauseStatsIconIDs[STAT_ICON_HAMMER]); - draw_msg(pause_get_menu_msg(gPauseStatsHammerMessages[hammerLevel]), baseX + 176, baseY + 48, 255, MSG_PAL_WHITE, 1); - - // draw star power bar - pause_draw_menu_label(PAUSE_LBL_STATS, baseX + 130, baseY + 69); - pause_draw_menu_label(PAUSE_LBL_ENERGY, baseX + 138, baseY + 60); -#endif + pause_draw_menu_label(PAUSE_LBL_STATS, baseX + X_VAR10, baseY + 69); + pause_draw_menu_label(PAUSE_LBL_ENERGY, baseX + X_VAR11, baseY + 60); drawingFirst = TRUE; curIncrement = 0; @@ -439,11 +407,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, curIncrement++; hud_element_set_script(powHudElemID, gPauseStatsSPIncElements[powBarIdx]); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[0], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[0], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[0], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -458,11 +422,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, curIncrement++; hud_element_set_script(powHudElemID, gPauseStatsSPIncElements[powBarIdx]); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[1], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[1], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[1], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -477,11 +437,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, curIncrement++; hud_element_set_script(powHudElemID, gPauseStatsSPIncElements[powBarIdx]); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[2], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[2], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[2], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -496,11 +452,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, curIncrement++; hud_element_set_script(powHudElemID, gPauseStatsSPIncElements[powBarIdx]); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[3], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[3], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[3], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -515,11 +467,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, curIncrement++; hud_element_set_script(powHudElemID, gPauseStatsSPIncElements[powBarIdx]); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[4], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[4], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[4], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -534,11 +482,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, curIncrement++; hud_element_set_script(powHudElemID, gPauseStatsSPIncElements[powBarIdx]); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[5], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[5], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[5], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -553,11 +497,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, curIncrement++; hud_element_set_script(powHudElemID, gPauseStatsSPIncElements[powBarIdx]); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[6], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[6], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[6], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -572,11 +512,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, curIncrement++; hud_element_set_script(powHudElemID, gPauseStatsStarElements[powBarIdx]); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 150 + (powBarIdx * 20), baseY + 77); -#else - hud_element_set_render_pos(powHudElemID, baseX + 152 + (powBarIdx * 20), baseY + 77); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR13 + (powBarIdx * 20), baseY + 77); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -605,11 +541,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (powIncIdx == 0) { curIncrement++; hud_element_set_script(powHudElemID, &HES_StatusSPEmptyIncrement); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[0], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[0], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[0], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -625,11 +557,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (powIncIdx == 1) { curIncrement++; hud_element_set_script(powHudElemID, &HES_StatusSPEmptyIncrement); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[1], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[1], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[1], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -646,11 +574,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (powIncIdx == 2) { curIncrement++; hud_element_set_script(powHudElemID, &HES_StatusSPEmptyIncrement); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[2], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[2], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[2], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -667,11 +591,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (powIncIdx == 3) { curIncrement++; hud_element_set_script(powHudElemID, &HES_StatusSPEmptyIncrement); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[3], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[3], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[3], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -688,11 +608,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (powIncIdx == 4) { curIncrement++; hud_element_set_script(powHudElemID, &HES_StatusSPEmptyIncrement); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[4], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[4], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[4], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -709,11 +625,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (powIncIdx == 5) { curIncrement++; hud_element_set_script(powHudElemID, &HES_StatusSPEmptyIncrement); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[5], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[5], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[5], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -730,11 +642,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (powIncIdx == 6) { curIncrement++; hud_element_set_script(powHudElemID, &HES_StatusSPEmptyIncrement); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 138 + (powBarIdx * 20) + D_8024F46C[6], baseY + 75); -#else - hud_element_set_render_pos(powHudElemID, baseX + 140 + (powBarIdx * 20) + D_8024F46C[6], baseY + 75); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR12 + (powBarIdx * 20) + D_8024F46C[6], baseY + 75); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; @@ -751,11 +659,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (powIncIdx == 7) { curIncrement++; hud_element_set_script(powHudElemID, &HES_StatusStarEmpty); -#if VERSION_JP - hud_element_set_render_pos(powHudElemID, baseX + 150 + (powBarIdx * 20), baseY + 77); -#else - hud_element_set_render_pos(powHudElemID, baseX + 152 + (powBarIdx * 20), baseY + 77); -#endif + hud_element_set_render_pos(powHudElemID, baseX + X_VAR13 + (powBarIdx * 20), baseY + 77); if (drawingFirst) { hud_element_draw_without_clipping(powHudElemID); drawingFirst = FALSE; diff --git a/src/world/area_mgm/mgm_00/scoreboard.c b/src/world/area_mgm/mgm_00/scoreboard.c index 0f236df7f0..a4b44745e8 100644 --- a/src/world/area_mgm/mgm_00/scoreboard.c +++ b/src/world/area_mgm/mgm_00/scoreboard.c @@ -69,11 +69,23 @@ Gfx N(Gfx_RecordDisplay_Init)[] = { #define RECORD_BOX_WIDTH N(RecordBox_Widths)[gCurrentLanguage] #define MSG_RESULT_JUMP_WIDTH get_msg_width(MSG_MGM_001C, 0) #define MSG_RESULT_SMASH_WIDTH get_msg_width(MSG_MGM_001D, 0) +#define NUMBER_X_OFFSET(x) (x + 174) +#elif VERSION_JP +#define RECORD_BOX_POSX 65 +#define RECORD_BOX_WIDTH 190 +#define MSG_RESULT_JUMP_WIDTH 164 +#define MSG_RESULT_SMASH_WIDTH 164 +#define RESULT_COL1_X 87 +#define RESULT_COL2_X 211 +#define NUMBER_X_OFFSET(x) 144 #else #define RECORD_BOX_POSX 45 #define RECORD_BOX_WIDTH 230 #define MSG_RESULT_JUMP_WIDTH 188 #define MSG_RESULT_SMASH_WIDTH 192 +#define RESULT_COL1_X (RECORD_BOX_POSX + 13) +#define RESULT_COL2_X (RECORD_BOX_POSX + 178) +#define NUMBER_X_OFFSET(x) 174 #endif void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { @@ -96,38 +108,11 @@ void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { #endif gDPPipeSync(gMainGfxPos++); gDPSetPrimColor(gMainGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); -#if VERSION_JP - gDPFillRectangle(gMainGfxPos++, 68, 53, 252, 129); - gDPPipeSync(gMainGfxPos++); - msg_draw_frame(65, 50, 190, 82, MSG_STYLE_INSPECT, 0, 1, (s32)(alpha * 0.55), alpha); // cast needed if signature isn't present - if (data->gameType == MINIGAME_TYPE_JUMP) { - draw_msg(MSG_MGM_001C, 78, 57, alpha, MSG_PAL_TEAL, 0); - draw_number(gPlayerData.jumpGamePlays, 209, 78, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, alpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); - draw_number(gPlayerData.jumpGameTotal, 209, 93, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, alpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); - draw_number(gPlayerData.jumpGameRecord, 209, 108, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, alpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); - } else { - draw_msg(MSG_MGM_001D, 78, 57, alpha, MSG_PAL_TEAL, 0); - draw_number(gPlayerData.smashGamePlays, 209, 78, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, alpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); - draw_number(gPlayerData.smashGameTotal, 209, 93, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, alpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); - draw_number(gPlayerData.smashGameRecord, 209, 108, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, alpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); - } - - draw_msg(MSG_MGM_001E, 87, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_0023, 211, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_001F, 87, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_0021, 211, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_0020, 87, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_0021, 211, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); -#else gDPFillRectangle(gMainGfxPos++, RECORD_BOX_POSX + 3, 53, RECORD_BOX_POSX + RECORD_BOX_WIDTH - 3, 129); gDPPipeSync(gMainGfxPos++); msg_draw_frame(RECORD_BOX_POSX, 50, RECORD_BOX_WIDTH, 82, MSG_STYLE_INSPECT, 0, 1, (s32)(alpha * 0.55), alpha); // cast needed if signature isn't present if (data->gameType == MINIGAME_TYPE_JUMP) { -#if VERSION_PAL - s32 posX = var_fp + 174; //! required to match -#else - s32 posX = 174; -#endif + s32 posX = NUMBER_X_OFFSET(var_fp); //! required to match draw_msg(MSG_MGM_001C, RECORD_BOX_POSX + (RECORD_BOX_WIDTH - MSG_RESULT_JUMP_WIDTH) / 2, 57, alpha, MSG_PAL_TEAL, 0); draw_number(gPlayerData.jumpGamePlays, RECORD_BOX_POSX + posX, 78, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, alpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); @@ -140,11 +125,7 @@ void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { GameRecordMsg = gPlayerData.jumpGameRecord == 1 ? MSG_PAL_MGM_0021 : MSG_MGM_0021; #endif } else { -#if VERSION_PAL - s32 posX = var_fp + 174; //! required, cannot be merged to the same var above -#else - s32 posX = 174; -#endif + s32 posX = NUMBER_X_OFFSET(var_fp); //! required, cannot be merged to the same var above draw_msg(MSG_MGM_001D, RECORD_BOX_POSX + (RECORD_BOX_WIDTH - MSG_RESULT_SMASH_WIDTH) / 2, 57, alpha, MSG_PAL_TEAL, 0); draw_number(gPlayerData.smashGamePlays, RECORD_BOX_POSX + posX, 78, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, alpha, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); @@ -162,26 +143,25 @@ void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { draw_msg(MSG_MGM_001E, RECORD_BOX_POSX + 13, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); if (gCurrentLanguage != LANGUAGE_FR) { s32 width2 = var_fp + 178; //! required to match and can't be merged with the same two below - draw_msg(GamePlaysMsg, RECORD_BOX_POSX + width2, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(GamePlaysMsg, RECORD_BOX_POSX + width2, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); } draw_msg(MSG_MGM_001F, RECORD_BOX_POSX + 13, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); if (gCurrentLanguage != LANGUAGE_FR) { s32 width2 = var_fp + 178; - draw_msg(GameTotalMsg, RECORD_BOX_POSX + width2, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(GameTotalMsg, RECORD_BOX_POSX + width2, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); } draw_msg(MSG_MGM_0020, RECORD_BOX_POSX + 13, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); if (gCurrentLanguage != LANGUAGE_FR) { s32 width2 = var_fp + 178; - draw_msg(GameRecordMsg, RECORD_BOX_POSX + width2, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(GameRecordMsg,RECORD_BOX_POSX + width2, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); } #else - draw_msg(MSG_MGM_001E, RECORD_BOX_POSX + 13, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_0023, RECORD_BOX_POSX + 178, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_001F, RECORD_BOX_POSX + 13, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_0021, RECORD_BOX_POSX + 178, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_0020, RECORD_BOX_POSX + 13, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_msg(MSG_MGM_0021, RECORD_BOX_POSX + 178, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); -#endif + draw_msg(MSG_MGM_001E, RESULT_COL1_X, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_MGM_0023, RESULT_COL2_X, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_MGM_001F, RESULT_COL1_X, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_MGM_0021, RESULT_COL2_X, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_MGM_0020, RESULT_COL1_X, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_MGM_0021, RESULT_COL2_X, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); #endif } }