From f34fcf6fa33d4734f46cf4b7a200b30279ae0d85 Mon Sep 17 00:00:00 2001
From: d0k3 <tore.anon@gmail.com>
Date: Wed, 4 Apr 2018 23:28:30 +0200
Subject: [PATCH] Added GodMode64 and BrickedMode9 FLAVORs

---
 Makefile                          |   3 ++-
 Makefile.common                   |  14 ++++++++++++++
 arm9/source/common/colors.h       |   6 +++++-
 arm9/source/system/vram0.h        |   7 ++++++-
 resources/BrickedMode9_splash.png | Bin 0 -> 1657 bytes
 resources/GodMode64_splash.png    | Bin 0 -> 4174 bytes
 6 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 resources/BrickedMode9_splash.png
 create mode 100644 resources/GodMode64_splash.png

diff --git a/Makefile b/Makefile
index 150adbb..c0db758 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ release: clean
 vram0:
 	@mkdir -p "$(OUTDIR)"
 	@echo "Creating $(VRAM_OUT)"
-	@$(PY3) utils/add2tar.py $(VRAM_FLAGS) $(VRAM_OUT) $(shell ls -d $(README) $(SPLASH) $(VRAM_DATA)/*)
+	@$(PY3) utils/add2tar.py $(VRAM_FLAGS) $(VRAM_OUT) $(shell ls -d $(README) $(SPLASH) $(OVERRIDE_FONT) $(VRAM_DATA)/*)
 
 %.elf: .FORCE
 	@echo "Building $@"
@@ -81,6 +81,7 @@ vram0:
 firm: $(ELF) vram0
 	@test `wc -c <$(VRAM_OUT)` -le 3145728
 	@mkdir -p $(call dirname,"$(FIRM)") $(call dirname,"$(FIRMD)")
+	@echo "[FLAVOR] $(FLAVOR)"
 	@echo "[VERSION] $(VERSION)"
 	@echo "[BUILD] $(DBUILTL)"
 	@echo "[FIRM] $(FIRM)"
diff --git a/Makefile.common b/Makefile.common
index 7eae5ee..549678a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -13,6 +13,20 @@ ifeq ($(FLAVOR),SafeMode9)
     CFLAGS += -DSAFEMODE
 endif
 
+ifeq ($(FLAVOR),GodMode64)
+    OVERRIDE_FONT := resources/fonts/font_c64_8x8.pbm
+    CFLAGS += -DDEFAULT_FONT=\"font_c64_8x8.pbm\"
+    CFLAGS += -DCOLOR_STD_FONT=0xD5717B
+    CFLAGS += -DCOLOR_STD_BG=0xA43041
+endif
+
+ifeq ($(FLAVOR),BrickedMode9)
+    OVERRIDE_FONT := resources/fonts/font_nbraille_4x6.pbm
+    CFLAGS += -DDEFAULT_FONT=\"font_nbraille_4x6.pbm\"
+    CFLAGS += -DCOLOR_STD_FONT=0x00FFFF
+    CFLAGS += -DCOLOR_STD_BG=0xFF0000
+endif
+
 ifeq ($(SALTMODE),1)
     CFLAGS += -DSALTMODE
 endif
diff --git a/arm9/source/common/colors.h b/arm9/source/common/colors.h
index 5119bb8..d0e0e67 100644
--- a/arm9/source/common/colors.h
+++ b/arm9/source/common/colors.h
@@ -1,7 +1,7 @@
 #pragma once
 
 
-#define RGB(r,g,b) ((r)<<24|(b)<<16|(g)<<8|(r))
+#define RGB(r,g,b) ((int) ((b)<<16|(g)<<8|(r)))
 
 // a base set of colors below
 #define COLOR_BLACK         RGB(0x00, 0x00, 0x00)
@@ -31,8 +31,12 @@
 #define COLOR_SUPERFUCHSIA  RGB(0xFF, 0x00, 0xEF)
 
 // standard colors - used everywhere
+#ifndef COLOR_STD_BG
 #define COLOR_STD_BG        COLOR_BLACK
+#endif
+#ifndef COLOR_STD_FONT
 #define COLOR_STD_FONT      COLOR_WHITE
+#endif
 
 // colors for GodMode9 file browser
 #define COLOR_SIDE_BAR      COLOR_DARKGREY
diff --git a/arm9/source/system/vram0.h b/arm9/source/system/vram0.h
index 8699a6e..501d46a 100644
--- a/arm9/source/system/vram0.h
+++ b/arm9/source/system/vram0.h
@@ -4,9 +4,14 @@
 #include "tar.h"
 
 
+// set default font
+#ifndef DEFAULT_FONT
+#define DEFAULT_FONT           "font_default.pbm"
+#endif
+
 // known file names inside VRAM0 TAR
 #define VRAM0_AUTORUN_GM9      "autorun.gm9"
-#define VRAM0_FONT_PBM         "font_default.pbm"
+#define VRAM0_FONT_PBM         DEFAULT_FONT
 #define VRAM0_SCRIPTS          "scripts"
 #define VRAM0_README_MD        "README.md"
 #define VRAM0_SPLASH_PNG       FLAVOR "_splash.png"
diff --git a/resources/BrickedMode9_splash.png b/resources/BrickedMode9_splash.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f4bc350a738766396339d40d02682ccf18e3e13
GIT binary patch
literal 1657
zcmeAS@N?(olHy`uVBq!ia0y~yV4MJCf8bySl9G=O2{14)GX(gAxB|KV|APo19tEQz
zFw#PR$!eV}(9fI&9+AZi4BWyX%*Zfnjs!4+$a}gthE&XXd;4MDWdjL^i&pRdUpU~l
z%EHTS^|Ciy=Vo?I)3RR`Tf5n|^|sTgx4Z2bj2)9$It5kSCP=^-Gkhl)*8TnbQ_5cd
z+Ut)WpZ&V`V~1RF&GF@b`E#0c_FWUWE&p%E`v<yZ!bYq&<MdCP$f`Ywm76&sb>4)d
zJ$o*mlq!n1=DRlGsMII7vPi?GBOF4;YZd3G_y4rn<n#LIU!9^)k3ui&W!GQ3@n++(
zs`GX0x9)vbsxEBw_rP}HO_lHK^a{;(PT=gk>3`x`!jGp?n`G9g*Z)2Izx&Omq<K7_
zPUxNXdn0<D?dRdw7ppCjosxV!dK3(S7G0Y#V|jgQ?cc92Z0GDWI`QzZK$Fe!mLn0)
zNkEM#UVQf8=Dn{gzyJPzSu*+ioonxZ?>KccSUuS;`n~_dY#zsTWuLB`{Ffi%E^IXI
z?3RLwlmE*XeGy;v*7kBs!NR*OHe1^696u~oWV?F}Jjg~F$O&kWhQ_mH9;f-a{=Rma
Tv1@%SsLb$m^>bP0l+XkKlu$?^

literal 0
HcmV?d00001

diff --git a/resources/GodMode64_splash.png b/resources/GodMode64_splash.png
new file mode 100644
index 0000000000000000000000000000000000000000..22a98d3ad1c5da689db6005a90c7de0cf2ae4221
GIT binary patch
literal 4174
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
F@NYQZI0XOz

literal 0
HcmV?d00001