Fix settings font breaking on opening stats

Author: Epicpkmn11

include/gfx.hpp

@@ -9,8 +9,10 @@
 #define BG(x) (0 + x)
 #define BG_SUB(x) (4 + x)
 
-#define MAIN_FONT_GRAY 0xF8
-#define MAIN_FONT_WHITE 0xFC
+#define TEXT_BLACK 0xF0
+#define TEXT_GRAY  0xF4
+#define TEXT_WHITE 0xF8
+#define TEXT_GREEN 0xFC
 
 enum TilePalette : int {
 	white = 0,
@@ -32,7 +34,7 @@ extern Font mainFont;
 
 void initGraphics(bool altPalette);
 
-void setSpritePalettes(bool altPalette);
+void setPalettes(bool altPalette);
 
 void flipSprites(Sprite *letterSprites, int count, std::vector<TilePalette> newPalettes, FlipOptions option = FlipOptions::none);
 

source/gfx.cpp

@@ -33,10 +33,20 @@ constexpr std::array<std::array<u16, 16 * 5>, 2> letterPalettes = {{
 	}
 }};
 
-constexpr u16 fontPal[] = {
-	0x0000, 0xEF7B, 0xD6B5, 0xC631, // Gray
-	0x0000, 0xC631, 0xF39C, 0xFFFF  // White
-};
+constexpr std::array<std::array<u16, 16>, 2> fontPal = {{
+	{
+		0xFFFF, 0xDEF7, 0xC631, 0x8000, // Black
+		0x0000, 0xEF7B, 0xD6B5, 0xC631, // Gray
+		0x39CE, 0xC631, 0xF39C, 0xFFFF, // White on gray
+		0x32AD, 0xC2D1, 0xDF57, 0xFFFF, // White on green
+	},
+	{
+		0xFFFF, 0xDEF7, 0xC631, 0x8000, // Black
+		0x0000, 0xEF7B, 0xD6B5, 0xC631, // Gray
+		0x39CE, 0xC631, 0xF39C, 0xFFFF, // White on gray
+		0x1DFD, 0xB63D, 0xD6DE, 0xFFFF, // White on orange
+	}
+}};
 
 void initGraphics(bool altPalette) {
 	videoSetMode(MODE_5_2D);
@@ -64,7 +74,6 @@ void initGraphics(bool altPalette) {
 
 	oamInit(&oamMain, SpriteMapping_Bmp_1D_128, false);
 	oamInit(&oamSub, SpriteMapping_Bmp_1D_128, false);
-	setSpritePalettes(altPalette);
 
 	constexpr int tileSize = 32 * 32 / 2;
 	for(int i = 0; i < letterTilesTilesLen / tileSize; i++) {
@@ -81,12 +90,17 @@ void initGraphics(bool altPalette) {
 	Sprite::update(true);
 
 	mainFont = std::move(Font(main_nftr, main_nftr_size));
-	tonccpy(BG_PALETTE_SUB + MAIN_FONT_GRAY, fontPal, sizeof(fontPal));
+
+	setPalettes(altPalette);
 }
 
-void setSpritePalettes(bool altPalette) {
+void setPalettes(bool altPalette) {
+	// Sprites
 	tonccpy(SPRITE_PALETTE, letterPalettes[altPalette].data(), letterPalettes[altPalette].size() * sizeof(u16));
 	tonccpy(SPRITE_PALETTE_SUB, letterPalettes[altPalette].data(), letterPalettes[altPalette].size() * sizeof(u16));
+
+	// Fonts
+	tonccpy(BG_PALETTE_SUB + 0xF0, fontPal[altPalette].data(), fontPal[altPalette].size() * sizeof(u16));
 }
 
 void flipSprites(Sprite *letterSprites, int count, std::vector<TilePalette> newPalettes, FlipOptions option) {

source/main.cpp

@@ -93,6 +93,8 @@ void makeTxt(Config &config, std::u16string_view answer) {
 }
 
 void drawBgBottom(std::string_view msg) {
+	swiWaitForVBlank();
+
 	mainFont.clear(false);
 
 	if(msg.size() == 0) {
@@ -104,7 +106,7 @@ void drawBgBottom(std::string_view msg) {
 		tonccpy(BG_PALETTE_SUB, bgBottomBoxPal, bgBottomBoxPalLen);
 		tonccpy(bgGetMapPtr(BG_SUB(0)), bgBottomBoxMap, bgBottomBoxMapLen);
 
-		mainFont.palette(MAIN_FONT_WHITE).print(0, 56 - mainFont.calcHeight(msg) / 2, false, msg, Alignment::center);
+		mainFont.palette(TEXT_WHITE).print(0, 56 - mainFont.calcHeight(msg) / 2, false, msg, Alignment::center);
 	}
 
 	mainFont.update(false);

source/settings.cpp

@@ -56,14 +56,14 @@ void settingsMenu(Config &config) {
 	tonccpy(BG_PALETTE_SUB, settingsBottomPal, settingsBottomPalLen);
 	tonccpy(bgGetMapPtr(BG_SUB(0)), settingsBottomMap, settingsBottomMapLen);
 
-	mainFont.palette(MAIN_FONT_GRAY);
+	mainFont.palette(TEXT_GRAY);
 	mainFont.print(4, 192 - 2 - mainFont.calcHeight(creditStr), false, creditStr);
 	mainFont.print(256 - 4, 192 - 2 - mainFont.height(), false, VER_NUMBER, Alignment::right);
 	mainFont.update(false);
 
 	while(1) {
 		tonccpy(BG_PALETTE_SUB + 0x1D, togglePal[config.altPalette()].data(), togglePal[config.altPalette()].size() * sizeof(u16));
-		setSpritePalettes(config.altPalette());
+		setPalettes(config.altPalette());
 		setToggle(0, config.hardMode());
 		setToggle(1, config.altPalette());
 

source/stats.cpp

@@ -13,24 +13,6 @@
 #include <algorithm>
 #include <nds.h>
 
-constexpr std::array<std::array<u16, 12>, 2> fontPal = {{
-	{
-		0xFFFF, 0xDEF7, 0xC631, 0x8000, // Black
-		0x39CE, 0xC631, 0xF39C, 0xFFFF, // White on gray
-		0x32AD, 0xC2D1, 0xDF57, 0xFFFF, // White on green
-	},
-	{
-		0xFFFF, 0xDEF7, 0xC631, 0x8000, // Black
-		0x39CE, 0xC631, 0xF39C, 0xFFFF, // White on gray
-		0x1DFD, 0xB63D, 0xD6DE, 0xFFFF, // White on orange
-	}
-
-}};
-
-#define TEXT_BLACK 0xF0
-#define TEXT_WHITE 0xF4
-#define TEXT_GREEN 0xF8
-
 void statsMenu(const Config &config, bool won) {
 	// Change to stats menu background
 	swiWaitForVBlank();
@@ -42,7 +24,6 @@ void statsMenu(const Config &config, bool won) {
 	Font largeFont(numbers_large_nftr, numbers_large_nftr_size), smallFont(numbers_small_nftr, numbers_small_nftr_size);
 	largeFont.palette(TEXT_BLACK);
 	smallFont.palette(TEXT_BLACK);
-	tonccpy(BG_PALETTE_SUB + 0xF0, fontPal[config.altPalette()].data(), fontPal[config.altPalette()].size() * sizeof(u16));
 
 	// Print scores
 	largeFont.print(-96, 32, false, config.gamesPlayed(), Alignment::center);