Added option to disable 8-sprite per line limit in NES

Author: ducalex

README.md

@@ -20,6 +20,7 @@ Retro-Go is composed of a launcher and several emulators.
 - Fastforward
 - Customizable launcher
 - PNG cover art
+- And more!
 
 # Screenshot
 ![Preview](https://raw.githubusercontent.com/ducalex/retro-go/master/assets/screenshot.jpg)

components/odroid/odroid_overlay.c

@@ -165,7 +165,7 @@ void odroid_overlay_draw_dialog(char *header, odroid_dialog_choice_t *options, i
     uint16_t fg, bg, color;
     for (int i = 0; i < options_count; i++)
     {
-        color = options[i].enabled ? box_text_color : C_GRAY;
+        color = options[i].enabled == 1 ? box_text_color : C_GRAY;
         fg = (i == sel) ? box_color : color;
         bg = (i == sel) ? color : box_color;
         odroid_overlay_draw_text(x, y + i * ODROID_FONT_HEIGHT, width * ODROID_FONT_WIDTH, rows[i], fg, bg);
@@ -251,6 +251,11 @@ int odroid_overlay_dialog(char *header, odroid_dialog_choice_t *options, int opt
         }
         if (sel_old != sel)
         {
+            int dir = sel - sel_old;
+            while (options[sel].enabled == -1 && sel_old != sel)
+            {
+                sel = (sel + dir) % options_count;
+            }
             odroid_overlay_draw_dialog(header, options, options_count, sel);
             sel_old = sel;
         }

components/odroid/odroid_overlay.h

@@ -29,7 +29,7 @@ struct odroid_dialog_choice {
     int  id;
     char label[32];
     char value[16];
-    bool enabled;
+    int8_t enabled;
     bool (*update_cb)(odroid_dialog_choice_t *, odroid_dialog_event_t);
 };
 

nesemu-go/components/nofrendo/nes/nes_ppu.c

@@ -63,6 +63,11 @@ void ppu_displaysprites(bool display)
    ppu.drawsprites = display;
 }
 
+void ppu_limitsprites(bool limit)
+{
+   ppu.limitsprites = limit;
+}
+
 void ppu_setcontext(ppu_t *src_ppu)
 {
    int nametab[4];
@@ -136,6 +141,7 @@ ppu_t *ppu_create(void)
    temp->vromswitch = NULL;
    temp->vram_present = false;
    temp->drawsprites = true;
+   temp->limitsprites = true;
 
    ppu_setnpal(temp, 0); // Set default palette
 
@@ -875,7 +881,7 @@ static void IRAM_ATTR ppu_renderoam(uint8 *vidbuf, int scanline)
          ppu_setstrike(strike_pixel);
 
       /* maximum of 8 sprites per scanline */
-      if (++spritecount == PPU_MAXSPRITE)
+      if (++spritecount == PPU_MAXSPRITE && ppu.limitsprites)
       {
          ppu.stat |= PPU_STATF_MAXSPRITE;
          break;

nesemu-go/components/nofrendo/nes/nes_ppu.h

@@ -115,6 +115,7 @@ typedef struct ppu_s
 
    bool vram_present;
    bool drawsprites;
+   bool limitsprites;
 } ppu_t;
 
 typedef struct
@@ -165,6 +166,7 @@ extern void ppu_setnpal(ppu_t *src_ppu, int n);
 extern void ppu_dumppattern(bitmap_t *bmp, int table_num, int x_loc, int y_loc, int col);
 extern void ppu_dumpoam(bitmap_t *bmp, int x_loc, int y_loc);
 extern void ppu_displaysprites(bool display);
+extern void ppu_limitsprites(bool limit);
 
 #endif /* _NES_PPU_H_ */
 

nesemu-go/main/main.c

@@ -18,6 +18,8 @@
 
 #define PIXEL_MASK 0x3F
 
+#define NVS_KEY_LIMIT_SPRITES "limitspr"
+
 static char* romPath;
 static char* romData;
 static size_t romSize;
@@ -123,6 +125,7 @@ void osd_loadstate()
       LoadState();
    }
 
+   ppu_limitsprites(odroid_settings_int32_get(NVS_KEY_LIMIT_SPRITES, 1));
    ppu_setnpal(nes_getcontextptr()->ppu, odroid_settings_Palette_get());
 }
 
@@ -199,17 +202,31 @@ void IRAM_ATTR osd_blitscreen(bitmap_t *bmp)
 }
 
 
-static bool more_settings_cb(odroid_dialog_choice_t *option, odroid_dialog_event_t event)
+bool sprite_limit_cb(odroid_dialog_choice_t *option, odroid_dialog_event_t event)
+{
+   int val = odroid_settings_int32_get(NVS_KEY_LIMIT_SPRITES, 1);
+
+   if (event == ODROID_DIALOG_PREV || event == ODROID_DIALOG_NEXT) {
+      val = val ? 0 : 1;
+      odroid_settings_int32_set(NVS_KEY_LIMIT_SPRITES, val);
+      ppu_limitsprites(val);
+   }
+
+   strcpy(option->value, val ? "On " : "Off");
+
+   return event == ODROID_DIALOG_ENTER;
+}
+
+static bool advanced_settings_cb(odroid_dialog_choice_t *option, odroid_dialog_event_t event)
 {
    if (event == ODROID_DIALOG_ENTER) {
-      odroid_dialog_choice_t choices[] = {
-         {1, "APU FC IRQ", "Auto", 1, NULL},
-         {2, "Region", "NTSC", 1, NULL},
-         {2, "Sprite Limit", "On", 1, NULL}, // PPU_MAXSPRITE
-         {3, "", "", 1, NULL},
-         {0, "Reset all", "", 1, NULL},
+      odroid_dialog_choice_t options[] = {
+         {1, "Region", "NTSC", 1, NULL},
+         {2, "Sprite limit", "On ", 1, &sprite_limit_cb},
+         // {4, "", "", 1, NULL},
+         //{0, "Reset all", "", 1, NULL},
       };
-      odroid_overlay_dialog("Compatibility", choices, 5, 0);
+      odroid_overlay_dialog("Advanced", options, sizeof(options) / sizeof(options[0]), 0);
    }
    return false;
 }
@@ -264,11 +281,10 @@ void osd_getinput(void)
    else if (joystick.values[ODROID_INPUT_VOLUME]) {
       odroid_dialog_choice_t options[] = {
             {100, "Palette", "Default", 1, &palette_update_cb},
-            // {100, "", "", 0, NULL},
-            // {100, "APU FC IRQ", "Auto", 1, NULL},
-            // {200, "More settings...", "", 1, &more_settings_cb},
+            {101, "", "", -1, NULL},
+            {101, "More...", "", 1, &advanced_settings_cb},
       };
-      odroid_overlay_game_settings_menu(options, 1);
+      odroid_overlay_game_settings_menu(options, sizeof(options) / sizeof(options[0]));
    }
 
 	// A

retro-go/main/main.c

@@ -222,7 +222,7 @@ void retro_loop()
                 odroid_dialog_choice_t choices[] = {
                     {0, "Date", COMPILEDATE, 1, NULL},
                     {0, "Commit", GITREV, 1, NULL},
-                    {0, "", "", 0, NULL},
+                    {0, "", "", -1, NULL},
                     {1, "Reboot to firmware", "", 1, NULL},
                     {0, "Close", "", 1, NULL},
                 };
@@ -237,7 +237,7 @@ void retro_loop()
             else if (joystick.values[ODROID_INPUT_VOLUME]) {
                 last_key = ODROID_INPUT_VOLUME;
                 odroid_dialog_choice_t choices[] = {
-                    {0, "---", "", 0, NULL},
+                    {0, "---", "", -1, NULL},
                     {0, "Color theme", "1/10", 1, &color_shift_cb},
                     {0, "Font size", "Small", 1, &font_size_cb},
                     {0, "Show cover", "Yes", 1, &show_cover_cb},