Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make AL3X10MODE the standard

Browse Source 
You can still pause & view the splashscreen via R+UP
This commit is contained in:
d0k3 2017-10-19 01:34:24 +02:00
parent ac25337690
commit 39b76ef5fc
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -56,10 +56,6 @@ ifeq ($(SAFEMODE),1)
CFLAGS += -DSAFEMODE CFLAGS += -DSAFEMODE
endif endif
ifeq ($(AL3X10MODE),1)
CFLAGS += -DAL3X10MODE
endif
ifeq ($(SALTMODE),1) ifeq ($(SALTMODE),1)
CFLAGS += -DSALTMODE CFLAGS += -DSALTMODE
endif endif

5
source/godmode.c
View File

@ -55,6 +55,7 @@
#define COLOR_HVASCII RGB(0x40, 0x80, 0x50) #define COLOR_HVASCII RGB(0x40, 0x80, 0x50)
#define COLOR_HVHEX(i) ((i % 2) ? RGB(0x30, 0x90, 0x30) : RGB(0x30, 0x80, 0x30)) #define COLOR_HVHEX(i) ((i % 2) ? RGB(0x30, 0x90, 0x30) : RGB(0x30, 0x80, 0x30))
#define BOOTPAUSE_KEY (BUTTON_R1|BUTTON_UP)
#define BOOTMENU_KEY (BUTTON_R1|BUTTON_LEFT) #define BOOTMENU_KEY (BUTTON_R1|BUTTON_LEFT)
#define BOOTFIRM_PATHS "0:/bootonce.firm", "0:/boot.firm", "1:/boot.firm" #define BOOTFIRM_PATHS "0:/bootonce.firm", "0:/boot.firm", "1:/boot.firm"
#define BOOTFIRM_TEMPS 0x1 // bits mark paths as temporary #define BOOTFIRM_TEMPS 0x1 // bits mark paths as temporary
@ -1774,10 +1775,10 @@ u32 GodMode(bool is_b9s) {
#if defined(SALTMODE) #if defined(SALTMODE)
show_splash = bootmenu = (bootloader && CheckButton(BOOTMENU_KEY)); show_splash = bootmenu = (bootloader && CheckButton(BOOTMENU_KEY));
if (show_splash) SplashInit("saltmode"); if (show_splash) SplashInit("saltmode");
#elif !defined(AL3X10MODE) // standard behaviour #else // standard behaviour
bootmenu = bootmenu || (bootloader && CheckButton(BOOTMENU_KEY)); // second check for boot menu keys bootmenu = bootmenu || (bootloader && CheckButton(BOOTMENU_KEY)); // second check for boot menu keys
while (HID_STATE & BUTTON_ANY); // don't continue while any button is held
#endif #endif
while (CheckButton(BOOTPAUSE_KEY)); // don't continue while these keys is held
if (show_splash) while (timer_msec( timer ) < 500); // show splash for at least 0.5 sec if (show_splash) while (timer_msec( timer ) < 500); // show splash for at least 0.5 sec
// bootmenu handler // bootmenu handler