Skip to content

Time Trials #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mode8fx wants to merge 6 commits into
base: nightly
Choose a base branch
from
Open

Time Trials #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b20d9e
First commit (it's probably done)
Mode8fx Jul 16, 2020
ad19b3f
Slight refactor
Mode8fx Jul 16, 2020
dd1ff56
Refactored for consistency with N64 patch
Mode8fx Jul 16, 2020
4d74716
HUD polish + a bug fix
Mode8fx Jul 19, 2020
4d40149
Added verification upon setting a time
Mode8fx Jul 20, 2020
3111199
Moved verification function
Mode8fx Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions include/text_strings.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,31 @@
#define TEXT_VARIABLE_X _("×")
#define TEXT_UNFILLED_STAR _("☆")

/**
* Time Trial Text
*/
#define TEXT_TIME_TRIAL_STAR _("STAR")
#define TEXT_TIME_TRIAL_KEY _("KEY")
#define TEXT_TIME_TRIAL_FINAL _("FINAL")
#define TEXT_TIME_TRIAL_1 _("1")
#define TEXT_TIME_TRIAL_2 _("2")
#define TEXT_TIME_TRIAL_3 _("3")
#define TEXT_TIME_TRIAL_4 _("4")
#define TEXT_TIME_TRIAL_5 _("5")
#define TEXT_TIME_TRIAL_6 _("6")
#define TEXT_TIME_TRIAL_COURSE _("COURSE")
#define TEXT_TIME_TRIAL_TOTAL _("TOTAL")
#define TEXT_TIME_TRIAL_BOWSER _("BOWSER")
#define TEXT_TIME_TRIAL_PSS1 _("PSS 1")
#define TEXT_TIME_TRIAL_PSS2 _("PSS 2")
#define TEXT_TIME_TRIAL_SA _("SA")
#define TEXT_TIME_TRIAL_TOTWC _("TOTWC")
#define TEXT_TIME_TRIAL_VCUTM _("VCUTM")
#define TEXT_TIME_TRIAL_COTMC _("COTMC")
#define TEXT_TIME_TRIAL_WMOTR _("WMOTR")
#define TEXT_TIME_TRIAL_TIMER_TOGGLE _("C-UP, DOWN - TOGGLE TIMER")
#define TEXT_TIME_TRIAL_RESET _("ZBLZBZLZZB - RESET COURSE TIMES")

/**
* Global Text
*/
Expand Down
60 changes: 60 additions & 0 deletions src/game/hud.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,62 @@ void render_hud_timer(void) {

hudLUT = segmented_to_virtual(&main_hud_lut);
timerValFrames = gHudDisplay.timer;
if (gHudDisplay.flags & HUD_DISPLAY_FLAG_TIME_TRIAL_TIMER) {
timerMins = timerValFrames / (30 * 60);
timerSecs = (timerValFrames - (timerMins * 1800)) / 30;

timerFracSecs = ((timerValFrames - (timerMins * 1800) - (timerSecs * 30)) & 0xFFFF) / 3;

print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(91), 160, "%0d", timerMins);
print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(71), 160, "%02d", timerSecs);
print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(37), 160, "%d", timerFracSecs);
gSPDisplayList(gDisplayListHead++, dl_hud_img_begin);
render_hud_tex_lut(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(81), 57, (*hudLUT)[GLYPH_APOSTROPHE]);
render_hud_tex_lut(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(46), 57, (*hudLUT)[GLYPH_DOUBLE_QUOTE]);
gSPDisplayList(gDisplayListHead++, dl_hud_img_end);
} else {
#ifdef VERSION_EU
switch (eu_get_language()) {
case LANGUAGE_ENGLISH:
print_text(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(150), 185, "TIME");
break;
case LANGUAGE_FRENCH:
print_text(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(155), 185, "TEMPS");
break;
case LANGUAGE_GERMAN:
print_text(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(150), 185, "ZEIT");
break;
}
#endif
timerMins = timerValFrames / (30 * 60);
timerSecs = (timerValFrames - (timerMins * 1800)) / 30;

timerFracSecs = ((timerValFrames - (timerMins * 1800) - (timerSecs * 30)) & 0xFFFF) / 3;
#ifndef VERSION_EU
print_text(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(150), 185, "TIME");
#endif
print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(91), 185, "%0d", timerMins);
print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(71), 185, "%02d", timerSecs);
print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(37), 185, "%d", timerFracSecs);
gSPDisplayList(gDisplayListHead++, dl_hud_img_begin);
render_hud_tex_lut(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(81), 32, (*hudLUT)[GLYPH_APOSTROPHE]);
render_hud_tex_lut(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(46), 32, (*hudLUT)[GLYPH_DOUBLE_QUOTE]);
gSPDisplayList(gDisplayListHead++, dl_hud_img_end);
}
}

/**
* Renders the timer for time trials.
*/
void time_trial_render_hud_timer(void) {
u8 *(*hudLUT)[58];
u16 timerValFrames;
u16 timerMins;
u16 timerSecs;
u16 timerFracSecs;

hudLUT = segmented_to_virtual(&main_hud_lut);
timerValFrames = gHudDisplay.timeTrialTimer;
#ifdef VERSION_EU
switch (eu_get_language()) {
case LANGUAGE_ENGLISH:
Expand Down Expand Up @@ -477,5 +533,9 @@ void render_hud(void) {
if (hudDisplayFlags & HUD_DISPLAY_FLAG_TIMER && configHUD) {
render_hud_timer();
}

if (hudDisplayFlags & HUD_DISPLAY_FLAG_TIME_TRIAL_TIMER && configHUD) {
time_trial_render_hud_timer();
}
}
}
Loading