From ad9a766a56aa6bc4aacad97f4e65462fb182ec54 Mon Sep 17 00:00:00 2001
From: ISSOtm <eldredhabert0@gmail.com>
Date: Sat, 1 May 2021 23:48:23 +0200
Subject: [PATCH] Allow dollar-prefixed hex for RGBFIX -m

Fixes #872
---
 src/fix/main.c            |  10 ++++++++--
 test/fix/dollar-hex.bin   | Bin 0 -> 512 bytes
 test/fix/dollar-hex.err   |   1 +
 test/fix/dollar-hex.flags |   1 +
 test/fix/dollar-hex.gb    | Bin 0 -> 512 bytes
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 test/fix/dollar-hex.bin
 create mode 100644 test/fix/dollar-hex.err
 create mode 100644 test/fix/dollar-hex.flags
 create mode 100644 test/fix/dollar-hex.gb

diff --git a/src/fix/main.c b/src/fix/main.c
index af8c33f0..c3db145f 100644
--- a/src/fix/main.c
+++ b/src/fix/main.c
@@ -151,10 +151,16 @@ static bool readMBCSlice(char const **name, char const *expected)
 
 static enum MbcType parseMBC(char const *name)
 {
-	if (name[0] >= '0' && name[0] <= '9') {
+	if ((name[0] >= '0' && name[0] <= '9') || name[0] == '$') {
+		int base = 0;
+
+		if (name[0] == '$') {
+			name++;
+			base = 16;
+		}
 		// Parse number, and return it as-is (unless it's too large)
 		char *endptr;
-		unsigned long mbc = strtoul(name, &endptr, 0);
+		unsigned long mbc = strtoul(name, &endptr, base);
 
 		if (*endptr)
 			return MBC_BAD;
diff --git a/test/fix/dollar-hex.bin b/test/fix/dollar-hex.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8c56fd22eb0d17dfa06460414d8e355f31b869e3
GIT binary patch
literal 512
zcmV+b0{{JXABPMhao6a8-o+E=uoc!Z24b5{ne^xvJyjqpujIs-2F+9^3|q(nCH`K?
zB`RO;!_RF8POL>eh|c*j%4>S>#gc149v)_@y5VLDGvaePXf2|A=w4p1Z9@sAXqkem
zuW>Zs4b*GYTHHtu%$X_pCQ~_wo2one+37uYx|18QH*-Nf#MhR`&^_iE?_Op0c5b{B
zfBfftLSPT-wFOh>e8=4IKD&hS)DuA1g2%NeO^%{*f<b`=<F#k_1I6ed=M!@=rrs7K
zRg4N-LX7%X9jV#Ofk5v&Ro)v%+8(!nVVgieN4YP-{8X|tV<*>Eb3y=1{ZBhWE5oyR
z#-f>?*6Qt0_i<jNzucX+vb@(`Ud%z;ifcARRTW(j+0EjI$Dr-tlPU@_R_(Sx)^kx!
zwhJ#p`;>(EgZevz#ezA<UiJIb4@(`@-PGG!1@LR>s#t4+M|9gXbG1nTAI^M``H^Lo
zi~aWZFManvz&%lYal{+cm$`CqwccgfhYim5-h6khmxLGRH|qENj(5P?tI6R}hh(D9
zFtT2%^K%0mj2~+6$E942p_hUSS5qTXcRX^y)nQ^>QxdP^0b4fFNuYni+iG@FqA|1E
zWa{D(v-3f?mx}-<g9=cUg~bmSdjwr-AMRP8TcyMKJg8WgRxLi^ZjouAtCwRzo;jWH
C)&=hX

literal 0
HcmV?d00001

diff --git a/test/fix/dollar-hex.err b/test/fix/dollar-hex.err
new file mode 100644
index 00000000..84c93183
--- /dev/null
+++ b/test/fix/dollar-hex.err
@@ -0,0 +1 @@
+warning: Overwrote a non-zero byte in the cartridge type
diff --git a/test/fix/dollar-hex.flags b/test/fix/dollar-hex.flags
new file mode 100644
index 00000000..40f14473
--- /dev/null
+++ b/test/fix/dollar-hex.flags
@@ -0,0 +1 @@
+-m '$2a'
diff --git a/test/fix/dollar-hex.gb b/test/fix/dollar-hex.gb
new file mode 100644
index 0000000000000000000000000000000000000000..197cdce8e90c2771b4db0931085cfd53b5d11920
GIT binary patch
literal 512
zcmV+b0{{JXABPMhao6a8-o+E=uoc!Z24b5{ne^xvJyjqpujIs-2F+9^3|q(nCH`K?
zB`RO;!_RF8POL>eh|c*j%4>S>#gc149v)_@y5VLDGvaePXf2|A=w4p1Z9@sAXqkem
zuW>Zs4b*GYTHHtu%$X_pCQ~_wo2one+37uYx|18QH*-Nf#MhR`&^_iE?_Op0c5b{B
zfBfftLSPT-wFOh>e8=4IKD&hS)DuA1g2%NeO^%{*f<b`=<F#k_1I6ed=M!@=rrs7K
zRg4N-LX7%X9jV#Ofk5v&Ro)v%+8(!nVVgieN4YP-{8X|tV<*>Eb3y=1{ZBhWE5oyR
z#-f>?*6Qt0_i<jNzucX+vb@(`Ud%z;ifcARRTW(j+0EjI$Dr-tlPU@_R_(Sx)^kx!
zwhJ#p`;>(EgZevz#ezA<UiJIb4@)Z5-PGG!1@LR>s#t4+M|9gXbG1nTAI^M``H^Lo
zi~aWZFManvz&%lYal{+cm$`CqwccgfhYim5-h6khmxLGRH|qENj(5P?tI6R}hh(D9
zFtT2%^K%0mj2~+6$E942p_hUSS5qTXcRX^y)nQ^>QxdP^0b4fFNuYni+iG@FqA|1E
zWa{D(v-3f?mx}-<g9=cUg~bmSdjwr-AMRP8TcyMKJg8WgRxLi^ZjouAtCwRzo;jWR
CI|cjz

literal 0
HcmV?d00001