From cd57802dde2c0f0335fae855bd428807f1a73a0f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 24 Apr 2020 16:12:03 -0500
Subject: [PATCH] fix loading of cgb and dmg embedded resources in
 Emulation.Cores

---
 BizHawk.Emulation.Cores/Properties/Resources.cs  |   4 ++--
 .../Resources/cgb_boot.bin.gz                    | Bin 1682 -> 0 bytes
 .../Resources/cgb_boot.rom.gz                    | Bin 0 -> 1688 bytes
 .../Resources/dmg_boot.bin.gz                    | Bin 215 -> 0 bytes
 .../Resources/dmg_boot.rom.gz                    | Bin 0 -> 226 bytes
 5 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 BizHawk.Emulation.Cores/Resources/cgb_boot.bin.gz
 create mode 100644 BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz
 delete mode 100644 BizHawk.Emulation.Cores/Resources/dmg_boot.bin.gz
 create mode 100644 BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz

diff --git a/BizHawk.Emulation.Cores/Properties/Resources.cs b/BizHawk.Emulation.Cores/Properties/Resources.cs
index e99695d179..87dce02375 100644
--- a/BizHawk.Emulation.Cores/Properties/Resources.cs
+++ b/BizHawk.Emulation.Cores/Properties/Resources.cs
@@ -15,8 +15,8 @@ namespace BizHawk.Emulation.Cores.Properties {
 		internal static readonly Lazy<byte[]> CPC_BASIC_1_1_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.1.ROM.gz"));
 		internal static readonly Lazy<byte[]> CPC_OS_6128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_OS_6128.ROM.gz"));
 		internal static readonly Lazy<byte[]> OS_464_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("OS_464.ROM.gz"));
-		internal static readonly Lazy<byte[]> SameboyCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("cgb_boot.bin.gz"));
-		internal static readonly Lazy<byte[]> SameboyDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("dmg_boot.bin.gz"));
+		internal static readonly Lazy<byte[]> SameboyCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("cgb_boot.rom.gz"));
+		internal static readonly Lazy<byte[]> SameboyDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("dmg_boot.rom.gz"));
 		internal static readonly Lazy<byte[]> SgbCartPresent_SPC = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sgb-cart-present.spc.gz"));
 		internal static readonly Lazy<byte[]> ZX_128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("128.ROM.gz"));
 		internal static readonly Lazy<byte[]> ZX_48_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("48.ROM.gz"));
diff --git a/BizHawk.Emulation.Cores/Resources/cgb_boot.bin.gz b/BizHawk.Emulation.Cores/Resources/cgb_boot.bin.gz
deleted file mode 100644
index ab0eb54bfdbeeb29f773031bd817112cd4bd807d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1682
zcmV;D25tEtiwFqP+h$n;0ApujUt(`>bS`3PZUE(0_Y2cN6uvZVT1V5=8LKvz)KTl+
zE2i#^TU6W%?g@&kHW5Ju#l3NZI1m*@R9tZzN}MPT)N?P?I;wRgzSQjx{sVs8-Fxre
zy^nj3BQI4gd&kp;x`;HhA5-Q$EF!Ylbvq<K{;X)E3<)Z4NC8q>nLtX3RqP!sCsp?2
zPs(S~BIu?>P7Ad#D={z%PI*xSzc$x13PsxQ_{JAp>J~MP)k9LGpfmkA13@fv(p<<K
z_2X;=j*G{ZGqmDkxd|C3Qt?gLLE68PWIuip<WMmWeqhzXdBjaC7>f1s*MmhE)+Zu;
zM`cM06?Dc93E;;sVY5iXFfw;B$^z2RyvZ;X&Gw8k-R!|I9!ERsXkpOImkjy_(gFSN
zm{p|Kg&VKsISU)~>TW1wO7<99tmfuITgNY1QDbyrds&<LMY+1~-)(5s?)VTgJAF2P
zxyO5Ftn5Us9=qyL?~#M!!*@52Zaj6VY=3^xup|Dre_6=wiAb~%$m=OsYG&zhg~C`U
z<PrU>r=+Jq9@-TuR;*ksR54buRGCmLTuzcaF~%bni^ZZY4pt8;TdGJg2Inu8uWW&`
zyihGzi7AdMmn(-*L8)kgl8u`+Z`7z$<7RD|wZWY#cJ0)t6K>V6QLDDCnl!_mFn&CL
z{`__8*6F(5vSmxi^y<~C(P*?^zkcV>pVt~T#Drju<1rk3OfcbQahlc;<2o46$9UcH
z<t=%>`>a_U#xQt75YGdLZ~o5t>vpcwck0^ChO_XHt7yzsJaPHXmKy1R_mNpUIgB_=
zc)}x|;LQXg(HWSep~Jyf!Q^o|oz7;n1p5%;Z1qUB^FX_H;H1Vo3#Z(+T6I+GW(e8p
z%i_r8NTKoT5{_KlsdYI=+H_?q=clja<etW78Xz<-Y15ix58gJRU}$*7D@nV}coFQ*
zeOq@*f^2^=*|r`j@tn5RzNHZwMhh+*bX&bm6@WM)(wBaX@&MmcS^#@(xe&^a9Dda$
z<RqaP7p83WSrY67M8*+lAZf=B>-Y0<dJ)6}8ml?}IZ2fGmXFpSIs9thsR&IdelhQp
z(#;A}RXjcvEl)Gv5>>0$s98&Hyno~Vjg4hQc>{u=$S7;sRtW^4D4O<qQ5pc{L*5($
zh!EoJpa2|?$5nLB!L2pO1|Yz^dEg0$(Pyv&5RcHb=`-ieLju@D*U-#+Z$5mPs(j;l
z^#R3|#KdfxC~+a+&E=t|v!4^PL!!tDH9IjO%d%nx90)>q%$SK2Crzp!pYZ<uqerLD
zom;bJEnv+-ge(9;;V|4PF3aA4m9^jkYk>v`!2b<O7y!hdR5cz41FocfcU6Jn39_8{
z@Zrt9nW}B43DI@SvV{O3>_9$vFzz56E&*xgHf2CuRaFGA0AMCm0F+9wt<UMhhu1=4
zv{TRNP=U{hEF=qMfIH-XzQb1APdF{DrKeIQOVt_a8vEm&DsC2~a3&Rel?pb%nMqPa
ziWm>XfSsC=Y99T3$1p4U%qENnzc)xhWhN<PNU0IgPey2cixMS5B}=YP)!vzE6m_L)
zM<jzyn}ZlO085GARKuLYOgUAguOqG$>1zb%x>+B5<|BUm!C;5+E_R5b?Y^5ocDFG8
zWQh85mQGrMs862o&}&gqI>M)?z7s}A{Ac(_PD3dYVqDHQ{|HkUXACpzHH-V8!@&Bn
z36)YYZSr2y_G3eR6Q-4*k+T%afY1?UBX3GQamx2lZQ=N%dBv&j_6*9C<f(~}r8(cL
zxQ&l(D64vuu_)Y_XFoQjtSY$f$7YmO6;~5$P%OuwnAXCNKZ?jT)#?*18QX{7PrcHp
z4*Ov0smY_0ciMlfP3_0`r=IFPI%(`MT4<Vh&BdVhdBQ06Kupq(TEu5=XYQnWVt3fb
zKZ*U^&2>8?*0)|aN_0<oC|Ck^rKU}JNGyW$OnyjPG}v1vKTKE&Q06}vFg#C}-gl-*
zlO=<}EQXGG(md{UIx(aJ<5vsyoZ)Ya9c|@2v{z-hq^y&a0+OL%g3_q+!@!x7EXprb
z`K)lcjiN;#=AY)&sQpCvm)L*wOy<GK%Rh?cWOO5!QBqWCN7l1c?21G(kRQ^`1HL;?
zT{`I0H=WjBMZp_;T2GHXtq;?!C!c!sKdyJ-=$%(a(1%#xgkpYp1{v@w#h!92#L6q!
c{0*YMYVcYr1^CP>1N|Fc0ZEBGNB{`{0A3e5XaE2J

diff --git a/BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz b/BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz
new file mode 100644
index 0000000000000000000000000000000000000000..586e10299959bc778254d4d01ad8a5d40a3d1e49
GIT binary patch
literal 1688
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

literal 0
HcmV?d00001

diff --git a/BizHawk.Emulation.Cores/Resources/dmg_boot.bin.gz b/BizHawk.Emulation.Cores/Resources/dmg_boot.bin.gz
deleted file mode 100644
index 85f1e8276a20c915a780bf8d228032451b736ab4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 215
zcmV;|04V<-iwFqP+h$n;0Ay`vUt(`>bS`3PZU8g<_g|5rLFsgk#&5fZ2Wk%l?LI#c
zdZ21o{y@d<&jWWs7Dh#Z1}XQmO$<OJT>Z{O;gjGR20jicVI^f=g`akkuLNc)>d)lk
zvDM%(0t)EyOMJDP_`rcp_v}0dyXLb?8QAzitb-udG$2cH1LM<=ioT4D!VH2p7!Lnq
zuw&t4IIZyYwBX0ng0>1@E0vU$luv$e`8Pq~*U7Wf8CZeT17W-N2O=kJoOUkVxzx#q
RfokAE002P!A@=|Q005=QWzzrv

diff --git a/BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz b/BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6096a5745bfca48c67139db647eea439c725fbbd
GIT binary patch
literal 226
zcmV<803H7yiwFqP+h$n=0Ay`vUt(`>bS`plZ2+yvJrBW97zN<B31XmJHDJ28MJxz0
z@<v2rlK3HZ5lh2hWg!+@H-ptErl#p`d>4yBe58Yql=eS3Imvl)D(+W+u3G)V8+FPP
z!v`fOhXcyuhdL}EiMXEW*kkajj4m~PXB&{i8Aa8i{E6vvd?m^&InpSEtKLzHr5v17
zGgP$KfD_w*P|Vlf*TR$7N~fFXN|FNX2nQE1AcMsni`^{N;LcFhRL#7$-5GzG_7Z~L
ckb+Z6n)TMs*cq)l{4Lb`0YLpB_W%I^0C~4+jQ{`u

literal 0
HcmV?d00001