The-Homebrew-Cloud/N64FlashcartMenu
2
0
Fork 0
mirror of https://github.com/Polprzewodnikowy/N64FlashcartMenu.git synced 2025-02-18 11:06:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into develop-gdb

Browse Source
This commit is contained in:
Robin Jones 2024-01-10 17:04:13 +00:00 committed by GitHub
commit 365040ded0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View File

@ -110,3 +110,4 @@ jobs:
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./output/docs publish_dir: ./output/docs
cname: menu.summercart64.dev

2
.gitignore vendored
View File

@ -2,7 +2,7 @@
/build /build
/filesystem /filesystem
/output /output
/tools/sc64/* /tools/*
# There should never be ROMs uploaded, but just incase, make sure they are excluded. # There should never be ROMs uploaded, but just incase, make sure they are excluded.
**/*.n64 **/*.n64

8
src/menu/menu.c
View File

@ -20,8 +20,6 @@
#include "views/views.h" #include "views/views.h"
#define TV_TYPE_RAM *((uint32_t *) (0x80000300))
#define CACHE_DIRECTORY "sd:/menu/cache" #define CACHE_DIRECTORY "sd:/menu/cache"
#define BACKGROUND_CACHE "sd:/menu/cache/background.data" #define BACKGROUND_CACHE "sd:/menu/cache/background.data"
@ -33,6 +31,8 @@ static menu_t *menu;
static tv_type_t tv_type; static tv_type_t tv_type;
static volatile int frame_counter = 0; static volatile int frame_counter = 0;
extern tv_type_t __boot_tvtype;
static void frame_counter_handler (void) { static void frame_counter_handler (void) {
frame_counter += 1; frame_counter += 1;
@ -99,7 +99,7 @@ static void menu_init (boot_params_t *boot_params) {
tv_type = get_tv_type(); tv_type = get_tv_type();
if ((tv_type == TV_PAL) && menu->settings.pal60_enabled) { if ((tv_type == TV_PAL) && menu->settings.pal60_enabled) {
// HACK: Set TV type to NTSC, so PAL console would output 60 Hz signal instead. // HACK: Set TV type to NTSC, so PAL console would output 60 Hz signal instead.
TV_TYPE_RAM = TV_NTSC; __boot_tvtype = TV_NTSC;
} }
display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED); display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED);
@ -111,7 +111,7 @@ static void menu_deinit (menu_t *menu) {
unregister_VI_handler(frame_counter_handler); unregister_VI_handler(frame_counter_handler);
// NOTE: Restore previous TV type so boot procedure wouldn't passthrough wrong value. // NOTE: Restore previous TV type so boot procedure wouldn't passthrough wrong value.
TV_TYPE_RAM = tv_type; __boot_tvtype = tv_type;
hdmi_send_game_id(menu->boot_params); hdmi_send_game_id(menu->boot_params);