From fb939ab0426966089f4120eeff258ca1b3787256 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sun, 5 Nov 2017 21:05:06 -0800
Subject: [PATCH] GB MBC: Remove erroneous bank 0 wrapping

---
 CHANGES                                        |   1 +
 .../emulator-only/mbc1/rom_1Mb/manifest.yml    |   1 -
 .../emulator-only/mbc1/rom_2Mb/manifest.yml    |   1 -
 .../mbc1/rom_512Kb/baseline_0000.png           | Bin 1188 -> 518 bytes
 .../emulator-only/mbc1_rom_4banks/manifest.yml |   1 -
 src/gb/mbc.c                                   |   3 ---
 6 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 cinema/gb/mooneye-gb/emulator-only/mbc1/rom_1Mb/manifest.yml
 delete mode 100644 cinema/gb/mooneye-gb/emulator-only/mbc1/rom_2Mb/manifest.yml
 delete mode 100644 cinema/gb/mooneye-gb/emulator-only/mbc1_rom_4banks/manifest.yml

diff --git a/CHANGES b/CHANGES
index 5736255f8..997e8ea96 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ Misc:
  - Qt: Prevent window from being created off-screen
  - Qt: Add option to disable FPS display
  - GBA: Improve multiboot image detection
+ - GB MBC: Remove erroneous bank 0 wrapping
 
 0.6.1: (2017-10-01)
 Bugfixes:
diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_1Mb/manifest.yml b/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_1Mb/manifest.yml
deleted file mode 100644
index a697ada66..000000000
--- a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_1Mb/manifest.yml
+++ /dev/null
@@ -1 +0,0 @@
-fail: true
diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_2Mb/manifest.yml b/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_2Mb/manifest.yml
deleted file mode 100644
index a697ada66..000000000
--- a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_2Mb/manifest.yml
+++ /dev/null
@@ -1 +0,0 @@
-fail: true
diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_512Kb/baseline_0000.png b/cinema/gb/mooneye-gb/emulator-only/mbc1/rom_512Kb/baseline_0000.png
index 282b639d387e28e53e036f95db55be9ea28d2419..30590ffab18e5deb12be845930a52ab18642fc14 100644
GIT binary patch
literal 518
zcmeAS@N?(olHy`uVBq!ia0vp^3xIe62NRHFxc>b*0|Vn(PZ!6KiaBquU+ii&U|?{x
z{qsNmo1B;Hnym>_oA=IKKFMK%PG{+y=amayKVL83P|Yc$UNGlCA=7aX<Bkc>VT-=?
z!k=yOkD14xIsL}yU*6ou>NjH3zniQ39G*S5wqpCv-MoGwmU%1ReYcCb`1o>KP3^w?
ztOf5>mpy*jtQ#kFe`4bIZO>aK*KeA(W&QeB-gmZts{j0uW&QSw+MxBj7WH4RJhN-X
q{>0ypYS_V6!tEYqAjbqaH2yLz>&fNk@rld;#jmHUpUXO@geCx}Th!<P

literal 1188
zcmeAS@N?(olHy`uVBq!ia0vp^3xIe62NRHFxc>b*0|QI8r;B4q#hkZu?v@==5MY};
zZ{L6I<>FB;3Df5<m~?(-_q;Aa&fpX4X77?ezOhlye!d*T9x;~g=7d549loZcjvFjE
z#GaSm-d216vwGiSk6V*_EN!H3t*u-0J@4iHs>?rAfA15&fAp1o-t_+x56Y|UK0j$$
z`?<fLXTSB|h%e{X=Wp5jzj0yQl=%NIYi72!@4U{q=AZL(b=HW#_57j-&+Tck{d4Bd
z*8B&TfBzTKYSPW)&OW8I*=oC-lla=`FW>e^JrZ~`ceDIGlbbeGk5|6GxhqoU(FFGH
z&s$urIaBZDxkl`L%lGrBg{1-uW94Iq-75SCw_iSIDzZ3IyZ2>o`HAC?UE;3RY~L8$
z|65E}ed|>Yv%H?gYwwk@XWLv`@vZ)o^6pz-cdUP4@cwB3ia2*uFa2F-+>df?t6+&t
zJbGlZ+`luz!iQIz-H&2Ed1B4Sn*Q0EcfvQQs^#<ei#9L2SJwTgVuSU8OY<eyn$6Qb
z#M4#0p53~!C;oe>(5iKJE4=RUSoUWZT%2FZxn*7VUOTmCX9J$dxmss>ipTzZdSs8J
zj@<kd*+AZUiLl#QHlot^)}$-sx5d3GFA?!x9%g&BYyYah^Uusa*z{GA?<;a_upfM+
z5FrDOqPlG>SW@mP&fXHuKiMkz>)z;Jg}0o$P5=F!nN(dm;pFNlzZ6Zm^3Z#AnSToI
z+ppQ{bRpV%!>en1zrK9<S@)jIMZ16BC*Lbczk6$<{~S}(*mG6cQy%{Ku-WS0x^GIA
zOSOOgj<{J^%No5{f0v}i)x_hT$r28ax$NRQ_PA(X=HB$}e?8N_iKkCXuT`$CiZ@D)
zx_$r3O8<85&zrh;Y;p}RJW^gdRb*cE>r=^JUw$hTdwqHOj>PJ_6Ay}<Xg;c0<3DZd
z=OcopbsH|9Ps>?&^mW+BUGwDs|Lax1zv%BbSC7RnX8aIJbzQC-m_0B2$J~g&KlCd#
zui04q{HPStr1SdO_HTbS8RmOR@coKwoXT$f^P^RT_Kk(R4*6|*;1fH=Yl3Ld!-qEd
zm2WrwT+|GaUlRQ#?ajL0=zxv$RgULMhMD$Nf6j@TuC=;WR_yQY=15?=nq1c#<h|w1
zll4bM4!x?s`8rH6T|4fl%bx$fQYYd=cjnptcv-z^&V~Z7)VDq+{~Xtxu-sCU6tEU(
z^6MRoq8PdEUld%wO>_6g`rJ7A=gPOgeq48O@6XpWt@3_*+ciyo-`4bhR&#twgaP*_
k91)7hb4al~R0RJqJXDcW*B5zU3Mzd(UHx3vIVCg!09gb!Gynhq

diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1_rom_4banks/manifest.yml b/cinema/gb/mooneye-gb/emulator-only/mbc1_rom_4banks/manifest.yml
deleted file mode 100644
index a697ada66..000000000
--- a/cinema/gb/mooneye-gb/emulator-only/mbc1_rom_4banks/manifest.yml
+++ /dev/null
@@ -1 +0,0 @@
-fail: true
diff --git a/src/gb/mbc.c b/src/gb/mbc.c
index 83ac2f2fc..6db033aaa 100644
--- a/src/gb/mbc.c
+++ b/src/gb/mbc.c
@@ -45,9 +45,6 @@ void GBMBCSwitchBank(struct GB* gb, int bank) {
 		mLOG(GB_MBC, GAME_ERROR, "Attempting to switch to an invalid ROM bank: %0X", bank);
 		bankStart &= (gb->memory.romSize - 1);
 		bank = bankStart / GB_SIZE_CART_BANK0;
-		if (!bank) {
-			++bank;
-		}
 	}
 	gb->memory.romBank = &gb->memory.rom[bankStart];
 	gb->memory.currentBank = bank;