git.y1.nz

commit 3bde784227ede36869f44163c94c22a60a231d24
parent 7a413072f03f333a796a51056533c553f9b8c1b0
Author: Toxa <56631470+untoxa@users.noreply.github.com>
Date:   Sun, 23 Jul 2023 23:17:55 +0300

Merge pull request #552 from michel-iwaniec/nes_change_system_define

NES: Change system define: NINTENDO_ENTERTAINMENT_SYSTEM -> NINTENDO_NES
Diffstat:
M
gbdk-lib/examples/cross-platform/banks_autobank/src/banks.c
2
+-
M
gbdk-lib/examples/cross-platform/large_map/src/large_map.c
2
+-
M
gbdk-lib/examples/cross-platform/metasprites/src/metasprites.c
2
+-
M
gbdk-lib/examples/cross-platform/scroller/src/text_scroller.c
4
++--
M
gbdk-lib/include/nes/nes.h
2
+-

5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gbdk-lib/examples/cross-platform/banks_autobank/src/banks.c b/gbdk-lib/examples/cross-platform/banks_autobank/src/banks.c
@@ -23,7 +23,7 @@ void main(void)
 {
   uint8_t _saved_bank;
 
-  #if !defined(MSXDOS) && !defined(NINTENDO_ENTERTAINMENT_SYSTEM) // TODO
+  #if !defined(MSXDOS) && !defined(NINTENDO_NES) // TODO
   set_default_palette();
   #endif
   printf("Program Start...\n\n");
diff --git a/gbdk-lib/examples/cross-platform/large_map/src/large_map.c b/gbdk-lib/examples/cross-platform/large_map/src/large_map.c
@@ -184,7 +184,7 @@ void main(void){
     if (_cpu == CGB_TYPE) {
         set_bkg_palette(BKGF_CGB_PAL0, bigmap_PALETTE_COUNT, bigmap_palettes);
     }
-#elif defined(NINTENDO_ENTERTAINMENT_SYSTEM)
+#elif defined(NINTENDO_NES)
     set_bkg_palette(0, bigmap_PALETTE_COUNT, bigmap_palettes);
 #endif 
 
diff --git a/gbdk-lib/examples/cross-platform/metasprites/src/metasprites.c b/gbdk-lib/examples/cross-platform/metasprites/src/metasprites.c
@@ -163,7 +163,7 @@ void main(void) {
     set_sprite_palette(OAMF_CGB_PAL1, 1, pink_pal);
     set_sprite_palette(OAMF_CGB_PAL2, 1, cyan_pal);
     set_sprite_palette(OAMF_CGB_PAL3, 1, green_pal);
-#elif defined(NINTENDO_ENTERTAINMENT_SYSTEM)
+#elif defined(NINTENDO_NES)
     set_sprite_palette(4, 1, gray_pal);
     set_sprite_palette(5, 1, pink_pal);
     set_sprite_palette(6, 1, cyan_pal);
diff --git a/gbdk-lib/examples/cross-platform/scroller/src/text_scroller.c b/gbdk-lib/examples/cross-platform/scroller/src/text_scroller.c
@@ -11,7 +11,7 @@ const uint8_t * scanline_offsets = scanline_offsets_tbl;
 
 uint8_t scroller_x = 0;
 void scanline_isr(void) {
-#if defined(NINTENDO_ENTERTAINMENT_SYSTEM)
+#if defined(NINTENDO_NES)
     // Write directly to hardware scroll registers (only first write will have an effect)
     PPUSCROLL = scroller_x;
     PPUSCROLL = 0; // 2nd write (dummy)
@@ -89,7 +89,7 @@ void main(void) {
             // put next char
             set_vram_byte(scroller_vram_addr, *scroller_next_char - 0x20);
         }
-#ifdef NINTENDO_ENTERTAINMENT_SYSTEM
+#ifdef NINTENDO_NES
         // Normal indirect setting of scroll via shadow registers (written by vblank handler)
         move_bkg(0,0);
         _lcd_scanline = SCROLL_POS;
diff --git a/gbdk-lib/include/nes/nes.h b/gbdk-lib/include/nes/nes.h
@@ -10,7 +10,7 @@
 #include <nes/hardware.h>
 #include <nes/rgb_to_nes_macro.h>
 
-#define NINTENDO_ENTERTAINMENT_SYSTEM
+#define NINTENDO_NES
 #ifdef SEGA
 #undef SEGA
 #endif

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.