From b51b376bf089e577c7ad274b01925124f75bd001 Mon Sep 17 00:00:00 2001 From: Reonu Date: Sun, 27 Jun 2021 22:49:48 +0100 Subject: [PATCH] removed the ifdef hell in ingame_menu.c --- src/game/ingame_menu.c | 1064 ---------------------------------------- 1 file changed, 1064 deletions(-) diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index cba3a7f2..02a2dead 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -28,10 +28,6 @@ u16 gDialogColorFadeTimer; s8 gLastDialogLineNum; s32 gDialogVariable; u16 gDialogTextAlpha; -#if defined(VERSION_EU) -s16 gDialogX; // D_8032F69A -s16 gDialogY; // D_8032F69C -#endif s16 gCutsceneMsgXOffset; s16 gCutsceneMsgYOffset; s8 gRedCoinsCollected; @@ -69,7 +65,6 @@ enum DialogMark { DIALOG_MARK_NONE = 0, DIALOG_MARK_DAKUTEN = 1, DIALOG_MARK_HAN #define DEFAULT_DIALOG_BOX_ANGLE 90.0f #define DEFAULT_DIALOG_BOX_SCALE 19.0f -#if defined(VERSION_US) || defined(VERSION_EU) u8 gDialogCharWidths[256] = { // TODO: Is there a way to auto generate this? 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 5, 8, 8, 6, 6, 6, 6, 6, 5, 6, 6, @@ -77,30 +72,17 @@ u8 gDialogCharWidths[256] = { // TODO: Is there a way to auto generate this? 7, 5, 5, 5, 6, 5, 5, 5, 5, 5, 7, 7, 5, 5, 4, 4, 8, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 7, 7, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0, -#ifdef VERSION_EU - 6, 6, 6, 0, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 4, - 5, 5, 5, 5, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, - 5, 5, 5, 0, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 5, 5, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 5, 6, - 0, 4, 4, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#else 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#ifdef VERSION_EU - 7, 5, 10, 5, 9, 8, 4, 0, 0, 0, 0, 5, 5, 6, 5, 0, -#else 7, 5, 10, 5, 9, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif 0, 0, 5, 7, 7, 6, 6, 8, 0, 8, 10, 6, 4, 10, 0, 0 }; -#endif s8 gDialogBoxState = DIALOG_STATE_OPENING; f32 gDialogBoxOpenTimer = DEFAULT_DIALOG_BOX_ANGLE; @@ -110,9 +92,6 @@ s8 gDialogBoxType = DIALOG_TYPE_ROTATE; s16 gDialogID = -1; s16 gLastDialogPageStrPos = 0; s16 gDialogTextPos = 0; -#ifdef VERSION_EU -s32 gInGameLanguage = 0; -#endif s8 gDialogLineNum = 1; s8 gLastDialogResponse = 0; u8 gMenuHoldKeyIndex = 0; @@ -238,90 +217,16 @@ static u8 *alloc_ia8_text_from_i1(u16 *in, s16 width, s16 height) { void render_generic_char(u8 c) { void **fontLUT; void *packedTexture; -#if defined(VERSION_JP) || defined(VERSION_SH) - void *unpackedTexture; -#endif fontLUT = segmented_to_virtual(main_font_lut); packedTexture = segmented_to_virtual(fontLUT[c]); -#if defined(VERSION_JP) || defined(VERSION_SH) - unpackedTexture = alloc_ia8_text_from_i1(packedTexture, 8, 16); - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); -#else -#ifdef VERSION_US - gDPPipeSync(gDisplayListHead++); -#endif gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(packedTexture)); -#endif gSPDisplayList(gDisplayListHead++, dl_ia_text_tex_settings); -#ifdef VERSION_EU - gSPTextureRectangleFlip(gDisplayListHead++, gDialogX << 2, (gDialogY - 16) << 2, - (gDialogX + 8) << 2, gDialogY << 2, G_TX_RENDERTILE, 8 << 6, 4 << 6, 1 << 10, 1 << 10); -#endif } -#ifdef VERSION_EU -u8 *alloc_ia4_tex_from_i1(u8 *in, s16 width, s16 height) { - u32 size = (u32) width * (u32) height; - u8 *out; - s32 inPos; - s16 outPos; - u8 bitMask; - outPos = 0; - out = (u8 *) alloc_display_list(size); - - if (out == NULL) { - return NULL; - } - - for (inPos = 0; inPos < (width * height) / 4; inPos++) { - bitMask = 0x80; - while (bitMask != 0) { - out[outPos] = (in[inPos] & bitMask) ? 0xF0 : 0x00; - bitMask /= 2; - out[outPos] = (in[inPos] & bitMask) ? out[outPos] + 0x0F : out[outPos]; - bitMask /= 2; - outPos++; - } - } - - return out; -} - -void render_generic_char_at_pos(s16 xPos, s16 yPos, u8 c) { - void **fontLUT; - void *packedTexture; - void *unpackedTexture; - - fontLUT = segmented_to_virtual(main_font_lut); - packedTexture = segmented_to_virtual(fontLUT[c]); - unpackedTexture = alloc_ia4_tex_from_i1(packedTexture, 8, 8); - - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_tex_settings); - gSPTextureRectangleFlip(gDisplayListHead++, xPos << 2, (yPos - 16) << 2, (xPos + 8) << 2, yPos << 2, - G_TX_RENDERTILE, 8 << 6, 4 << 6, 1 << 10, 1 << 10); -} - -void render_lowercase_diacritic(s16 *xPos, s16 *yPos, u8 letter, u8 diacritic) { - render_generic_char_at_pos(*xPos, *yPos, letter); - render_generic_char_at_pos(*xPos, *yPos, diacritic + 0xE7); - *xPos += gDialogCharWidths[letter]; -} - -void render_uppercase_diacritic(s16 *xPos, s16 *yPos, u8 letter, u8 diacritic) { - render_generic_char_at_pos(*xPos, *yPos, letter); - render_generic_char_at_pos(*xPos, *yPos - 4, diacritic + 0xE3); - *xPos += gDialogCharWidths[letter]; -} -#endif // VERSION_EU - -#if !defined(VERSION_JP) && !defined(VERSION_SH) struct MultiTextEntry { u8 length; u8 str[4]; @@ -337,11 +242,7 @@ enum MultiStringIDs { STRING_THE, STRING_YOU }; * 0: 'the' * 1: 'you' */ -#ifdef VERSION_US void render_multi_text_string(s8 multiTextID) -#elif defined(VERSION_EU) -void render_multi_text_string(s16 *xPos, s16 *yPos, s8 multiTextID) -#endif { s8 i; struct MultiTextEntry textLengths[2] = { @@ -350,22 +251,12 @@ void render_multi_text_string(s16 *xPos, s16 *yPos, s8 multiTextID) }; for (i = 0; i < textLengths[multiTextID].length; i++) { -#ifdef VERSION_US render_generic_char(textLengths[multiTextID].str[i]); create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32)(gDialogCharWidths[textLengths[multiTextID].str[i]]), 0.0f, 0.0f); -#elif defined(VERSION_EU) - render_generic_char_at_pos(*xPos, *yPos, textLengths[multiTextID].str[i]); - *xPos += gDialogCharWidths[textLengths[multiTextID].str[i]]; -#endif } } -#endif -#if defined(VERSION_JP) || defined(VERSION_SH) -#define MAX_STRING_WIDTH 18 -#else #define MAX_STRING_WIDTH 16 -#endif /** * Prints a generic white string. @@ -375,66 +266,11 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { UNUSED s8 mark = DIALOG_MARK_NONE; // unused in EU s32 strPos = 0; u8 lineNum = 1; -#ifdef VERSION_EU - s16 xCoord = x; - s16 yCoord = 240 - y; -#endif -#ifndef VERSION_EU create_dl_translation_matrix(MENU_MTX_PUSH, x, y, 0.0f); -#endif while (str[strPos] != DIALOG_CHAR_TERMINATOR) { switch (str[strPos]) { -#ifdef VERSION_EU - case DIALOG_CHAR_SPACE: - xCoord += 5; - break; - case DIALOG_CHAR_NEWLINE: - yCoord += 16; - xCoord = x; - lineNum++; - break; - case DIALOG_CHAR_LOWER_A_GRAVE: - case DIALOG_CHAR_LOWER_A_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_A_UMLAUT: - render_lowercase_diacritic(&xCoord, &yCoord, ASCII_TO_DIALOG('a'), str[strPos] & 0xF); - break; - case DIALOG_CHAR_UPPER_A_UMLAUT: // @bug grave and circumflex (0x64-0x65) are absent here - render_uppercase_diacritic(&xCoord, &yCoord, ASCII_TO_DIALOG('A'), str[strPos] & 0xF); - break; - case DIALOG_CHAR_LOWER_E_GRAVE: - case DIALOG_CHAR_LOWER_E_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_E_UMLAUT: - case DIALOG_CHAR_LOWER_E_ACUTE: - render_lowercase_diacritic(&xCoord, &yCoord, ASCII_TO_DIALOG('e'), str[strPos] & 0xF); - break; - case DIALOG_CHAR_UPPER_E_GRAVE: - case DIALOG_CHAR_UPPER_E_CIRCUMFLEX: - case DIALOG_CHAR_UPPER_E_UMLAUT: - case DIALOG_CHAR_UPPER_E_ACUTE: - render_uppercase_diacritic(&xCoord, &yCoord, ASCII_TO_DIALOG('E'), str[strPos] & 0xF); - break; - case DIALOG_CHAR_LOWER_U_GRAVE: - case DIALOG_CHAR_LOWER_U_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_U_UMLAUT: - render_lowercase_diacritic(&xCoord, &yCoord, ASCII_TO_DIALOG('u'), str[strPos] & 0xF); - break; - case DIALOG_CHAR_UPPER_U_UMLAUT: // @bug grave and circumflex (0x84-0x85) are absent here - render_uppercase_diacritic(&xCoord, &yCoord, ASCII_TO_DIALOG('U'), str[strPos] & 0xF); - break; - case DIALOG_CHAR_LOWER_O_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_O_UMLAUT: - render_lowercase_diacritic(&xCoord, &yCoord, ASCII_TO_DIALOG('o'), str[strPos] & 0xF); - break; - case DIALOG_CHAR_UPPER_O_UMLAUT: // @bug circumflex (0x95) is absent here - render_uppercase_diacritic(&xCoord, &yCoord, ASCII_TO_DIALOG('O'), str[strPos] & 0xF); - break; - case DIALOG_CHAR_LOWER_I_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_I_UMLAUT: - render_lowercase_diacritic(&xCoord, &yCoord, DIALOG_CHAR_I_NO_DIA, str[strPos] & 0xF); - break; -#else // i.e. not EU case DIALOG_CHAR_DAKUTEN: mark = DIALOG_MARK_DAKUTEN; break; @@ -451,46 +287,19 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { render_generic_char(DIALOG_CHAR_PERIOD_OR_HANDAKUTEN); gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); break; -#endif -#if !defined(VERSION_JP) && !defined(VERSION_SH) case DIALOG_CHAR_SLASH: -#ifdef VERSION_US create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32)(gDialogCharWidths[DIALOG_CHAR_SPACE] * 2), 0.0f, 0.0f); -#elif defined(VERSION_EU) - xCoord += gDialogCharWidths[DIALOG_CHAR_SPACE] * 2; -#endif break; case DIALOG_CHAR_MULTI_THE: -#ifdef VERSION_EU - render_multi_text_string(&xCoord, &yCoord, STRING_THE); -#else render_multi_text_string(STRING_THE); -#endif break; case DIALOG_CHAR_MULTI_YOU: -#ifdef VERSION_EU - render_multi_text_string(&xCoord, &yCoord, STRING_YOU); -#else render_multi_text_string(STRING_YOU); -#endif break; -#endif -#ifndef VERSION_EU case DIALOG_CHAR_SPACE: -#if defined(VERSION_JP) || defined(VERSION_SH) - create_dl_translation_matrix(MENU_MTX_NOPUSH, 5.0f, 0.0f, 0.0f); - break; -#else create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32)(gDialogCharWidths[DIALOG_CHAR_SPACE]), 0.0f, 0.0f); -#endif -#endif break; // ? needed to match default: -#ifdef VERSION_EU - render_generic_char_at_pos(xCoord, yCoord, str[strPos]); - xCoord += gDialogCharWidths[str[strPos]]; - break; -#else render_generic_char(str[strPos]); if (mark != DIALOG_MARK_NONE) { create_dl_translation_matrix(MENU_MTX_PUSH, 5.0f, 5.0f, 0.0f); @@ -499,37 +308,16 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { mark = DIALOG_MARK_NONE; } -#if defined(VERSION_JP) || defined(VERSION_SH) - create_dl_translation_matrix(MENU_MTX_NOPUSH, 10.0f, 0.0f, 0.0f); -#else create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32)(gDialogCharWidths[str[strPos]]), 0.0f, 0.0f); break; // what an odd difference. US added a useless break here. -#endif -#endif } strPos++; } -#ifndef VERSION_EU gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); -#endif } -#ifdef VERSION_EU -void print_hud_char_umlaut(s16 x, s16 y, u8 chr) { - void **fontLUT = segmented_to_virtual(main_hud_lut); - - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fontLUT[chr]); - gSPDisplayList(gDisplayListHead++, dl_rgba16_load_tex_block); - gSPTextureRectangle(gDisplayListHead++, x << 2, y << 2, (x + 16) << 2, (y + 16) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fontLUT[GLYPH_UMLAUT]); - gSPDisplayList(gDisplayListHead++, dl_rgba16_load_tex_block); - gSPTextureRectangle(gDisplayListHead++, x << 2, (y - 4) << 2, (x + 16) << 2, (y + 12) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); -} -#endif /** * Prints a hud string depending of the hud table list defined. @@ -546,39 +334,15 @@ void print_hud_lut_string(s8 hudLUT, s16 x, s16 y, const u8 *str) { if (hudLUT == HUD_LUT_JPMENU) { xStride = 16; } else { // HUD_LUT_GLOBAL -#ifdef VERSION_JP - xStride = 14; -#else xStride = 12; //? Shindou uses this. -#endif } while (str[strPos] != GLOBAR_CHAR_TERMINATOR) { -#ifndef VERSION_JP switch (str[strPos]) { -#ifdef VERSION_EU - case GLOBAL_CHAR_SPACE: - curX += xStride / 2; - break; - case HUD_CHAR_A_UMLAUT: - print_hud_char_umlaut(curX, curY, ASCII_TO_DIALOG('A')); - curX += xStride; - break; - case HUD_CHAR_O_UMLAUT: - print_hud_char_umlaut(curX, curY, ASCII_TO_DIALOG('O')); - curX += xStride; - break; - case HUD_CHAR_U_UMLAUT: - print_hud_char_umlaut(curX, curY, ASCII_TO_DIALOG('U')); - curX += xStride; - break; -#else case GLOBAL_CHAR_SPACE: curX += 8; break; -#endif default: -#endif gDPPipeSync(gDisplayListHead++); if (hudLUT == HUD_LUT_JPMENU) { @@ -594,28 +358,11 @@ void print_hud_lut_string(s8 hudLUT, s16 x, s16 y, const u8 *str) { (curY + 16) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); curX += xStride; -#ifndef VERSION_JP } -#endif strPos++; } } -#ifdef VERSION_EU -void print_menu_char_umlaut(s16 x, s16 y, u8 chr) { - void **fontLUT = segmented_to_virtual(menu_font_lut); - - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[chr]); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); - gSPTextureRectangle(gDisplayListHead++, x << 2, y << 2, (x + 8) << 2, (y + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[DIALOG_CHAR_UMLAUT]); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); - gSPTextureRectangle(gDisplayListHead++, x << 2, (y - 4) << 2, (x + 8) << 2, (y + 4) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); -} -#endif void print_menu_generic_string(s16 x, s16 y, const u8 *str) { UNUSED s8 mark = DIALOG_MARK_NONE; // unused in EU @@ -626,27 +373,12 @@ void print_menu_generic_string(s16 x, s16 y, const u8 *str) { while (str[strPos] != DIALOG_CHAR_TERMINATOR) { switch (str[strPos]) { -#ifdef VERSION_EU - case DIALOG_CHAR_UPPER_A_UMLAUT: - print_menu_char_umlaut(curX, curY, ASCII_TO_DIALOG('A')); - curX += gDialogCharWidths[str[strPos]]; - break; - case DIALOG_CHAR_UPPER_U_UMLAUT: - print_menu_char_umlaut(curX, curY, ASCII_TO_DIALOG('U')); - curX += gDialogCharWidths[str[strPos]]; - break; - case DIALOG_CHAR_UPPER_O_UMLAUT: - print_menu_char_umlaut(curX, curY, ASCII_TO_DIALOG('O')); - curX += gDialogCharWidths[str[strPos]]; - break; -#else case DIALOG_CHAR_DAKUTEN: mark = DIALOG_MARK_DAKUTEN; break; case DIALOG_CHAR_PERIOD_OR_HANDAKUTEN: mark = DIALOG_MARK_HANDAKUTEN; break; -#endif case DIALOG_CHAR_SPACE: curX += 4; break; @@ -657,7 +389,6 @@ void print_menu_generic_string(s16 x, s16 y, const u8 *str) { gSPTextureRectangle(gDisplayListHead++, curX << 2, curY << 2, (curX + 8) << 2, (curY + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); -#ifndef VERSION_EU if (mark != DIALOG_MARK_NONE) { gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[mark + 0xEF]); gDPLoadSync(gDisplayListHead++); @@ -667,12 +398,7 @@ void print_menu_generic_string(s16 x, s16 y, const u8 *str) { mark = DIALOG_MARK_NONE; } -#endif -#if defined(VERSION_JP) || defined(VERSION_SH) - curX += 9; -#else curX += gDialogCharWidths[str[strPos]]; -#endif } strPos++; } @@ -765,7 +491,6 @@ void handle_menu_scrolling(s8 scrollDirection, s8 *currentIndex, s8 minIndex, s8 // EU has both get_str_x_pos_from_center and get_str_x_pos_from_center_scale // US and JP only implement one or the other -#if defined(VERSION_US) || defined(VERSION_EU) s16 get_str_x_pos_from_center(s16 centerPos, u8 *str, UNUSED f32 scale) { s16 strPos = 0; f32 spacesWidth = 0.0f; @@ -778,31 +503,8 @@ s16 get_str_x_pos_from_center(s16 centerPos, u8 *str, UNUSED f32 scale) { // length from the position of the provided center. return (s16)(centerPos - (s16)(spacesWidth / 2.0)); } -#endif -#if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH) -s16 get_str_x_pos_from_center_scale(s16 centerPos, u8 *str, f32 scale) { - s16 strPos = 0; - f32 charsWidth = 0.0f; - f32 spacesWidth = 0.0f; - while (str[strPos] != DIALOG_CHAR_TERMINATOR) { - //! EU checks for dakuten and handakuten despite dialog code unable to handle it - if (str[strPos] == DIALOG_CHAR_SPACE) { - spacesWidth += 1.0; - } else if (str[strPos] != DIALOG_CHAR_DAKUTEN - && str[strPos] != DIALOG_CHAR_PERIOD_OR_HANDAKUTEN) { - charsWidth += 1.0; - } - strPos++; - } - // return the x position of where the string starts as half the string's - // length from the position of the provided center. - return (f32) centerPos - (scale * (charsWidth / 2.0)) - ((scale / 2.0) * (spacesWidth / 2.0)); -} -#endif - -#if !defined(VERSION_JP) && !defined(VERSION_SH) s16 get_string_width(u8 *str) { s16 strPos = 0; s16 width = 0; @@ -813,7 +515,6 @@ s16 get_string_width(u8 *str) { } return width; } -#endif u8 gHudSymCoin[] = { GLYPH_COIN, GLYPH_SPACE }; u8 gHudSymX[] = { GLYPH_MULTIPLY, GLYPH_SPACE }; @@ -932,15 +633,9 @@ void reset_dialog_render_state(void) { gDialogResponse = 0; } -#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 void render_dialog_box_type(struct DialogEntry *dialog, s8 linesPerBox) { UNUSED s32 unused; @@ -998,102 +693,31 @@ void change_and_flash_dialog_text_color_lines(s8 colorMode, s8 lineNum) { } } -#ifdef VERSION_EU -void render_generic_dialog_char_at_pos(struct DialogEntry *dialog, s16 x, s16 y, u8 c) { - s16 width; - s16 height; - s16 tmpX; - s16 tmpY; - s16 xCoord; - s16 yCoord; - void **fontLUT; - void *packedTexture; - void *unpackedTexture; - width = (8.0 - (gDialogBoxScale * 0.8)); - height = (16.0 - (gDialogBoxScale * 0.8)); - tmpX = (dialog->leftOffset + (65.0 - (65.0 / gDialogBoxScale))); - tmpY = ((240 - dialog->width) - ((40.0 / gDialogBoxScale) - 40)); - xCoord = (tmpX + (x / gDialogBoxScale)); - yCoord = (tmpY + (y / gDialogBoxScale)); - - fontLUT = segmented_to_virtual(main_font_lut); - packedTexture = segmented_to_virtual(fontLUT[c]); - unpackedTexture = alloc_ia4_tex_from_i1(packedTexture, 8, 8); - - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_tex_settings); - gSPTextureRectangleFlip(gDisplayListHead++, xCoord << 2, (yCoord - height) << 2, - (xCoord + width) << 2, yCoord << 2, G_TX_RENDERTILE, 8 << 6, 4 << 6, 1 << 10, 1 << 10); -} -#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 -#ifdef VERSION_EU -void handle_dialog_scroll_page_state(s8 lineNum, s8 totalLines, s8 *pageState, s8 *xMatrix) -#else void handle_dialog_scroll_page_state(s8 lineNum, s8 totalLines, s8 *pageState, s8 *xMatrix, s16 *linePos) -#endif { -#ifndef VERSION_EU gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); -#endif if (lineNum == totalLines) { pageState[0] = DIALOG_PAGE_STATE_SCROLL; return; } -#ifdef VERSION_EU - gDialogY += 16; -#else create_dl_translation_matrix(MENU_MTX_PUSH, X_VAL3, 2 - (lineNum * Y_VAL3), 0); linePos[0] = 0; -#endif xMatrix[0] = 1; } -#if defined(VERSION_JP) || defined(VERSION_SH) -void adjust_pos_and_print_period_char(s8 *xMatrix, s16 *linePos) { - if (linePos[0] != 0) { - create_dl_translation_matrix(MENU_MTX_NOPUSH, xMatrix[0] * 10, 0, 0); - } - create_dl_translation_matrix(MENU_MTX_PUSH, -2.0f, -5.0f, 0); - render_generic_char(DIALOG_CHAR_PERIOD_OR_HANDAKUTEN); - - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); - - linePos[0]++; - xMatrix[0] = 1; -} -#endif - -#ifdef VERSION_EU -void render_star_count_dialog_text(struct DialogEntry *dialog, s8 *linePos) -#else void render_star_count_dialog_text(s8 *xMatrix, s16 *linePos) -#endif { s8 tensDigit = gDialogVariable / 10; s8 onesDigit = gDialogVariable - (tensDigit * 10); // remainder if (tensDigit != 0) { -#if defined(VERSION_JP) || defined(VERSION_SH) - create_dl_translation_matrix(MENU_MTX_NOPUSH, xMatrix[0] * 10, 0, 0); - render_generic_char(tensDigit); -#elif defined(VERSION_EU) - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY, tensDigit); - gDialogX += gDialogCharWidths[tensDigit]; - linePos[0] = 1; -#else if (xMatrix[0] != 1) { create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32)(gDialogCharWidths[DIALOG_CHAR_SPACE] * xMatrix[0]), 0, 0); } @@ -1102,45 +726,23 @@ void render_star_count_dialog_text(s8 *xMatrix, s16 *linePos) create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32) gDialogCharWidths[tensDigit], 0, 0); xMatrix[0] = 1; linePos[0]++; -#endif } -#ifndef VERSION_EU else { -#if defined(VERSION_JP) || defined(VERSION_SH) - xMatrix[0]++; -#endif } -#endif -#ifdef VERSION_EU - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY, onesDigit); - gDialogX += gDialogCharWidths[onesDigit]; - linePos[0] = 1; -#else -#if defined(VERSION_JP) || defined(VERSION_SH) - create_dl_translation_matrix(MENU_MTX_NOPUSH, xMatrix[0] * 10, 0, 0); - render_generic_char(onesDigit); -#else if (xMatrix[0] != 1) { create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32)(gDialogCharWidths[DIALOG_CHAR_SPACE] * (xMatrix[0] - 1)), 0, 0); } render_generic_char(onesDigit); create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32) gDialogCharWidths[onesDigit], 0, 0); -#endif linePos[0]++; xMatrix[0] = 1; -#endif } -#if !defined(VERSION_JP) && !defined(VERSION_SH) -#ifdef VERSION_EU -void render_multi_text_string_lines(s8 multiTextId, s8 lineNum, s8 linesPerBox, UNUSED s16 linePos, s8 lowerBound, struct DialogEntry *dialog) -#else void render_multi_text_string_lines(s8 multiTextId, s8 lineNum, s16 *linePos, s8 linesPerBox, s8 xMatrix, s8 lowerBound) -#endif { s8 i; struct MultiTextEntry textLengths[2] = { @@ -1149,40 +751,17 @@ void render_multi_text_string_lines(s8 multiTextId, s8 lineNum, s16 *linePos, s8 }; if (lineNum >= lowerBound && lineNum <= (lowerBound + linesPerBox)) { -#ifdef VERSION_US if (linePos[0] != 0 || (xMatrix != 1)) { create_dl_translation_matrix(MENU_MTX_NOPUSH, (gDialogCharWidths[DIALOG_CHAR_SPACE] * (xMatrix - 1)), 0, 0); } -#endif for (i = 0; i < textLengths[multiTextId].length; i++) { -#ifdef VERSION_EU - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY, textLengths[multiTextId].str[i]); - gDialogX += gDialogCharWidths[textLengths[multiTextId].str[i]]; -#else render_generic_char(textLengths[multiTextId].str[i]); create_dl_translation_matrix(MENU_MTX_NOPUSH, (gDialogCharWidths[textLengths[multiTextId].str[i]]), 0, 0); -#endif } } -#ifdef VERSION_US linePos += textLengths[multiTextId].length; -#endif -} -#endif - -#ifdef VERSION_EU -void render_dialog_lowercase_diacritic(struct DialogEntry *dialog, u8 chr, u8 diacritic) { - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY, chr); - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY, diacritic + 0xE7); - gDialogX += gDialogCharWidths[chr]; } -void render_dialog_uppercase_diacritic(struct DialogEntry *dialog, u8 chr, u8 diacritic) { - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY, chr); - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY - 4, diacritic + 0xE3); - gDialogX += gDialogCharWidths[chr]; -} -#endif u32 ensure_nonnegative(s16 value) { if (value < 0) { @@ -1192,16 +771,9 @@ u32 ensure_nonnegative(s16 value) { return value; } -#if defined(VERSION_JP) -void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog) -#else void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 lowerBound) -#endif { UNUSED s32 pad[2]; -#ifdef VERSION_EU - s16 startY = 14; -#endif u8 strChar; @@ -1217,9 +789,7 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l s8 linesPerBox = dialog->linesPerBox; s16 strIdx; -#ifndef VERSION_EU s16 linePos = 0; -#endif if (gDialogBoxState == DIALOG_STATE_HORIZONTAL) { // If scrolling, consider the number of lines for both @@ -1231,22 +801,12 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); strIdx = gDialogTextPos; -#ifdef VERSION_EU - gDialogX = 0; - gDialogY = startY; -#endif if (gDialogBoxState == DIALOG_STATE_HORIZONTAL) { -#ifdef VERSION_EU - gDialogY -= gDialogScrollOffsetY; -#else create_dl_translation_matrix(MENU_MTX_NOPUSH, 0, (f32) gDialogScrollOffsetY, 0); -#endif } -#ifndef VERSION_EU create_dl_translation_matrix(MENU_MTX_PUSH, X_VAL3, 2 - lineNum * Y_VAL3, 0); -#endif while (pageState == DIALOG_PAGE_STATE_NONE) { change_and_flash_dialog_text_color_lines(colorMode, lineNum); @@ -1255,156 +815,39 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l switch (strChar) { case DIALOG_CHAR_TERMINATOR: pageState = DIALOG_PAGE_STATE_END; -#ifndef VERSION_EU gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); -#endif break; case DIALOG_CHAR_NEWLINE: lineNum++; -#ifdef VERSION_EU - handle_dialog_scroll_page_state(lineNum, totalLines, &pageState, &xMatrix); - gDialogX = 0; -#else handle_dialog_scroll_page_state(lineNum, totalLines, &pageState, &xMatrix, &linePos); -#ifdef VERSION_SH - mark = 0; -#endif -#endif break; -#ifdef VERSION_EU - case DIALOG_CHAR_LOWER_A_GRAVE: - case DIALOG_CHAR_LOWER_A_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_A_UMLAUT: - render_dialog_lowercase_diacritic(dialog, ASCII_TO_DIALOG('a'), strChar & 0xF); - break; - case DIALOG_CHAR_UPPER_A_GRAVE: - case DIALOG_CHAR_UPPER_A_CIRCUMFLEX: - case DIALOG_CHAR_UPPER_A_UMLAUT: - render_dialog_uppercase_diacritic(dialog, ASCII_TO_DIALOG('A'), strChar & 0xF); - break; - case DIALOG_CHAR_LOWER_E_GRAVE: - case DIALOG_CHAR_LOWER_E_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_E_UMLAUT: - case DIALOG_CHAR_LOWER_E_ACUTE: - render_dialog_lowercase_diacritic(dialog, ASCII_TO_DIALOG('e'), strChar & 0xF); - break; - case DIALOG_CHAR_UPPER_E_GRAVE: - case DIALOG_CHAR_UPPER_E_CIRCUMFLEX: - case DIALOG_CHAR_UPPER_E_UMLAUT: - case DIALOG_CHAR_UPPER_E_ACUTE: - render_dialog_uppercase_diacritic(dialog, ASCII_TO_DIALOG('E'), strChar & 0xF); - break; - case DIALOG_CHAR_LOWER_U_GRAVE: - case DIALOG_CHAR_LOWER_U_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_U_UMLAUT: - render_dialog_lowercase_diacritic(dialog, ASCII_TO_DIALOG('u'), strChar & 0xF); - break; - case DIALOG_CHAR_UPPER_U_GRAVE: - case DIALOG_CHAR_UPPER_U_CIRCUMFLEX: - case DIALOG_CHAR_UPPER_U_UMLAUT: - render_dialog_uppercase_diacritic(dialog, ASCII_TO_DIALOG('U'), strChar & 0xF); - break; - case DIALOG_CHAR_LOWER_O_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_O_UMLAUT: - render_dialog_lowercase_diacritic(dialog, ASCII_TO_DIALOG('o'), strChar & 0xF); - break; - case DIALOG_CHAR_UPPER_O_CIRCUMFLEX: - case DIALOG_CHAR_UPPER_O_UMLAUT: - render_dialog_uppercase_diacritic(dialog, ASCII_TO_DIALOG('O'), strChar & 0xF); - break; - case DIALOG_CHAR_LOWER_I_CIRCUMFLEX: - case DIALOG_CHAR_LOWER_I_UMLAUT: - render_dialog_lowercase_diacritic(dialog, DIALOG_CHAR_I_NO_DIA, strChar & 0xF); - break; -#else case DIALOG_CHAR_DAKUTEN: mark = DIALOG_MARK_DAKUTEN; break; case DIALOG_CHAR_PERIOD_OR_HANDAKUTEN: mark = DIALOG_MARK_HANDAKUTEN; break; -#endif case DIALOG_CHAR_SPACE: -#ifdef VERSION_EU - gDialogX += gDialogCharWidths[DIALOG_CHAR_SPACE]; -#else -#if defined(VERSION_JP) || defined(VERSION_SH) - if (linePos != 0) { -#endif xMatrix++; -#if defined(VERSION_JP) || defined(VERSION_SH) - } -#endif linePos++; -#endif break; -#if defined(VERSION_JP) || defined(VERSION_SH) - case DIALOG_CHAR_PERIOD: - adjust_pos_and_print_period_char(&xMatrix, &linePos); - break; -#else case DIALOG_CHAR_SLASH: -#ifdef VERSION_EU - gDialogX += gDialogCharWidths[DIALOG_CHAR_SPACE] * 2; -#else xMatrix += 2; linePos += 2; -#endif break; case DIALOG_CHAR_MULTI_THE: -#ifdef VERSION_EU - render_multi_text_string_lines(STRING_THE, lineNum, linesPerBox, xMatrix, lowerBound, dialog); -#else render_multi_text_string_lines(STRING_THE, lineNum, &linePos, linesPerBox, xMatrix, lowerBound); -#endif xMatrix = 1; break; case DIALOG_CHAR_MULTI_YOU: -#ifdef VERSION_EU - render_multi_text_string_lines(STRING_YOU, lineNum, linesPerBox, xMatrix, lowerBound, dialog); -#else render_multi_text_string_lines(STRING_YOU, lineNum, &linePos, linesPerBox, xMatrix, lowerBound); -#endif xMatrix = 1; break; -#endif case DIALOG_CHAR_STAR_COUNT: -#ifdef VERSION_EU - render_star_count_dialog_text(dialog, &xMatrix); -#else render_star_count_dialog_text(&xMatrix, &linePos); -#endif break; -#ifdef VERSION_EU - case DIALOG_CHAR_DOUBLE_LOW_QUOTE: - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY + 8, 0xF6); - gDialogX += gDialogCharWidths[0xF6]; - break; -#endif default: // any other character -#if defined(VERSION_JP) || defined(VERSION_SH) -#ifdef VERSION_SH - if (lineNum >= lowerBound && lineNum <= lowerBound + linesPerBox) { -#endif - if (linePos != 0) { - create_dl_translation_matrix(MENU_MTX_NOPUSH, xMatrix * 10, 0, 0); - } - - render_generic_char(strChar); - xMatrix = 1; - linePos++; - - if (mark != 0) { - create_dl_translation_matrix(MENU_MTX_PUSH, 5.0f, 7.0f, 0); - render_generic_char(mark + 0xEF); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); - mark = 0; - } -#ifdef VERSION_SH - } -#endif -#elif defined(VERSION_US) if (lineNum >= lowerBound && lineNum <= lowerBound + linesPerBox) { if (linePos || xMatrix != 1) { create_dl_translation_matrix( @@ -1416,41 +859,8 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l xMatrix = 1; linePos++; } -#else // VERSION_EU - if (lineNum >= lowerBound && lineNum <= lowerBound + linesPerBox) { - render_generic_dialog_char_at_pos(dialog, gDialogX, gDialogY, strChar); - } - gDialogX += gDialogCharWidths[strChar]; -#endif } -#if defined(VERSION_JP) - if (linePos == 12) { - if (str[strIdx + 1] == DIALOG_CHAR_PERIOD) { - adjust_pos_and_print_period_char(&xMatrix, &linePos); - strIdx++; - } - - if (str[strIdx + 1] == DIALOG_CHAR_COMMA) { - create_dl_translation_matrix(MENU_MTX_NOPUSH, xMatrix * 10, 0, 0); - render_generic_char(DIALOG_CHAR_COMMA); - strIdx++; - } - - if (str[strIdx + 1] == DIALOG_CHAR_NEWLINE) { - strIdx++; - } - - if (str[strIdx + 1] == DIALOG_CHAR_TERMINATOR) { - pageState = DIALOG_PAGE_STATE_END; - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); - break; // exit loop - } else { - lineNum++; - handle_dialog_scroll_page_state(lineNum, totalLines, &pageState, &xMatrix, &linePos); - } - } -#endif strIdx++; } @@ -1467,17 +877,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 void render_dialog_triangle_choice(void) { if (gDialogBoxState == DIALOG_STATE_VERTICAL) { @@ -1495,22 +898,10 @@ void render_dialog_triangle_choice(void) { gSPDisplayList(gDisplayListHead++, dl_draw_triangle); } -#ifdef VERSION_EU -#define X_VAL5 122.0f -#define Y_VAL5_1 -16 -#define Y_VAL5_2 3 -#define X_Y_VAL6 0.5f -#elif defined(VERSION_US) #define X_VAL5 118.0f #define Y_VAL5_1 -16 #define Y_VAL5_2 5 #define X_Y_VAL6 0.8f -#elif 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 -#endif void render_dialog_string_color(s8 linesPerBox) { s32 timer = gGlobalTimer; @@ -1610,53 +1001,6 @@ u8 *gEndCutsceneStringsEn[] = { NULL }; -#ifdef VERSION_EU -u8 gEndCutsceneStrFr0[] = { TEXT_FILE_MARIO_EXCLAMATION }; -u8 gEndCutsceneStrFr1[] = { TEXT_POWER_STARS_RESTORED_FR }; -u8 gEndCutsceneStrFr2[] = { TEXT_THANKS_TO_YOU_FR }; -u8 gEndCutsceneStrFr3[] = { TEXT_THANK_YOU_MARIO_FR }; -u8 gEndCutsceneStrFr4[] = { TEXT_SOMETHING_SPECIAL_FR }; -u8 gEndCutsceneStrFr5[] = { TEXT_COME_ON_EVERYBODY_FR }; -u8 gEndCutsceneStrFr6[] = { TEXT_LETS_HAVE_CAKE_FR }; -u8 gEndCutsceneStrFr7[] = { TEXT_FOR_MARIO_FR }; -u8 gEndCutsceneStrFr8[] = { TEXT_FILE_MARIO_QUESTION }; - -u8 *gEndCutsceneStringsFr[] = { - gEndCutsceneStrFr0, - gEndCutsceneStrFr1, - gEndCutsceneStrFr2, - gEndCutsceneStrFr3, - gEndCutsceneStrFr4, - gEndCutsceneStrFr5, - gEndCutsceneStrFr6, - gEndCutsceneStrFr7, - gEndCutsceneStrFr8, - NULL -}; - -u8 gEndCutsceneStrDe0[] = { TEXT_FILE_MARIO_EXCLAMATION }; -u8 gEndCutsceneStrDe1[] = { TEXT_POWER_STARS_RESTORED_DE }; -u8 gEndCutsceneStrDe2[] = { TEXT_THANKS_TO_YOU_DE }; -u8 gEndCutsceneStrDe3[] = { TEXT_THANK_YOU_MARIO_DE }; -u8 gEndCutsceneStrDe4[] = { TEXT_SOMETHING_SPECIAL_DE }; -u8 gEndCutsceneStrDe5[] = { TEXT_COME_ON_EVERYBODY_DE }; -u8 gEndCutsceneStrDe6[] = { TEXT_LETS_HAVE_CAKE_DE }; -u8 gEndCutsceneStrDe7[] = { TEXT_FOR_MARIO_DE }; -u8 gEndCutsceneStrDe8[] = { TEXT_FILE_MARIO_QUESTION }; - -u8 *gEndCutsceneStringsDe[] = { - gEndCutsceneStrDe0, - gEndCutsceneStrDe1, - gEndCutsceneStrDe2, - gEndCutsceneStrDe3, - gEndCutsceneStrDe4, - gEndCutsceneStrDe5, - gEndCutsceneStrDe6, - gEndCutsceneStrDe7, - gEndCutsceneStrDe8, - NULL -}; -#endif u16 gCutsceneMsgFade = 0; s16 gCutsceneMsgIndex = -1; @@ -1665,46 +1009,16 @@ s16 gCutsceneMsgTimer = 0; s8 gDialogCameraAngleIndex = CAM_SELECTION_MARIO; s8 gDialogCourseActNum = 1; -#if defined(VERSION_JP) || defined(VERSION_SH) -#define DIAG_VAL1 20 -#define DIAG_VAL3 130 -#define DIAG_VAL4 4 -#else #define DIAG_VAL1 16 #define DIAG_VAL3 132 // US & EU #define DIAG_VAL4 5 -#endif -#ifdef VERSION_EU -#define DIAG_VAL2 238 -#else #define DIAG_VAL2 240 // JP & US -#endif void render_dialog_entries(void) { -#ifdef VERSION_EU - s8 lowerBound; -#endif void **dialogTable; struct DialogEntry *dialog; -#if defined(VERSION_US) || defined(VERSION_SH) s8 lowerBound; -#endif -#ifdef VERSION_EU - gInGameLanguage = eu_get_language(); - switch (gInGameLanguage) { - case LANGUAGE_ENGLISH: - dialogTable = segmented_to_virtual(dialog_table_eu_en); - break; - case LANGUAGE_FRENCH: - dialogTable = segmented_to_virtual(dialog_table_eu_fr); - break; - case LANGUAGE_GERMAN: - dialogTable = segmented_to_virtual(dialog_table_eu_de); - break; - } -#else dialogTable = segmented_to_virtual(seg2_dialog_table); -#endif dialog = segmented_to_virtual(dialogTable[gDialogID]); // if the dialog entry is invalid, set the ID to -1. @@ -1713,10 +1027,6 @@ void render_dialog_entries(void) { return; } -#ifdef VERSION_EU - gDialogX = 0; - gDialogY = 0; -#endif switch (gDialogBoxState) { case DIALOG_STATE_OPENING: @@ -1737,9 +1047,7 @@ void render_dialog_entries(void) { gDialogBoxState = DIALOG_STATE_VERTICAL; gDialogLineNum = 1; } -#if !defined(VERSION_JP) lowerBound = 1; -#endif break; case DIALOG_STATE_VERTICAL: gDialogBoxOpenTimer = 0.0f; @@ -1754,9 +1062,7 @@ void render_dialog_entries(void) { play_sound(SOUND_MENU_MESSAGE_NEXT_PAGE, gGlobalSoundSource); } } -#if !defined(VERSION_JP) lowerBound = 1; -#endif break; case DIALOG_STATE_HORIZONTAL: gDialogScrollOffsetY += dialog->linesPerBox * 2; @@ -1766,9 +1072,7 @@ void render_dialog_entries(void) { gDialogBoxState = DIALOG_STATE_VERTICAL; gDialogScrollOffsetY = 0; } -#if !defined(VERSION_JP) lowerBound = (gDialogScrollOffsetY / DIAG_VAL1) + 1; -#endif break; case DIALOG_STATE_CLOSING: if (gDialogBoxOpenTimer == 20.0f) { @@ -1793,9 +1097,7 @@ void render_dialog_entries(void) { gLastDialogPageStrPos = 0; gDialogResponse = 0; } -#if !defined(VERSION_JP) lowerBound = 1; -#endif break; } @@ -1809,39 +1111,18 @@ void render_dialog_entries(void) { ensure_nonnegative(dialog->leftOffset), #endif ensure_nonnegative(DIAG_VAL2 - dialog->width), -#ifdef VERSION_EU -#ifdef WIDESCREEN - SCREEN_WIDTH, -#else - ensure_nonnegative(dialog->leftOffset + DIAG_VAL3 / gDialogBoxScale), -#endif - ensure_nonnegative((240 - dialog->width) + ((dialog->linesPerBox * 80) / DIAG_VAL4) / gDialogBoxScale)); -#else #ifdef WIDESCREEN SCREEN_WIDTH, #else ensure_nonnegative(DIAG_VAL3 + dialog->leftOffset), #endif ensure_nonnegative(240 + ((dialog->linesPerBox * 80) / DIAG_VAL4) - dialog->width)); -#endif -#if defined(VERSION_JP) - handle_dialog_text_and_pages(0, dialog); -#else handle_dialog_text_and_pages(0, dialog, lowerBound); -#endif if (gLastDialogPageStrPos == -1 && gLastDialogResponse == 1) { render_dialog_triangle_choice(); } - #ifdef VERSION_EU - #undef BORDER_HEIGHT - #define BORDER_HEIGHT 8 - #endif gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 2, 2, SCREEN_WIDTH - BORDER_HEIGHT/2, SCREEN_HEIGHT - BORDER_HEIGHT/2); - #ifdef VERSION_EU - #undef BORDER_HEIGHT - #define BORDER_HEIGHT 1 - #endif if (gLastDialogPageStrPos != -1 && gDialogBoxState == DIALOG_STATE_VERTICAL) { render_dialog_string_color(dialog->linesPerBox); } @@ -1941,26 +1222,9 @@ void do_cutscene_handler(void) { gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gCutsceneMsgFade); -#ifdef VERSION_EU - switch (eu_get_language()) { - case LANGUAGE_ENGLISH: - x = get_str_x_pos_from_center(gCutsceneMsgXOffset, gEndCutsceneStringsEn[gCutsceneMsgIndex], 10.0f); - print_generic_string(x, 240 - gCutsceneMsgYOffset, gEndCutsceneStringsEn[gCutsceneMsgIndex]); - break; - case LANGUAGE_FRENCH: - x = get_str_x_pos_from_center(gCutsceneMsgXOffset, gEndCutsceneStringsFr[gCutsceneMsgIndex], 10.0f); - print_generic_string(x, 240 - gCutsceneMsgYOffset, gEndCutsceneStringsFr[gCutsceneMsgIndex]); - break; - case LANGUAGE_GERMAN: - x = get_str_x_pos_from_center(gCutsceneMsgXOffset, gEndCutsceneStringsDe[gCutsceneMsgIndex], 10.0f); - print_generic_string(x, 240 - gCutsceneMsgYOffset, gEndCutsceneStringsDe[gCutsceneMsgIndex]); - break; - } -#else // get the x coordinate of where the cutscene string starts. x = get_str_x_pos_from_center(gCutsceneMsgXOffset, gEndCutsceneStringsEn[gCutsceneMsgIndex], 10.0f); print_generic_string(x, 240 - gCutsceneMsgYOffset, gEndCutsceneStringsEn[gCutsceneMsgIndex]); -#endif gSPDisplayList(gDisplayListHead++, dl_ia_text_end); @@ -1992,41 +1256,17 @@ void do_cutscene_handler(void) { gCutsceneMsgTimer++; } -#ifdef VERSION_JP -#define PEACH_MESSAGE_TIMER 170 -#else #define PEACH_MESSAGE_TIMER 250 -#endif -#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 // "Dear Mario" message handler void print_peach_letter_message(void) { void **dialogTable; struct DialogEntry *dialog; u8 *str; -#ifdef VERSION_EU - gInGameLanguage = eu_get_language(); - switch (gInGameLanguage) { - case LANGUAGE_ENGLISH: - dialogTable = segmented_to_virtual(dialog_table_eu_en); - break; - case LANGUAGE_FRENCH: - dialogTable = segmented_to_virtual(dialog_table_eu_fr); - break; - case LANGUAGE_GERMAN: - dialogTable = segmented_to_virtual(dialog_table_eu_de); - break; - } -#else dialogTable = segmented_to_virtual(seg2_dialog_table); -#endif dialog = segmented_to_virtual(dialogTable[gDialogID]); str = segmented_to_virtual(dialog->str); @@ -2040,15 +1280,10 @@ void print_peach_letter_message(void) { gDPSetEnvColor(gDisplayListHead++, 20, 20, 20, gCutsceneMsgFade); print_generic_string(STR_X, STR_Y, str); -#if defined(VERSION_JP) - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); -#endif gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); -#ifndef VERSION_JP gSPDisplayList(gDisplayListHead++, dl_ia_text_end); gDPSetEnvColor(gDisplayListHead++, 200, 80, 120, gCutsceneMsgFade); gSPDisplayList(gDisplayListHead++, castle_grounds_seg7_us_dl_0700F2E8); -#endif // at the start/end of message, reset the fade. if (gCutsceneMsgTimer == 0) { @@ -2171,43 +1406,16 @@ void render_pause_red_coins(void) { } } -#ifdef VERSION_EU -u8 gTextCourseArr[][7] = { - { TEXT_COURSE }, - { TEXT_COURSE_FR }, - { TEXT_COURSE_DE } -}; -#endif -#if defined(VERSION_JP) || defined(VERSION_SH) -#define CRS_NUM_X1 93 -#else #define CRS_NUM_X1 100 -#endif -#ifdef VERSION_EU -#define TXT_STAR_X 89 -#define ACT_NAME_X 107 -#define LVL_NAME_X 108 -#define MYSCORE_X 48 -#else #define TXT_STAR_X 98 #define ACT_NAME_X 116 #define LVL_NAME_X 117 #define MYSCORE_X 62 -#endif void render_pause_my_score_coins(void) { -#ifdef VERSION_EU - u8 textMyScore[][10] = { - { TEXT_MY_SCORE }, - { TEXT_MY_SCORE_FR }, - { TEXT_MY_SCORE_DE } - }; -#define textMyScore textMyScore[gInGameLanguage] -#else u8 textCourse[] = { TEXT_COURSE }; u8 textMyScore[] = { TEXT_MY_SCORE }; -#endif u8 textStar[] = { TEXT_STAR }; u8 textUnfilledStar[] = { TEXT_UNFILLED_STAR }; @@ -2219,30 +1427,12 @@ void render_pause_my_score_coins(void) { u8 courseIndex; u8 starFlags; -#ifndef VERSION_EU courseNameTbl = segmented_to_virtual(seg2_course_name_table); actNameTbl = segmented_to_virtual(seg2_act_name_table); -#endif courseIndex = gCurrCourseNum - 1; starFlags = save_file_get_star_flags(gCurrSaveFileNum - 1, gCurrCourseNum - 1); -#ifdef VERSION_EU - switch (gInGameLanguage) { - case LANGUAGE_ENGLISH: - actNameTbl = segmented_to_virtual(act_name_table_eu_en); - courseNameTbl = segmented_to_virtual(course_name_table_eu_en); - break; - case LANGUAGE_FRENCH: - actNameTbl = segmented_to_virtual(act_name_table_eu_fr); - courseNameTbl = segmented_to_virtual(course_name_table_eu_fr); - break; - case LANGUAGE_GERMAN: - actNameTbl = segmented_to_virtual(act_name_table_eu_de); - courseNameTbl = segmented_to_virtual(course_name_table_eu_de); - break; - } -#endif gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); @@ -2264,15 +1454,8 @@ void render_pause_my_score_coins(void) { courseName = segmented_to_virtual(courseNameTbl[courseIndex]); if (courseIndex < COURSE_STAGES_COUNT) { -#ifdef VERSION_EU - print_generic_string(48, 157, gTextCourseArr[gInGameLanguage]); -#else print_generic_string(63, 157, textCourse); -#endif int_to_str(gCurrCourseNum, strCourseNum); -#ifdef VERSION_EU - print_generic_string(get_string_width(gTextCourseArr[gInGameLanguage]) + 51, 157, strCourseNum); -#else print_generic_string(CRS_NUM_X1, 157, strCourseNum); #ifdef WIDE if (!gWidescreen) { @@ -2285,7 +1468,6 @@ void render_pause_my_score_coins(void) { print_generic_string(10, 220, textWideInfo); print_generic_string(10, 200, textWideInfo2); } -#endif #endif actName = segmented_to_virtual(actNameTbl[(gCurrCourseNum - 1) * 6 + gDialogCourseActNum - 1]); @@ -2296,54 +1478,23 @@ void render_pause_my_score_coins(void) { print_generic_string(TXT_STAR_X, 140, textUnfilledStar); } print_generic_string(ACT_NAME_X, 140, actName); -#ifndef VERSION_JP print_generic_string(LVL_NAME_X, 157, &courseName[3]); -#endif } -#ifndef VERSION_JP else { -#if defined(VERSION_US) || defined(VERSION_SH) print_generic_string(94, 157, &courseName[3]); -#elif defined(VERSION_EU) - print_generic_string(get_str_x_pos_from_center(159, &courseName[3], 10.0f), 157, &courseName[3]); -#endif } -#else - print_generic_string(117, 157, &courseName[3]); -#endif 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 void render_pause_camera_options(s16 x, s16 y, s8 *index, s16 xIndex) { u8 textLakituMario[] = { TEXT_LAKITU_MARIO }; u8 textLakituStop[] = { TEXT_LAKITU_STOP }; -#ifdef VERSION_EU - u8 textNormalUpClose[][20] = { - { TEXT_NORMAL_UPCLOSE }, - { TEXT_NORMAL_UPCLOSE_FR }, - { TEXT_NORMAL_UPCLOSE_DE } - }; - u8 textNormalFixed[][17] = { - { TEXT_NORMAL_FIXED }, - { TEXT_NORMAL_FIXED_FR }, - { TEXT_NORMAL_FIXED_DE }, - }; -#define textNormalUpClose textNormalUpClose[gInGameLanguage] -#define textNormalFixed textNormalFixed[gInGameLanguage] -#else u8 textNormalUpClose[] = { TEXT_NORMAL_UPCLOSE }; u8 textNormalFixed[] = { TEXT_NORMAL_FIXED }; -#endif handle_menu_scrolling(MENU_SCROLL_HORIZONTAL, index, 1, 2); @@ -2371,39 +1522,13 @@ 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 void render_pause_course_options(s16 x, s16 y, s8 *index, s16 yIndex) { -#ifdef VERSION_EU - u8 textContinue[][10] = { - { TEXT_CONTINUE }, - { TEXT_CONTINUE_FR }, - { TEXT_CONTINUE_DE } - }; - u8 textExitCourse[][15] = { - { TEXT_EXIT_COURSE }, - { TEXT_EXIT_COURSE_FR }, - { TEXT_EXIT_COURSE_DE } - }; - u8 textCameraAngleR[][24] = { - { TEXT_CAMERA_ANGLE_R }, - { TEXT_CAMERA_ANGLE_R_FR }, - { TEXT_CAMERA_ANGLE_R_DE } - }; -#define textContinue textContinue[gInGameLanguage] -#define textExitCourse textExitCourse[gInGameLanguage] -#define textCameraAngleR textCameraAngleR[gInGameLanguage] -#else u8 textContinue[] = { TEXT_CONTINUE }; u8 textExitCourse[] = { TEXT_EXIT_COURSE }; u8 textCameraAngleR[] = { TEXT_CAMERA_ANGLE_R }; -#endif handle_menu_scrolling(MENU_SCROLL_VERTICAL, index, 1, 3); @@ -2470,12 +1595,7 @@ void print_hud_pause_colorful_str(void) { gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); -#ifdef VERSION_EU - print_hud_lut_string(HUD_LUT_GLOBAL, get_str_x_pos_from_center_scale( - SCREEN_WIDTH / 2, textPause, 12.0f), 81, textPause); -#else print_hud_lut_string(HUD_LUT_GLOBAL, 123, 81, textPause); -#endif gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); } @@ -2521,37 +1641,15 @@ void render_pause_castle_course_stars(s16 x, s16 y, s16 fileNum, s16 courseNum) } void render_pause_castle_main_strings(s16 x, s16 y) { -#ifdef VERSION_EU - void **courseNameTbl; -#else void **courseNameTbl = segmented_to_virtual(seg2_course_name_table); -#endif -#ifdef VERSION_EU - u8 textCoin[] = { TEXT_COIN }; - u8 textX[] = { TEXT_VARIABLE_X }; -#else u8 textCoin[] = { TEXT_COIN_X }; -#endif void *courseName; u8 strVal[8]; s16 starNum = gDialogLineNum; -#ifdef VERSION_EU - switch (gInGameLanguage) { - case LANGUAGE_ENGLISH: - courseNameTbl = segmented_to_virtual(course_name_table_eu_en); - break; - case LANGUAGE_FRENCH: - courseNameTbl = segmented_to_virtual(course_name_table_eu_fr); - break; - case LANGUAGE_GERMAN: - courseNameTbl = segmented_to_virtual(course_name_table_eu_de); - break; - } -#endif handle_menu_scrolling(MENU_SCROLL_VERTICAL, &gDialogLineNum, -1, COURSE_STAGES_COUNT + 1); @@ -2605,28 +1703,17 @@ void render_pause_castle_main_strings(s16 x, s16 y) { courseName = segmented_to_virtual(courseNameTbl[gDialogLineNum]); render_pause_castle_course_stars(x, y, gCurrSaveFileNum - 1, gDialogLineNum); print_generic_string(x + 34, y - 5, textCoin); -#ifdef VERSION_EU - print_generic_string(x + 44, y - 5, textX); -#endif int_to_str(save_file_get_course_coin_score(gCurrSaveFileNum - 1, gDialogLineNum), strVal); print_generic_string(x + 54, y - 5, strVal); -#ifdef VERSION_EU - print_generic_string(x - 17, y + 30, courseName); -#endif } else { u8 textStarX[] = { TEXT_STAR_X }; courseName = segmented_to_virtual(courseNameTbl[COURSE_MAX]); print_generic_string(x + 40, y + 13, textStarX); int_to_str(save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_BONUS_STAGES - 1, COURSE_MAX - 1), strVal); print_generic_string(x + 60, y + 13, strVal); -#ifdef VERSION_EU - print_generic_string(get_str_x_pos_from_center(x + 51, courseName, 10.0f), y + 30, courseName); -#endif } -#ifndef VERSION_EU print_generic_string(x - 9, y + 30, courseName); -#endif gSPDisplayList(gDisplayListHead++, dl_ia_text_end); } @@ -2639,20 +1726,13 @@ s8 gHudFlash = 0; s16 render_pause_courses_and_castle(void) { s16 num; -#ifdef VERSION_EU - gInGameLanguage = eu_get_language(); -#endif switch (gDialogBoxState) { case DIALOG_STATE_OPENING: gDialogLineNum = 1; gDialogTextAlpha = 0; level_set_transition(-1, NULL); -#ifdef VERSION_JP - play_sound(SOUND_MENU_PAUSE, gGlobalSoundSource); -#else play_sound(SOUND_MENU_PAUSE_HIGHPRIO, gGlobalSoundSource); -#endif if (gCurrCourseNum >= COURSE_MIN && gCurrCourseNum <= COURSE_MAX) { change_dialog_camera_angle(); @@ -2681,12 +1761,8 @@ s16 render_pause_courses_and_castle(void) { render_pause_course_options(99, 93, &gDialogLineNum, 15); } -#ifdef VERSION_EU - if (gPlayer3Controller->buttonPressed & (A_BUTTON | Z_TRIG | START_BUTTON)) -#else if (gPlayer3Controller->buttonPressed & A_BUTTON || gPlayer3Controller->buttonPressed & START_BUTTON) -#endif { level_set_transition(0, NULL); play_sound(SOUND_MENU_PAUSE_2, gGlobalSoundSource); @@ -2708,12 +1784,8 @@ s16 render_pause_courses_and_castle(void) { render_pause_castle_menu_box(160, 143); render_pause_castle_main_strings(104, 60); -#ifdef VERSION_EU - if (gPlayer3Controller->buttonPressed & (A_BUTTON | Z_TRIG | START_BUTTON)) -#else if (gPlayer3Controller->buttonPressed & A_BUTTON || gPlayer3Controller->buttonPressed & START_BUTTON) -#endif { level_set_transition(0, NULL); play_sound(SOUND_MENU_PAUSE_2, gGlobalSoundSource); @@ -2732,39 +1804,16 @@ s16 render_pause_courses_and_castle(void) { return 0; } -#if defined(VERSION_JP) -#define TXT_HISCORE_X 112 -#define TXT_HISCORE_Y 48 -#define TXT_CONGRATS_X 60 -#elif defined(VERSION_SH) -#define TXT_HISCORE_X 118 -#define TXT_HISCORE_Y 48 -#define TXT_CONGRATS_X 70 -#else #define TXT_HISCORE_X 109 #define TXT_HISCORE_Y 36 #define TXT_CONGRATS_X 70 -#endif #define HUD_PRINT_HISCORE 0 #define HUD_PRINT_CONGRATULATIONS 1 void print_hud_course_complete_string(s8 str) { -#ifdef VERSION_EU - u8 textHiScore[][15] = { - { TEXT_HUD_HI_SCORE }, - { TEXT_HUD_HI_SCORE_FR }, - { TEXT_HUD_HI_SCORE_DE } - }; - u8 textCongratulations[][16] = { - { TEXT_HUD_CONGRATULATIONS }, - { TEXT_HUD_CONGRATULATIONS_FR }, - { TEXT_HUD_CONGRATULATIONS_DE } - }; -#else u8 textHiScore[] = { TEXT_HUD_HI_SCORE }; u8 textCongratulations[] = { TEXT_HUD_CONGRATULATIONS }; -#endif u8 colorFade = sins(gDialogColorFadeTimer) * 50.0f + 200.0f; @@ -2772,19 +1821,9 @@ void print_hud_course_complete_string(s8 str) { gDPSetEnvColor(gDisplayListHead++, colorFade, colorFade, colorFade, 255); if (str == HUD_PRINT_HISCORE) { -#ifdef VERSION_EU - print_hud_lut_string(HUD_LUT_GLOBAL, get_str_x_pos_from_center_scale(160, textHiScore[gInGameLanguage], 12.0f), - 36, textHiScore[gInGameLanguage]); -#else print_hud_lut_string(HUD_LUT_GLOBAL, TXT_HISCORE_X, TXT_HISCORE_Y, textHiScore); -#endif } else { // HUD_PRINT_CONGRATULATIONS -#ifdef VERSION_EU - print_hud_lut_string(HUD_LUT_GLOBAL, get_str_x_pos_from_center_scale(160, textCongratulations[gInGameLanguage], 12.0f), - 67, textCongratulations[gInGameLanguage]); -#else print_hud_lut_string(HUD_LUT_GLOBAL, TXT_CONGRATS_X, 67, textCongratulations); -#endif } gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); @@ -2837,41 +1876,18 @@ 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 -#else #define TXT_NAME_X1 71 #define TXT_NAME_X2 69 -#endif -#if defined(VERSION_JP) || defined(VERSION_SH) -#define CRS_NUM_X2 95 -#define CRS_NUM_X3 93 -#define TXT_CLEAR_X1 205 -#define TXT_CLEAR_X2 203 -#else #define CRS_NUM_X2 104 #define CRS_NUM_X3 102 #define TXT_CLEAR_X1 get_string_width(name) + 81 #define TXT_CLEAR_X2 get_string_width(name) + 79 -#endif void render_course_complete_lvl_info_and_hud_str(void) { -#if defined(VERSION_JP) - u8 textSymStar[] = { GLYPH_STAR, GLYPH_SPACE }; - u8 textCourse[] = { TEXT_COURSE }; - u8 textCatch[] = { TEXT_CATCH }; - u8 textClear[] = { TEXT_CLEAR }; -#elif defined(VERSION_EU) - UNUSED u8 textCatch[] = { TEXT_CATCH }; // unused in EU - u8 textSymStar[] = { GLYPH_STAR, GLYPH_SPACE }; -#define textCourse gTextCourseArr[gInGameLanguage] -#else u8 textCourse[] = { TEXT_COURSE }; UNUSED u8 textCatch[] = { TEXT_CATCH }; // unused in US UNUSED u8 textClear[] = { TEXT_CLEAR }; u8 textSymStar[] = { GLYPH_STAR, GLYPH_SPACE }; -#endif void **actNameTbl; void **courseNameTbl; @@ -2879,26 +1895,8 @@ void render_course_complete_lvl_info_and_hud_str(void) { u8 strCourseNum[4]; -#ifdef VERSION_EU - s16 centerX; - switch (gInGameLanguage) { - case LANGUAGE_ENGLISH: - actNameTbl = segmented_to_virtual(act_name_table_eu_en); - courseNameTbl = segmented_to_virtual(course_name_table_eu_en); - break; - case LANGUAGE_FRENCH: - actNameTbl = segmented_to_virtual(act_name_table_eu_fr); - courseNameTbl = segmented_to_virtual(course_name_table_eu_fr); - break; - case LANGUAGE_GERMAN: - actNameTbl = segmented_to_virtual(act_name_table_eu_de); - courseNameTbl = segmented_to_virtual(course_name_table_eu_de); - break; - } -#else actNameTbl = segmented_to_virtual(seg2_act_name_table); courseNameTbl = segmented_to_virtual(seg2_course_name_table); -#endif if (gLastCompletedCourseNum <= COURSE_STAGES_MAX) { print_hud_course_complete_coins(118, 103); @@ -2923,18 +1921,11 @@ void render_course_complete_lvl_info_and_hud_str(void) { name = segmented_to_virtual(courseNameTbl[gLastCompletedCourseNum - 1]); gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, gDialogTextAlpha); -#ifdef VERSION_EU - centerX = get_str_x_pos_from_center(153, name, 12.0f); -#endif print_generic_string(TXT_NAME_X1, 130, name); -#ifndef VERSION_EU print_generic_string(TXT_CLEAR_X1, 130, textClear); -#endif gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); print_generic_string(TXT_NAME_X2, 132, name); -#ifndef VERSION_EU print_generic_string(TXT_CLEAR_X2, 132, textClear); -#endif gSPDisplayList(gDisplayListHead++, dl_ia_text_end); print_hud_course_complete_string(HUD_PRINT_CONGRATULATIONS); print_hud_course_complete_coins(118, 111); @@ -2953,67 +1944,22 @@ void render_course_complete_lvl_info_and_hud_str(void) { gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, gDialogTextAlpha); print_generic_string(76, 145, name); -#if defined(VERSION_JP) || defined(VERSION_SH) - print_generic_string(220, 145, textCatch); -#endif gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); print_generic_string(74, 147, name); -#if defined(VERSION_JP) || defined(VERSION_SH) - print_generic_string(218, 147, textCatch); -#endif gSPDisplayList(gDisplayListHead++, dl_ia_text_end); } -#if defined(VERSION_JP) || defined(VERSION_SH) -#define TXT_SAVEOPTIONS_X x + 10 -#elif defined(VERSION_US) #define TXT_SAVEOPTIONS_X x + 12 -#elif defined(VERSION_EU) -#define TXT_SAVEOPTIONS_X xOffset -#endif -#if defined(VERSION_JP) || defined(VERSION_SH) -#define TXT_SAVECONT_Y 2 -#define TXT_SAVEQUIT_Y 18 -#define TXT_CONTNOSAVE_Y 38 -#else #define TXT_SAVECONT_Y 0 #define TXT_SAVEQUIT_Y 20 #define TXT_CONTNOSAVE_Y 40 -#endif -#ifdef VERSION_EU -#define X_VAL9 xOffset - 12 -void render_save_confirmation(s16 y, s8 *index, s16 sp6e) -#else #define X_VAL9 x void render_save_confirmation(s16 x, s16 y, s8 *index, s16 sp6e) -#endif { -#ifdef VERSION_EU - u8 textSaveAndContinueArr[][24] = { - { TEXT_SAVE_AND_CONTINUE }, - { TEXT_SAVE_AND_CONTINUE_FR }, - { TEXT_SAVE_AND_CONTINUE_DE } - }; - u8 textSaveAndQuitArr[][22] = { - { TEXT_SAVE_AND_QUIT }, - { TEXT_SAVE_AND_QUIT_FR }, - { TEXT_SAVE_AND_QUIT_DE } - }; - u8 textContinueWithoutSaveArr[][27] = { - { TEXT_CONTINUE_WITHOUT_SAVING }, - { TEXT_CONTINUE_WITHOUT_SAVING_FR }, - { TEXT_CONTINUE_WITHOUT_SAVING_DE } - }; -#define textSaveAndContinue textSaveAndContinueArr[gInGameLanguage] -#define textSaveAndQuit textSaveAndQuitArr[gInGameLanguage] -#define textContinueWithoutSave textContinueWithoutSaveArr[gInGameLanguage] - s16 xOffset = get_str_x_pos_from_center(160, textContinueWithoutSaveArr[gInGameLanguage], 12.0f); -#else u8 textSaveAndContinue[] = { TEXT_SAVE_AND_CONTINUE }; u8 textSaveAndQuit[] = { TEXT_SAVE_AND_QUIT }; u8 textContinueWithoutSave[] = { TEXT_CONTINUE_WITHOUT_SAVING }; -#endif handle_menu_scrolling(MENU_SCROLL_VERTICAL, index, 1, 3); @@ -3036,9 +1982,6 @@ void render_save_confirmation(s16 x, s16 y, s8 *index, s16 sp6e) s16 render_course_complete_screen(void) { s16 num; -#ifdef VERSION_EU - gInGameLanguage = eu_get_language(); -#endif switch (gDialogBoxState) { case DIALOG_STATE_OPENING: @@ -3053,18 +1996,11 @@ s16 render_course_complete_screen(void) { case DIALOG_STATE_VERTICAL: shade_screen(); render_course_complete_lvl_info_and_hud_str(); -#ifdef VERSION_EU - render_save_confirmation(86, &gDialogLineNum, 20); -#else render_save_confirmation(100, 86, &gDialogLineNum, 20); -#endif if (gCourseDoneMenuTimer > 110 && (gPlayer3Controller->buttonPressed & A_BUTTON || gPlayer3Controller->buttonPressed & START_BUTTON -#ifdef VERSION_EU - || gPlayer3Controller->buttonPressed & Z_TRIG -#endif )) { level_set_transition(0, NULL); play_sound(SOUND_MENU_STAR_SOUND, gGlobalSoundSource);