print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

simplified the text strings for the widescreen option

Browse Source
This commit is contained in:
Reonu
2021-05-26 17:34:38 +01:00
parent 9bac5dd2e2
commit c841546f02
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/text_strings.h.in
View File

@@ -24,8 +24,9 @@
// Ingame Menu
#define TEXT_PAUSE _("PAUSE") // Pause text, Castle Courses
#define TEXT_HUD_CONGRATULATIONS _("CONGRATULATIONS") // Course Complete Text, Bowser Courses
#define TEXT_HUD_CURRENT_RATIO_43 _("CURRENT ASPECT RATIO: 4:3. PRESS L TO SWITCH TO 16:9")
#define TEXT_HUD_CURRENT_RATIO_169 _("CURRENT ASPECT RATIO: 16:9. PRESS L TO SWITCH TO 4:3")
#define TEXT_HUD_CURRENT_RATIO_43 _("CURRENT RATIO: 4:3")
#define TEXT_HUD_CURRENT_RATIO_169 _("CURRENT RATIO: 16:9")
#define TEXT_HUD_PRESS_L _("PRESS L TO SWITCH")
#define TEXT_HUD_WIDE_INFO _("PLEASE CONFIGURE YOUR DISPLAY OR YOUR EMULATOR TO")
#define TEXT_HUD_WIDE_INFO2 _("STRETCH THE IMAGE TO 16:9")

29
src/game/ingame_menu.c
View File

@@ -37,6 +37,7 @@ s16 gCutsceneMsgYOffset;
s8 gRedCoinsCollected;
u8 textCurrRatio43[] = { TEXT_HUD_CURRENT_RATIO_43 };
u8 textCurrRatio169[] = { TEXT_HUD_CURRENT_RATIO_169 };
u8 textPressL[] = { TEXT_HUD_PRESS_L };
u8 textWideInfo[] = { TEXT_HUD_WIDE_INFO };
u8 textWideInfo2[] = { TEXT_HUD_WIDE_INFO2 };
@@ -2273,22 +2274,14 @@ void render_pause_my_score_coins(void) {
print_generic_string(CRS_NUM_X1, 157, strCourseNum);
#ifdef WIDE
if (!gWidescreen) {
if (COURSE_IS_MAIN_COURSE(gCurrCourseNum)) {
print_generic_string(10, 40, textCurrRatio43);
} else {
print_generic_string(10, 20, textCurrRatio43);
}
print_generic_string(10, 7, textPressL);
}
else {
if (COURSE_IS_MAIN_COURSE(gCurrCourseNum)) {
print_generic_string(10, 40, textCurrRatio169);
} else {
print_generic_string(10, 20, textCurrRatio169);
}
print_generic_string(10, 220, textWideInfo);
print_generic_string(10, 200, textWideInfo2);
print_generic_string(10, 7, textPressL);
print_generic_string(10, 220, textWideInfo);
print_generic_string(10, 200, textWideInfo2);
}
#endif
#endif
@@ -2596,13 +2589,15 @@ void render_pause_castle_main_strings(s16 x, s16 y) {
gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha);
#ifdef WIDE
if (!gWidescreen) {
print_generic_string(10, 20, textCurrRatio43);
print_generic_string(10, 20, textCurrRatio43);
print_generic_string(10, 7, textPressL);
}
else {
print_generic_string(10, 20, textCurrRatio169);
print_generic_string(10, 220, textWideInfo);
print_generic_string(10, 200, textWideInfo2);
}
print_generic_string(10, 20, textCurrRatio169);
print_generic_string(10, 7, textPressL);
print_generic_string(10, 220, textWideInfo);
print_generic_string(10, 200, textWideInfo2);
}
#endif
if (gDialogLineNum < COURSE_STAGES_COUNT) {
courseName = segmented_to_virtual(courseNameTbl[gDialogLineNum]);