Merge pull request #37 from fhoedemakers/development

Minor fix for menu colors not displaying correctly

.github/workflows/BuildAndRelease.yml

@@ -1,6 +1,8 @@
 name: Build and create a release when tag is pushed
 
 # Only deploy when a new tag is pushed
+# git tag v0.n
+# git push origin v0.n 
 on:
     push:
         tags:

CHANGELOG.md

@@ -8,6 +8,16 @@ Binaries are at the end of this page.
 
 # Release notes
 
+## v0.10
+
+Features:
+
+- none
+
+Fixes:
+
+- Fixed menu colors not displaying correctly. Using NES color palette properly now.
+
 ## v0.9
 
 Features:

infones/InfoNES.cpp

@@ -67,7 +67,7 @@ enum
 #pragma region buffers
 /* RAM */
 BYTE RAM[RAM_SIZE];
-// Share with romselect.cpp
+// Share this memory with other components (menu.cpp, romselect.cpp, main.cpp)
 void *InfoNes_GetRAM(size_t *size)
 {
   printf("Acquired RAM Buffer from emulator: %d bytes\n", RAM_SIZE);
@@ -80,7 +80,7 @@ BYTE SRAM[SRAM_SIZE];
 /* Character Buffer */
 BYTE ChrBuf[CHRBUF_SIZE];
 
-// Share with romselect.cpp
+// Share this memory with other components (menu.cpp, romselect.cpp, main.cpp)
 void *InfoNes_GetChrBuf(size_t *size)
 {
   printf("Acquired ChrBuf Buffer from emulator: %d bytes\n", CHRBUF_SIZE);
@@ -89,7 +89,7 @@ void *InfoNes_GetChrBuf(size_t *size)
 }
 /* PPU RAM */
 BYTE PPURAM[PPURAM_SIZE];
-// Share with romselect.cpp
+// Share this memory with other components (menu.cpp, romselect.cpp, main.cpp)
 void *InfoNes_GetPPURAM(size_t *size)
 {
   printf("Acquired PPURAM Buffer from emulator: %d bytes\n", PPURAM_SIZE);
@@ -100,7 +100,7 @@ void *InfoNes_GetPPURAM(size_t *size)
 BYTE *PPUBANK[16];
 /* Sprite RAM */
 BYTE SPRRAM[SPRRAM_SIZE];
-// Share with romselect.cpp
+// Share this memory with other components (menu.cpp, romselect.cpp, main.cpp)
 void *InfoNes_GetSPRRAM(size_t *size)
 {
   printf("Acquired SPRRAM Buffer from emulator: %d bytes\n", SPRRAM_SIZE);

menu.cpp

@@ -36,9 +36,9 @@ extern const WORD __not_in_flash_func(NesPalette)[];
 #define CBLACK 15
 #define CWHITE 48
 #define CRED 6
-#define CGREEN 10
+#define CGREEN 0x2A
 #define CBLUE 2
-#define CLIGHTBLUE 0x2C
+#define CLIGHTBLUE 0x11
 #define DEFAULT_FGCOLOR CBLACK // 60
 #define DEFAULT_BGCOLOR CWHITE
 
@@ -47,8 +47,8 @@ static int bgcolor = DEFAULT_BGCOLOR;
 
 struct charCell
 {
-    uint8_t fgcolor : 4;
-    uint8_t bgcolor : 4;
+    uint8_t fgcolor;
+    uint8_t bgcolor;
     char charvalue;
 };