Corrections and fixes to last batch of mapper additions

Author: negativeExponent

src/mappers_wip/mapper273.c

@@ -38,11 +38,11 @@ static SFORMAT StateRegs[] = {
 	{ 0 }
 };
 
-static void SetPRGBank_vrc2(uint16 A, uint16 V) {
+static void SetPRG(uint16 A, uint16 V) {
 	setprg8(A, (V & 0x1F));
 }
 
-static void SetCHRBank_vrc2(uint16 A, uint16 V) {
+static void SetCHR(uint16 A, uint16 V) {
 	setchr1(A, (V & 0x1FF));
 }
 
@@ -87,6 +87,8 @@ static void Power(void) {
 
 void Mapper273_Init(CartInfo *info) {
 	VRC24_Init(info, VRC24_VRC2, 0x04, 0x08, 0, 0);
+	VRC24_pwrap = SetPRG;
+	VRC24_cwrap = SetCHR;
 	info->Power = Power;
 	MapIRQHook = CPUCycle;
 	AddExState(StateRegs, ~0, 0, 0);

src/mappers_wip/mapper474.c

@@ -20,7 +20,7 @@
 
 /* NTDEC N625231*/
 
- #include "mapinc.h"
+#include "mapinc.h"
 #include "mmc3.h"
 
 static struct {
@@ -32,10 +32,6 @@ static SFORMAT StateRegs[] = {
 	{ 0 }
 };
 
-static void SetCHR(uint16 A, uint16 V) {
-	setchr1(A, ((m474.reg << 7) & 0x100) | V);
-}
-
 static void SyncPRG(void) {
 	uint16 base = (m474.reg << 5) & 0x20;
 	uint16 bank = base | (m474.reg >> 3) & 0x1F;
@@ -48,6 +44,10 @@ static void SyncPRG(void) {
 	}
 }
 
+static void SetCHR(uint16 A, uint16 V) {
+	setchr1(A, ((m474.reg << 7) & 0x100) | V);
+}
+
 static DECLFW(WriteExtra) {
 	if (A & 0x100) {
 		m474.reg = V;

src/mappers_wip/mapper476.c

@@ -90,8 +90,13 @@ static void Power(void) {
 	SetWriteHandler(0x5000, 0x5FFF, writeReg);
 }
 
+static void StateRestore(int version) {
+	Sync();
+}
+
 void Mapper476_Init(CartInfo *info) {
 	info->Power = Power;
 	info->Reset = Reset;
+	GameStateRestore = StateRestore;
 	AddExState(StateRegs, ~0, 0, NULL);
 }

src/mappers_wip/mapper477.c

@@ -35,12 +35,11 @@ static DECLFW(WriteLatch) {
 	/* Resistors placed on the first 128 KiB PRG ROM chip (banks 8-15) cause ROM
 	 * to always win D0..D3. Otherwise, normal AND-type bus conflicts. */
 	if (latch.data & 0x08) {
-		latch.data = ((CartBR(A) & 0x0F) | ((V & CartBR(A)) & ~0x0F));
-		Sync();
+		V = ((CartBR(A) & 0x0F) | ((V & CartBR(A)) & ~0x0F));
 	} else {
-		latch.data = (CartBR(A) & V);
-		Sync();
+		V = (CartBR(A) & V);
 	}
+	Latch_Write(A, V);
 }
 
 static void Power(void) {

src/mappers_wip/mapper488.c

@@ -59,7 +59,6 @@ static void Power(void) {
 }
 
 void Mapper488_Init(CartInfo *info) {
-	m488.dipsw = 0;
     Latch_Init(info, Sync, Read, 0, 0);
     info->Power = Power;
 	info->Reset = Reset;

src/mappers_wip/mapper490.c

@@ -32,13 +32,6 @@ static SFORMAT StateRegs[] = {
 	{ 0 }
 };
 
-static void SetCHR(uint16 A, uint16 V) {
-	uint16 mask = 0xFF;
-	uint16 base = (m490.reg << 4);
-
-	setchr1(A, ((base & ~mask) | (V & mask)));
-}
-
 static void SyncPRG(void) {
 	if (m490.reg & 0x20)
 		setprg32(0x8000, m490.reg >> 1);
@@ -48,6 +41,13 @@ static void SyncPRG(void) {
 	}
 }
 
+static void SetCHR(uint16 A, uint16 V) {
+	uint16 mask = 0xFF;
+	uint16 base = (m490.reg << 4);
+
+	setchr1(A, ((base & ~mask) | (V & mask)));
+}
+
 static DECLFR(ReadDIP) {
 	if (m490.reg & 0x80) {
 		A &= 0x0F;