From 55af166d566261fc784e0d1f8129f8aa1e57d1f2 Mon Sep 17 00:00:00 2001
From: hansoljin <37358975+lifehackerhansol@users.noreply.github.com>
Date: Sun, 11 Jul 2021 02:38:12 -0700
Subject: [PATCH 1/2] Update gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c526356..a371eef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.exe
 *.cia
 *.nds
+*.app
 *.o
 *.arm7
 Thumbs.db
@@ -15,4 +16,5 @@ arm9/data/load.bin
 BootLoader/build
 BootLoader/load.bin
 arm9/source/version.h
-desktop.ini
\ No newline at end of file
+desktop.ini
+data
\ No newline at end of file

From 6dba268baf8734d2e1d60c2ae96141618b2906d4 Mon Sep 17 00:00:00 2001
From: hansoljin <37358975+lifehackerhansol@users.noreply.github.com>
Date: Sun, 11 Jul 2021 02:38:20 -0700
Subject: [PATCH 2/2] Fix compilation error with latest devkitARM

With the latest devkitARM revision gcc was updated, and -fno-common became the default.
With that in mind, changing each problem enum to typedef enum fixes the compilation issues.
---
 BootLoader/source/common.h    | 4 ++--
 BootLoaderAlt/source/common.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BootLoader/source/common.h b/BootLoader/source/common.h
index b8c7ed4..070ebe9 100755
--- a/BootLoader/source/common.h
+++ b/BootLoader/source/common.h
@@ -25,14 +25,14 @@
 #define resetCpu() \
 		__asm volatile("swi 0x000000")
 
-enum {	ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_BIN=0x03, ERR_STS_START=0x04,
+typedef enum {	ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_BIN=0x03, ERR_STS_START=0x04,
 		// initCard error codes:
 		ERR_LOAD_NORM=0x11, ERR_LOAD_OTHR=0x12, ERR_SEC_NORM=0x13, ERR_SEC_OTHR=0x14, ERR_LOGO_CRC=0x15, ERR_HEAD_CRC=0x16,
 		// hookARM7Binary error codes:
 		ERR_NOCHEAT=0x21, ERR_HOOK=0x22,
 	} ERROR_CODES;
 
-enum {ARM9_BOOT, ARM9_START, ARM9_MEMCLR, ARM9_READY, ARM9_BOOTBIN, ARM9_DISPERR, ARM9_SETSCFG} ARM9_STATE;
+typedef enum {ARM9_BOOT, ARM9_START, ARM9_MEMCLR, ARM9_READY, ARM9_BOOTBIN, ARM9_DISPERR, ARM9_SETSCFG} ARM9_STATE;
 extern tNDSHeader* ndsHeader;
 
 extern bool arm9_dsiModeConfirmed;
diff --git a/BootLoaderAlt/source/common.h b/BootLoaderAlt/source/common.h
index 6ca2e9d..0925d95 100644
--- a/BootLoaderAlt/source/common.h
+++ b/BootLoaderAlt/source/common.h
@@ -26,7 +26,7 @@
 #define resetCpu() \
 		__asm volatile("swi 0x000000")
 
-enum {	ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_BIN=0x03, ERR_STS_START=0x04,
+typedef enum {	ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_BIN=0x03, ERR_STS_START=0x04,
 		// initCard error codes:
 		ERR_LOAD_NORM=0x11, ERR_LOAD_OTHR=0x12, ERR_SEC_NORM=0x13, ERR_SEC_OTHR=0x14, ERR_LOGO_CRC=0x15, ERR_HEAD_CRC=0x16,
 		// hookARM7Binary error codes:
@@ -34,7 +34,7 @@ enum {	ERR_NONE=0x00, ERR_STS_CLR_MEM=0x01, ERR_STS_LOAD_BIN=0x02, ERR_STS_HOOK_
 	} ERROR_CODES;
 
 // Values fixed so they can be shared with ASM code
-enum {
+typedef enum {
 	ARM9_BOOT = 0,
 	ARM9_START = 1,
 	ARM9_RESET = 2,
@@ -42,7 +42,7 @@ enum {
 	ARM9_MEMCLR = 4
 	} ARM9_STATE;
 
-enum {
+typedef enum {
 	ARM7_BOOT = 0,
 	ARM7_START = 1,
 	ARM7_RESET = 2,