Added GodMode64 and BrickedMode9 FLAVORs

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)"

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

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

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"