From 28a9ab039b1f632f4d418831e9afd9f6daf51358 Mon Sep 17 00:00:00 2001 From: mrshigure Date: Sat, 28 Sep 2024 21:43:56 -0700 Subject: [PATCH] [JP] Addressing PR feedback (#1208) --- src/battle/btl_states_menus.c | 169 ++++++++++++++++++---------------- src/pause/pause_badges.c | 115 ++++++++++------------- 2 files changed, 138 insertions(+), 146 deletions(-) diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index 3fdae30822..f2594fde19 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -748,6 +748,12 @@ s32 btl_main_menu_update(void) { return 0; } +#if VERSION_JP +#define BASE_X 40 +#else +#define BASE_X 3940 +#endif + void btl_main_menu_draw(void) { s32 id; s32 opacity; @@ -764,11 +770,7 @@ void btl_main_menu_draw(void) { id = D_802AD048; hud_element_set_transform_rotation(id, 0.0f, 0.0f, 0.0f); hud_element_set_alpha(id, (D_802AD006 * 254) / 255); -#if VERSION_JP - hud_element_set_render_pos(id, 40 - D_802AD00A, D_802AD00A + 212); -#else - hud_element_set_render_pos(id, 3940 - D_802AD00A, D_802AD00A + 212); -#endif + hud_element_set_render_pos(id, BASE_X - D_802AD00A, D_802AD00A + 212); func_80144238(id); id = D_802AD044; hud_element_set_alpha(id, (D_802AD006 * 254) / 255); @@ -1081,6 +1083,26 @@ 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 + s32 btl_submenu_moves_update(void) { BattleStatus* battleStatus = &gBattleStatus; s8 temp_v0_14; @@ -1098,11 +1120,7 @@ s32 btl_submenu_moves_update(void) { case BTL_SUBMENU_MOVES_STATE_UNK_0: battle_menu_moveScrollOffset = -battle_menu_moveScrollLine * 13; D_802AD112 = (battle_menu_moveCursorPos - battle_menu_moveScrollLine) * 13; -#if VERSION_JP - BattleMenu_Moves_PosX = 32; -#else - BattleMenu_Moves_PosX = 20; -#endif + BattleMenu_Moves_PosX = POS_X; BattleMenu_Moves_PosY = 68; for (i = 0; i < BattleMenu_Moves_OptionCount; i++) { @@ -1212,38 +1230,27 @@ s32 btl_submenu_moves_update(void) { moveY = BattleMenu_Moves_PosY; #if VERSION_JP set_window_properties(1, moveX, moveY, 140, (D_802AD10E * 13) + 28, 0, func_802A3C98, NULL, -1); +#endif if (!BattleMenu_UsingSpiritsSubmenu) { - set_window_properties(2, moveX + 10, moveY - 6, 80, 16, 1, func_802A43DC, NULL, -1); - set_window_properties(3, moveX + 104, moveY - 12, 32, 32, 1, func_802A4448, NULL, -1); - } else { - s16 new_var; - - new_var = moveY; // todo required to match - set_window_properties(4, moveX + 10, new_var - 6, 80, 16, 1, func_802A43DC, 0, -1); - set_window_properties(5, moveX + 104, new_var - 12, 32, 35, 1, func_802A4448, 0, -1); - } - - moveX = 32; - moveY = BattleMenu_Moves_PosY; - set_window_properties(8, moveX, 186, 242, 32, WINDOW_PRIORITY_20, func_802A4494, NULL, -1); -#else - if (!BattleMenu_UsingSpiritsSubmenu) { +#if !VERSION_JP set_window_properties(1, moveX, moveY, 150, (D_802AD10E * 13) + 28, 0, func_802A3C98, NULL, -1); - set_window_properties(2, moveX + 16, moveY - 6, 90, 16, 1, func_802A43DC, NULL, -1); - set_window_properties(3, moveX + 114, moveY - 12, 32, 32, 1, func_802A4448, NULL, -1); +#endif + set_window_properties(2, moveX + OFFSET_X_1, moveY - 6, WIDTH_1, 16, 1, func_802A43DC, NULL, -1); + set_window_properties(3, moveX + OFFSET_X_2, moveY - 12, 32, 32, 1, func_802A4448, NULL, -1); } else { s16 new_var; +#if !VERSION_JP set_window_properties(1, moveX, moveY, 144, (D_802AD10E * 13) + 28, 0, func_802A3C98, NULL, -1); +#endif new_var = moveY; // todo required to match - set_window_properties(4, moveX + 10, new_var - 6, 100, 16, 1, func_802A43DC, 0, -1); - set_window_properties(5, moveX + 110, new_var - 12, 32, 35, 1, func_802A4448, 0, -1); + set_window_properties(4, moveX + 10, new_var - 6, WIDTH_2, 16, 1, func_802A43DC, 0, -1); + set_window_properties(5, moveX + OFFSET_X_3, new_var - 12, 32, 35, 1, func_802A4448, 0, -1); } - moveX = 20; + moveX = MOVE_X; moveY = BattleMenu_Moves_PosY; - set_window_properties(8, moveX, 186, 280, 32, WINDOW_PRIORITY_20, func_802A4494, NULL, -1); -#endif + set_window_properties(8, moveX, 186, WIDTH_3, 32, WINDOW_PRIORITY_20, func_802A4494, NULL, -1); set_window_update(WINDOW_ID_1, WINDOW_UPDATE_SHOW); if (!BattleMenu_UsingSpiritsSubmenu) { @@ -1493,14 +1500,23 @@ s32 btl_submenu_moves_update(void) { #if VERSION_IQUE #define Y_VAR1 2 +#define X_VAR254 153 +#define X_VAR255 31 #define X_VAR1 104 #define X_VAR2 89 +#define X_VAR3 24 #elif VERSION_JP #define Y_VAR1 0 +#define X_VAR254 139 +#define X_VAR255 35 +#define X_VAR3 26 #else #define Y_VAR1 0 +#define X_VAR254 153 +#define X_VAR255 31 #define X_VAR1 108 #define X_VAR2 93 +#define X_VAR3 24 #endif void func_802A3C98(void* data, s32 x, s32 y) { @@ -1541,19 +1557,11 @@ void func_802A3C98(void* data, s32 x, s32 y) { gMainGfxPos++, G_SC_NON_INTERLACE, xPos, yPos, -#if VERSION_JP - x + 139, -#else - x + 153, -#endif + x + X_VAR254, var_t0 ); -#if VERSION_JP - xPos = x + 35; -#else - xPos = x + 31; -#endif + xPos = x + X_VAR255; yPos = y + 19 + battle_menu_moveScrollOffset; idx = 0; @@ -1682,11 +1690,7 @@ void func_802A3C98(void* data, s32 x, s32 y) { yPos += 13; } -#if VERSION_JP - xPos = x + 26; -#else - xPos = x + 24; -#endif + xPos = x + X_VAR3; yPos = battle_menu_moveScrollOffset + y + 24; idx = 0; @@ -1746,6 +1750,14 @@ void func_802A3C98(void* data, s32 x, s32 y) { } } +#if VERSION_JP +#define X_VAR4 28 +#define X_VAR5 24 +#else +#define X_VAR4 16 +#define X_VAR5 6 +#endif + void func_802A43DC(void* data, s32 x, s32 y) { s32 msgID; s32 posX; @@ -1755,21 +1767,13 @@ void func_802A43DC(void* data, s32 x, s32 y) { if (!BattleMenu_UsingSpiritsSubmenu) { msgID = MSG_Menus_Abilities; -#if VERSION_JP - posX = x + 28; -#else - posX = x + 16; -#endif + posX = x + X_VAR4; posY = y + 2; opacity = BattleMenu_Moves_TextAlpha; palette = MSG_PAL_30; } else { msgID = MSG_Menus_StarSpirits; -#if VERSION_JP - posX = x + 24; -#else - posX = x + 6; -#endif + posX = x + X_VAR5; posY = y + 2; opacity = BattleMenu_Moves_TextAlpha; palette = MSG_PAL_31; @@ -1940,6 +1944,20 @@ void func_802A4A10(void) { BattleSubmenuStratsState = BTL_SUBMENU_STRATS_STATE_UNK_30; } +#if VERSION_JP +#define X_VAR6 10 +#define X_VAR7 32 +#define W_VAR1 108 +#define W_VAR2 88 +#define W_VAR3 242 +#else +#define X_VAR6 18 +#define X_VAR7 20 +#define W_VAR1 144 +#define W_VAR2 108 +#define W_VAR3 280 +#endif + s32 btl_update_strats_menu(void) { BattleStatus* battleStatus = &gBattleStatus; s32 id; @@ -1980,19 +1998,11 @@ s32 btl_update_strats_menu(void) { D_802AD614 = MSG_PAL_STANDARD; x = D_802AD63C; y = D_802AD63E; -#if VERSION_JP - set_window_properties(WINDOW_ID_6, x, y, 108, (StratsMenuLines * 13) + 26, 0, btl_menu_strats_draw_content, NULL, -1); - set_window_properties(WINDOW_ID_7, x + 10, y - 6, 88, 16, 1, btl_menu_strats_show_title, NULL, -1); - x = 32; - y = 186; - set_window_properties(WINDOW_ID_8, x, y, 242, 32, WINDOW_PRIORITY_20, btl_menu_strats_show_desc, NULL, -1); -#else - set_window_properties(WINDOW_ID_6, x, y, 144, (StratsMenuLines * 13) + 26, 0, btl_menu_strats_draw_content, NULL, -1); - set_window_properties(WINDOW_ID_7, x + 18, y - 6, 108, 16, 1, btl_menu_strats_show_title, NULL, -1); - x = 20; + set_window_properties(WINDOW_ID_6, x, y, W_VAR1, (StratsMenuLines * 13) + 26, 0, btl_menu_strats_draw_content, NULL, -1); + set_window_properties(WINDOW_ID_7, x + X_VAR6, y - 6, W_VAR2, 16, 1, btl_menu_strats_show_title, NULL, -1); + x = X_VAR7; y = 186; - set_window_properties(WINDOW_ID_8, x, y, 280, 32, WINDOW_PRIORITY_20, btl_menu_strats_show_desc, NULL, -1); -#endif + set_window_properties(WINDOW_ID_8, x, y, W_VAR3, 32, WINDOW_PRIORITY_20, btl_menu_strats_show_desc, NULL, -1); set_window_update(WINDOW_ID_6, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_7, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_8, WINDOW_UPDATE_SHOW); @@ -2138,8 +2148,13 @@ s32 btl_update_strats_menu(void) { } #if VERSION_IQUE +#define X_VAR8 142 #define Y_VAR2 3 +#elif VERSION_JP +#define X_VAR8 106 +#define Y_VAR2 0 #else +#define X_VAR8 142 #define Y_VAR2 0 #endif @@ -2172,11 +2187,7 @@ void btl_menu_strats_draw_content(void* data, s32 x, s32 y) { xPos = x + 4; yPos = y + 18; var_t0 = yPos + 1 + (StratsMenuLines * 13); -#if VERSION_JP - gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, xPos, yPos, x + 106, var_t0); -#else - gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, xPos, yPos, x + 142, var_t0); -#endif + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, xPos, yPos, x + X_VAR8, var_t0); xPos = x + 33; yPos = y + 19 + D_802AD60C; @@ -2240,12 +2251,14 @@ void btl_menu_strats_draw_content(void* data, s32 x, s32 y) { } } -void btl_menu_strats_show_title(void* data, s32 x, s32 y) { #if VERSION_JP - draw_msg(MSG_Menus_Strategies, x + 27, y + 2, D_802AD624, MSG_PAL_33, DRAW_MSG_STYLE_MENU); +#define X_VAR9 27 #else - draw_msg(MSG_Menus_Strategies, x + 15, y + 2, D_802AD624, MSG_PAL_33, DRAW_MSG_STYLE_MENU); +#define X_VAR9 15 #endif + +void btl_menu_strats_show_title(void* data, s32 x, s32 y) { + draw_msg(MSG_Menus_Strategies, x + X_VAR9, y + 2, D_802AD624, MSG_PAL_33, DRAW_MSG_STYLE_MENU); } void btl_menu_strats_show_desc(void* data, s32 x, s32 y) { @@ -2329,7 +2342,7 @@ s32 can_switch_to_player(void) { } #if VERSION_JP -s32 func_802A57AC_421EFC(void) { +s32 btl_menu_can_player_move(void) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; s8 debuff = player->debuff; diff --git a/src/pause/pause_badges.c b/src/pause/pause_badges.c index 9c42c13f54..e726c11de0 100644 --- a/src/pause/pause_badges.c +++ b/src/pause/pause_badges.c @@ -310,6 +310,38 @@ void pause_badges_draw_bp_orbs(s32 orbState, s32 x, s32 y) { } } +#if VERSION_JP +#define X_VAR1 215 +#define X_VAR2 211 +#define X_VAR3 15 +#define X_VAR4 62 +#define X_VAR5 12 +#define X_VAR6 21 +#define X_VAR7 8 +#define X_VAR8 17 +#define X_VAR9 78 +#define X_VAR10 78 +#define Y_VAR1 39 +#define Y_VAR2 49 +#define W_VAR1 87 +#define W_VAR2 87 +#else +#define X_VAR1 241 +#define X_VAR2 235 +#define X_VAR3 12 +#define X_VAR4 73 +#define X_VAR5 10 +#define X_VAR6 19 +#define X_VAR7 12 +#define X_VAR8 21 +#define X_VAR9 86 +#define X_VAR10 90 +#define Y_VAR1 37 +#define Y_VAR2 42 +#define W_VAR1 91 +#define W_VAR2 91 +#endif + void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { s32 pageIndex, i; s32 badgeIndex; @@ -364,11 +396,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width currentBadgeRow = gPauseBadgesSelectedIndex % currentPage->numCols; draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_15, baseX + 84, baseY, 0, width - 84, height, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); -#if VERSION_JP - hud_element_set_render_pos(gPauseBadgesIconIDs[20], baseX + 215, baseY + 11); -#else - hud_element_set_render_pos(gPauseBadgesIconIDs[20], baseX + 241, baseY + 11); -#endif + hud_element_set_render_pos(gPauseBadgesIconIDs[20], baseX + X_VAR1, baseY + 11); palette = MSG_PAL_STANDARD; hud_element_draw_without_clipping(gPauseBadgesIconIDs[20]); @@ -487,11 +515,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width badgeListY + pause_badges_scroll_offset_y(posY) + badgeEntryOffsetY, 255, palette, style); } } -#if VERSION_JP - draw_number(gMoveTable[gItemTable[badgeID].moveID].costBP, baseX + 211 + pause_badges_scroll_offset_x(posX), -#else - draw_number(gMoveTable[gItemTable[badgeID].moveID].costBP, baseX + 235 + pause_badges_scroll_offset_x(posX), -#endif + draw_number(gMoveTable[gItemTable[badgeID].moveID].costBP, baseX + X_VAR2 + pause_badges_scroll_offset_x(posX), baseY + 17 + pause_badges_scroll_offset_y(posY), DRAW_NUMBER_CHARSET_THIN, palette, 255, DRAW_NUMBER_STYLE_ALIGN_RIGHT | DRAW_NUMBER_STYLE_MONOSPACE); } } @@ -650,21 +674,15 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width if (bpAmount < 10) { bpAvailOffsetX = -4; } -#if VERSION_JP - pause_draw_menu_label(PAUSE_LBL_AVAILABLE, baseX + 15, baseY + 100 + bpAvailOffsetY); -#else - pause_draw_menu_label(PAUSE_LBL_AVAILABLE, baseX + 12, baseY + 100 + bpAvailOffsetY); -#endif + pause_draw_menu_label(PAUSE_LBL_AVAILABLE, baseX + X_VAR3, baseY + 100 + bpAvailOffsetY); #if VERSION_PAL bpAmountX = baseX + (73 + bpAvailOffsetX); if (gCurrentLanguage == LANGUAGE_ES) { bpAmountX += 8; } -#elif VERSION_JP - bpAmountX = baseX + 62 + bpAvailOffsetX; #else - bpAmountX = baseX + 73 + bpAvailOffsetX; + bpAmountX = baseX + X_VAR4 + bpAvailOffsetX; #endif draw_number(bpAmount, bpAmountX, baseY + 100 + bpAvailOffsetY, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_STANDARD, 255, @@ -708,11 +726,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width } draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 0 ? baseX + 9 : baseX, baseY + 7, 0, -#if VERSION_JP - 87, 34, 255, gPauseBadgesCurrentTab == 1 ? 128 : 0, 0, 0, -#else - 91, 34, 255, gPauseBadgesCurrentTab == 1 ? 128 : 0, 0, 0, -#endif + W_VAR1, 34, 255, gPauseBadgesCurrentTab == 1 ? 128 : 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); #if VERSION_PAL @@ -764,38 +778,11 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width draw_msg(msg2, msgX, baseY + 42, gPauseBadgesCurrentTab == 0 ? 191 : 255, 0, 1); draw_msg(pause_get_menu_msg(PAUSE_MSG_BADGES), (gPauseBadgesCurrentTab == 1) ? baseX + D_PAL_80271B2C[gCurrentLanguage] + 9 :baseX + D_PAL_80271B2C[gCurrentLanguage], baseY + 52, gPauseBadgesCurrentTab == 0 ? 191 : 255, 0, 1); -#elif VERSION_JP - msg = pause_get_menu_msg(PAUSE_MSG_ALL_BADGES); - msgX = baseX + 12; - if (gPauseBadgesCurrentTab == 0) { - msgX = baseX + 21; - } - msgOpacity = 255; - msgY = baseY + 17; - if (gPauseBadgesCurrentTab == 1) { - msgOpacity = 191; - } - draw_msg(msg, msgX, msgY, msgOpacity, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - - draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 1 ? baseX + 9 : baseX, baseY + 39, 0, 87, 34, 255, - gPauseBadgesCurrentTab == 0 ? 128 : 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); - - msg = pause_get_menu_msg(PAUSE_MSG_ACTIVE); - msgX = baseX + 8; - if (gPauseBadgesCurrentTab == 1) { - msgX = baseX + 17; - } - msgY = baseY + 49; - msgOpacity = 255; - if (gPauseBadgesCurrentTab == 0) { - msgOpacity = 191; - } - draw_msg(msg, msgX, msgY, msgOpacity, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); #else msg = pause_get_menu_msg(PAUSE_MSG_ALL_BADGES); - msgX = baseX + 10; + msgX = baseX + X_VAR5; if (gPauseBadgesCurrentTab == 0) { - msgX = baseX + 19; + msgX = baseX + X_VAR6; } msgOpacity = 255; msgY = baseY + 17; @@ -804,21 +791,23 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width } draw_msg(msg, msgX, msgY, msgOpacity, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 1 ? baseX + 9 : baseX, baseY + 37, 0, 91, 34, 255, + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 1 ? baseX + 9 : baseX, baseY + Y_VAR1, 0, W_VAR2, 34, 255, gPauseBadgesCurrentTab == 0 ? 128 : 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); msg = pause_get_menu_msg(PAUSE_MSG_ACTIVE); - msgX = baseX + 12; + msgX = baseX + X_VAR7; if (gPauseBadgesCurrentTab == 1) { - msgX = baseX + 21; + msgX = baseX + X_VAR8; } - msgY = baseY + 42; + msgY = baseY + Y_VAR2; msgOpacity = 255; if (gPauseBadgesCurrentTab == 0) { msgOpacity = 191; } draw_msg(msg, msgX, msgY, msgOpacity, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); +#endif +#if VERSION_US || VERSION_IQUE msg = pause_get_menu_msg(PAUSE_MSG_BADGES); msgX = baseX + 26; if (gPauseBadgesCurrentTab == 1) { @@ -864,27 +853,17 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); draw_msg(pause_get_menu_msg(PAUSE_MSG_NOT_ENOUGH_BP), baseX + (292 - wid) / 2, baseY + 66, 255, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); -#elif VERSION_JP - draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, baseX + 67, baseY + 60, 0, 137, 26, 255, - 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); - draw_msg(pause_get_menu_msg(PAUSE_MSG_NOT_ENOUGH_BP), baseX + 78, baseY + 66, 255, - MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); #else draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, baseX + 67, baseY + 60, 0, 137, 26, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); - draw_msg(pause_get_menu_msg(PAUSE_MSG_NOT_ENOUGH_BP), baseX + 86, baseY + 66, 255, + draw_msg(pause_get_menu_msg(PAUSE_MSG_NOT_ENOUGH_BP), baseX + X_VAR9, baseY + 66, 255, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); #endif } else { draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, baseX + 67, baseY + 60, 0, 173, 26, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); -#if VERSION_JP - draw_msg(pause_get_menu_msg(PAUSE_MSG_DONT_WEAR_MORE), baseX + 78, baseY + 66, 255, + draw_msg(pause_get_menu_msg(PAUSE_MSG_DONT_WEAR_MORE), baseX + X_VAR10, baseY + 66, 255, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); -#else - draw_msg(pause_get_menu_msg(PAUSE_MSG_DONT_WEAR_MORE), baseX + 90, baseY + 66, 255, - MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); -#endif } } }