From 68ab9b6f2b5575d083b14b8a6da459a67af53d58 Mon Sep 17 00:00:00 2001
From: sakman55 <sakman55@users.noreply.github.com>
Date: Sat, 23 Nov 2024 12:15:23 -1000
Subject: [PATCH] Update NES.ino

Fixed Mapper 59.  Updated the index to the code sections.
---
 Cart_Reader/NES.ino | 50 ++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/Cart_Reader/NES.ino b/Cart_Reader/NES.ino
index a5d2f159..14f8264b 100644
--- a/Cart_Reader/NES.ino
+++ b/Cart_Reader/NES.ino
@@ -8,21 +8,19 @@
 #ifdef ENABLE_NES
 
 //Line Content
-//28   Supported Mappers
-//106  Defines
-//136  Variables
-//197  Menus
-//383  Setup
-//412  No-Intro SD Database Functions
-//1125 Low Level Functions
-//1372 CRC Functions
-//1426 File Functions
-//1527 NES 2.0 Header Functions
-//1957 Config Functions
-//2760 ROM Functions
-//3951 RAM Functions
-//4384 Eeprom Functions
-//4574 NESmaker Flash Cart Functions
+//37   Supported Mappers
+//185  Defines
+//211  Variables
+//242  Menus
+//456  Setup
+//486  No-Intro SD Database Functions
+//803  Low Level Functions
+//1012 File Functions
+//1083 Config Functions
+//1701 ROM Functions
+//3666 RAM Functions
+//4066 Eeprom Functions
+//4254 NESmaker Flash Cart Functions
 
 struct mapper_NES {
   uint16_t mapper;
@@ -995,6 +993,20 @@ static void write_wram_byte(unsigned int address, uint8_t data) {  // Mapper 5 (
   PHI2_HI;
 }
 
+// Pirate Mapper 59
+static void write_reg_m59(unsigned int address) {
+  ROMSEL_HI;
+  MODE_WRITE;
+  PRG_WRITE;
+  set_address(address);
+  set_romsel(address);
+  _delay_us(1); // WRITING
+  ROMSEL_HI;
+  PRG_READ;
+  MODE_READ;
+  set_address(0);
+}
+
 /******************************************
    File Functions
  *****************************************/
@@ -2169,9 +2181,9 @@ void readPRG(bool readrom) {
 
       case 59:
         banks = int_pow(2, prgsize);
-        for (size_t i = 0; i < banks; i++) {
-          write_prg_byte((0x8000 + (i & 0x07)) << 4 | 0x80, 0);
-          dumpBankPRG(0x0, 0x4000, base);
+        for (size_t i = 0; i < banks; i += 2) {
+          write_reg_m59(0x8000 + ((i & 0x07) << 4));
+          dumpBankPRG(0x0, 0x8000, base);
         }
         break;
 
@@ -3201,7 +3213,7 @@ void readCHR(bool readrom) {
         case 59:
           banks = int_pow(2, chrsize) / 2;
           for (size_t i = 0; i < banks; i++) {
-            write_prg_byte(0x8000 + (i & 0x07), 0);
+            write_reg_m59(0x8000 + (i & 0x07));
             dumpBankCHR(0x0, 0x2000);
           }
           break;