From 39b76ef5fcdf010b883361e1e647a6858c5f78f3 Mon Sep 17 00:00:00 2001 From: d0k3 Date: Thu, 19 Oct 2017 01:34:24 +0200 Subject: [PATCH] Make AL3X10MODE the standard You can still pause & view the splashscreen via R+UP --- Makefile | 4 ---- source/godmode.c | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d54fe34..53c614a 100644 --- a/Makefile +++ b/Makefile @@ -56,10 +56,6 @@ ifeq ($(SAFEMODE),1) CFLAGS += -DSAFEMODE endif -ifeq ($(AL3X10MODE),1) - CFLAGS += -DAL3X10MODE -endif - ifeq ($(SALTMODE),1) CFLAGS += -DSALTMODE endif diff --git a/source/godmode.c b/source/godmode.c index 3fe9362..243f07b 100644 --- a/source/godmode.c +++ b/source/godmode.c @@ -55,6 +55,7 @@ #define COLOR_HVASCII RGB(0x40, 0x80, 0x50) #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 BOOTFIRM_PATHS "0:/bootonce.firm", "0:/boot.firm", "1:/boot.firm" #define BOOTFIRM_TEMPS 0x1 // bits mark paths as temporary @@ -1774,10 +1775,10 @@ u32 GodMode(bool is_b9s) { #if defined(SALTMODE) show_splash = bootmenu = (bootloader && CheckButton(BOOTMENU_KEY)); 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 - while (HID_STATE & BUTTON_ANY); // don't continue while any button is held #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 // bootmenu handler