From a4a623b6c361aa33fa3e5d1d95a14126d7ced550 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 1 Apr 2025 01:16:54 +0200
Subject: [PATCH] Mappers 500-502: Fixed one-screen mirroring; reset to menu

---
 src/boards/500.c |  6 ++++++
 src/boards/501.c |  8 +++++++-
 src/boards/502.c | 15 ++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/boards/500.c b/src/boards/500.c
index ef3e8d4..0ecfa0e 100644
--- a/src/boards/500.c
+++ b/src/boards/500.c
@@ -51,8 +51,14 @@ static void M500Power() {
     SetWriteHandler(0x6000, 0x6FFF, M500WriteReg);
 }
 
+static void M500Reset() {
+    reg[0] = reg[1] = 0;
+    Sync();
+}
+
 void Mapper500_Init(CartInfo *info) {
 	Latch_Init(info, Sync, NULL, 0, 0);
 	info->Power = M500Power;
+	info->Reset = M500Reset;
     AddExState(StateRegs, ~0, 0, NULL);
 }
diff --git a/src/boards/501.c b/src/boards/501.c
index 0a49c3b..42564fd 100644
--- a/src/boards/501.c
+++ b/src/boards/501.c
@@ -33,7 +33,7 @@ static void Sync(void) {
 	setprg4(0x7000, 0);
 	setprg32(0x8000, (reg[0] << 2) + (latch.data & 7));
 	setchr8(0);
-	setmirror(MI_0 + (reg[1] & 1));
+	setmirror(latch.data &0x10? MI_1: MI_0);
 }
 
 static DECLFW(M501WriteReg) {
@@ -50,8 +50,14 @@ static void M501Power() {
     SetWriteHandler(0x6000, 0x6FFF, M501WriteReg);
 }
 
+static void M501Reset() {
+    reg[0] = reg[1] = 0;
+    Sync();
+}
+
 void Mapper501_Init(CartInfo *info) {
 	Latch_Init(info, Sync, NULL, 0, 0);
 	info->Power = M501Power;
+	info->Reset = M501Reset;
     AddExState(StateRegs, ~0, 0, NULL);
 }
diff --git a/src/boards/502.c b/src/boards/502.c
index 8f23de2..a6320d6 100644
--- a/src/boards/502.c
+++ b/src/boards/502.c
@@ -39,11 +39,10 @@ static void Sync(void) {
 		setprg16(0xC000, (reg[0] << 3) + mask);
 	}
 	setchr8(0);
-    if (reg[1] & 2) {
-        setmirror(MI_0 + (latch.data >> 4) & 1);
-    } else {
-	    setmirror(reg[1] & 1);
-    }
+	if (reg[1] &2)
+		setmirror(latch.data &0x10? MI_1: MI_0);
+	else
+		setmirror(reg[1] &0x01? MI_V: MI_H);
 }
 
 static DECLFW(M502WriteReg) {
@@ -60,8 +59,14 @@ static void M502Power() {
     SetWriteHandler(0x6000, 0x6FFF, M502WriteReg);
 }
 
+static void M502Reset() {
+    reg[0] = reg[1] = 0;
+    Sync();
+}
+
 void Mapper502_Init(CartInfo *info) {
 	Latch_Init(info, Sync, NULL, 0, 0);
 	info->Power = M502Power;
+	info->Reset = M502Reset;
     AddExState(StateRegs, ~0, 0, NULL);
 }