From 6ab3f6a4638630b46e15912e492821a875321a8e Mon Sep 17 00:00:00 2001
From: pjgat09 <pjgat09@gmail.com>
Date: Sat, 8 Jun 2013 03:36:57 +0000
Subject: [PATCH] N64: Added SaveType to the gamedb, but only for 16K EEPROM
 since all the other options are ignored. This fixes a "no controller" issue
 with Banjo Tooie

---
 .../Consoles/Nintendo/N64/N64.cs              |   4 +-
 .../Consoles/Nintendo/N64/mupen64plusApi.cs   |  10 ++-
 BizHawk.MultiClient/MainForm.cs               |   7 +-
 .../output/dll/mupen64plus.dll                | Bin 427520 -> 427008 bytes
 .../output/gamedb/gamedb_n64.txt              |  76 +++++++++---------
 .../mupen64plus-core/src/main/rom.c           |  18 +++++
 6 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
index 28bc4629b7..aee3013cef 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
@@ -273,13 +273,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 
 		mupen64plusApi api;
 
-		public N64(CoreComm comm, GameInfo game, byte[] rom, VideoPluginSettings video_settings)
+		public N64(CoreComm comm, GameInfo game, byte[] rom, VideoPluginSettings video_settings, int SaveType)
 		{
 			CoreComm = comm;
 			this.rom = rom;
 			this.game = game;
 
-			api = new mupen64plusApi(this, rom, video_settings);
+			api = new mupen64plusApi(this, rom, video_settings, SaveType);
 			api.SetM64PInputCallback(new mupen64plusApi.InputCallback(setControllers));
 
 			InitMemoryDomains();
diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
index d97746e264..3b68d5d414 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
@@ -406,7 +406,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 		IntPtr AudDll;
 		IntPtr InpDll;
 
-		public mupen64plusApi(N64 bizhawkCore, byte[] rom, VideoPluginSettings video_settings)
+		public mupen64plusApi(N64 bizhawkCore, byte[] rom, VideoPluginSettings video_settings, int SaveType)
 		{
 			if (AttachedCore != null)
 			{
@@ -452,6 +452,14 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 			// Start up the core
 			m64p_error result = m64pCoreStartup(0x20001, "", "", "Core", (IntPtr foo, int level, string Message) => { }, "", IntPtr.Zero);
 
+			// Set the savetype if needed
+			if (SaveType != 0)
+			{
+				IntPtr core_section = IntPtr.Zero;
+				m64pConfigOpenSection("Core", ref core_section);
+				m64pConfigSetParameter(core_section, "SaveType", m64p_type.M64TYPE_INT, ref SaveType);
+			}
+
 			// Pass the rom to the core
 			result = m64pCoreDoCommandByteArray(m64p_command.M64CMD_ROM_OPEN, rom.Length, rom);
 
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 88125dba1c..1da9854f39 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2486,7 +2486,12 @@ namespace BizHawk.MultiClient
 								{
 									Global.Game = game;
 									VideoPluginSettings video_settings = N64GenerateVideoSettings(game);
-									nextEmulator = new N64(nextComm, game, rom.RomData, video_settings);
+									int SaveType = 0;
+									if (game.OptionValue("SaveType") == "EEPROM_16K")
+									{
+										SaveType = 1;
+									}
+									nextEmulator = new N64(nextComm, game, rom.RomData, video_settings, SaveType);
 								}
 								break;
 						}
diff --git a/BizHawk.MultiClient/output/dll/mupen64plus.dll b/BizHawk.MultiClient/output/dll/mupen64plus.dll
index 0b8a9a97d89059931775ea0a9c518e4dd3b5c174..037610c88b33aea2343f9268dceb63ab1638ba9d 100644
GIT binary patch
delta 14920
zcmeHtd0Z4n^Y`@3fGdZt%B7%ktXHCBXLojYcCJMQgJ(cd@j^7H>lut-P%#isbirUS
zwi@FVyw8Zbh!^odydoMk9%x8nbXANb@gN4}t=R=7&+qrXf4qM`^YOdgU0v1HM|D-r
zU}ko!%&b;>)F|ZT#=Wsb-BUr3A)d&CAbQXQ!IMsEd>(_|>-0&rJ3$f=h#=I?e{V}y
zv+OcWm{kOkl(z_lq4>O=@LQdC37L#1qF^i#a*herhEFg-B!+*SG%95jK{TEPJ&C}O
z4rQ-Ane2c{^2WmNwY(){t0t=Lpu1utB6dJ|z2E?uO(JbUcejt5B2&QupHql@5tcXG
zFBawJUG&qCf4|6k=GO-?dENZu$?KtctNo2=UEUA=EJ`g<1<XU_z2LkhE!&VK!3Dco
zKJi2!6s&2tQ04dIFBD-VG6`Y=VO9M}t8LYe*S>UKn|^KbhJ+`g*?C3b0%}z7JUpT)
zdB8o7lSiV$f)(;TPx9%Lyv$y~{+FLngzdKxCv1JIN9r#W!d!_2$B`#__FiMrz`QoS
zccD!M7kV#7C@?R+Z!fZ}GB3YxJG3?LY+u3u#c@SBY_qi%#H{ftZi@cEyr6!|(Y(BZ
ze%%z!{q9jHGVgZ(=tlN_6yZ2tlGk~F!BZFn^+6@IwT_U2NdtmOq|VD3Xe4hv$vZVL
zl(av|doWN$GYZ-dYOY9|hx~zb1@8`h(htom2;6#a9QxW$HbcYIsH;681g(-#oc-?v
zlun~Y_URv@A4${>_Zy2AdiviX3E@Oa>TS2{xMD0yX;pTRR+qOfgx{Yko}Wai-EH29
z*$dS-+)DA3aY#g^_U+@)1QJTW3FtnBQt|7_NJ1toPC+bLF4{kyf}$z%3$y+3RP+}@
zIe5=Bw2yQc?PF8Wg2re8emoncAu}HPDM}=-m*CP*(Pc#AuQJe3v=u+kKs}JrE@h(C
zZP5t(&9&$w3QfbkzCrJy?s%qBw7}b-Ab;(RZ+(MO&}1Bwk3J$_^}^rfqbZ<IyAgea
zTHDucL^X|2F#dWc%0z2%n_VaawZ&_8p>(vt9=IC~M<~jkwg)A(K)Lw#3ACL2dk#)L
ziONwR?tcoMM1!z@391hIdNv8RGoXKrBhOjO@j3!$NyGx7Iezyvx@Op(P7*fn>e3m_
zCOFAoDQ!dKmZ{Jl1Z*~?UAn$Br%^N8%a#3O2FE&7pW-uT&`^7BDWVY@Fzep~sFZet
z0jg*Ij{#EcrDxC?#0Jjzx2UJmZXo(k+W!zuv!6PLE~wEv_PlcR1C0jQ$Nh}DqGl_O
z(CVDN6|twID(DTg+L3?{{sJef!Y_V7Bhg&@;9pS^4SRL?J~~c5jkRYwP!tL6l8302
zyxR}wK0=9T4*ug2nrPeu_T%U|gd}c^aNLM;ly^}GkDA?fb9QLoblezm_eRv+a_=n)
z|1kVTC7OqZ+x;J-{RkD?FZ_;*5z4hMsY0!k^6#g}Og8QTEBbB3aTS4=Qk3uVr>Gjb
zw*G-Q5_QG87ihYBmNJ?J?|OkgL7BLHH7Y|}>@TXp4&0rJlJV@9C;)B2%U>eFFR&L$
zT(@PyncAusrD%c|rE4?}cYOaPS_pRe(LX2z7P<5vGy_@fo;7F|iPG@G*I;rLak%<5
zDnd#2f?6~THFs{{z^eYIqpF-6Slz=OjL1P0Srlhaqsey~)opPVY_W?Y2^V;hCt!}B
zc#&MQOl6N!Z$+sJ6+eC3EfW`ek>P$$vKh#WhW0t#En4X-_s+z$H~BYOhhKY>t$f!h
zl0LTB=o`hix<=2xJj4CE+dAB(32;={J2WM4Qvp@La-%i<0Dj$+-}RF|Td0O{>_IKa
z(+D~2cYVl*2<798ex!)TVK0ADgSuhHpX@}IcgDm0$@kF;obON0L49zC0P-rDZhsX(
z`l!$-+&qNbMeYs2$3w`&<Wql~8A?7T&jjO-!pLayeh5AoM#^Zjy*i9+)B#Oi-kThU
z-0arg<P_v_-~}Q)uiGLuUU+J6(t`K&Asge4eMv7e{sk6}lA$=bH_6~dK=FL>91%?q
zq-cB|eT_%;B|G9$g<1$y{qqM2wY9aF=|^_3yZ0kUcz8H>?cLjr9GQ4>JQ*02REda1
z?usM7-Dqy5>UNOE@d`+DPpTX}aeh2$aY^Vvg20dC$+p3Mio_uLKZK^&2~|I`cOF7U
zHdgQb4H387%ynBfXQ7%NnQ#JUP9y{DD@K#8P;+Gxil#e1yEG;KjGK&sHQoD=>_HY+
z;P51J205z&hoq4HxHt)hTUO!X^uyj`$T3cnPzGpIN1lLhk0D#*bz|U+)JlCO`Q;sq
zrh|C$SP;K^$0e?{9~n#D@<5C2E2om<QLFliEV+z`8^bk`u<RR=8quM;?3$1~jpV&k
zF2RDMYHmf<IM!Zr(W5g_06sR2Ohgn8P9c+;`v6bF0hW}x7z<O#UT?LO{hR6XMSMqD
zww$VHx%fuQcqcs&uS+FIl8?Vv*70F;7Wx}%Nc-L?Y+o^*%=N|b*`yZv;7-}(d*nVl
zUYt!b<R5nXk!<oWq^sEvLq}?Y^~Es*7R6~g+u}6AG5sCC0om3^qlT^kur!~T*ujI8
zZpZok_?IPQ7`b^r4$me1aO=;>qLx?py&WV5*flZ0%Q}wk!&RS?{%9js<-*O##9ea9
z>ExLMcw;UZO8&MVpUEYMk}dZ;+bGo@y_DQRV$Cv`ZZv+D2h(-z#)FoDE!%-c?%$0U
zEhEFxK)YiZdAvP&JPV`VWC*@+i0lp?u-Rd<2$A0{z!#2?lh6RnA0>yA&*$S6M@dO#
zpYOEz(KzG~`HsEOG4g;XTYtbm%>4K6`9s@f!8aN?Jd_3;`z__@U(LXOoFzls-I(!~
zqwZpS{2zlHn1Q)-WR$U9NsIsJ&ryb`zbT;SeWhKmCm9!<BincA`EQ;&O<RH5@UX)U
zoF~=ZsJXq_4Knua{RyAwGV47P@X=dfNXu`MJrw)D3HE<(JdS;&*#9lX{>Qr*$KoTm
z8eE?#b>t%abvYS^2bF_(j8dOTULA+KJ_d2^Z4lR3UE<01*|*8wo)DnVILH}quTQ^W
z|DJB?P}h7ueF%ol4uw^_uFuFi`u&HbmHc6dGQkg<-yQOA;e;VBVaKBeS0~{=m^Q@Y
zHRZ74DV3lhGX9MQa~=K1O45pU;)us^H=hpvw*qdkQ`Ua{F<BObuX|8ha+w)#^Ps{J
ziyM1VdX#LJJgF8W8jfSVDZf@xrvJ-D>5M<~rZi+Dlk1)w@urR<2B$Znf&zVvh!_kv
zBp5DRz#!%J!JP?!tmhvCE@(n^BFhZ;P7^8>wZw5vsW4=~X-%nN<ai?<*pvz-PZ{ig
zH>GZom~H{nvoiQvbC{kA8(L60j1}5dEgs(jXpr%=pvIBpksmSRN7ce5Vf?AVkUiNK
z1p*s+FbE%NP3=S;czhe`SMs68-mfk7urc|%73MopAE2G~#hs{Lz0qj<)fDO^g~IHs
z(x_I=&_k?UO!?xoi>NW^Bc+~0{#=BQEv7z2qwKPcYVL{p*<+Ve3n(<wetjj?jZ7FY
zNPlav?WOGxNELh*4cDm6t%;n4>XZ)FD?4cQ1myVET2q_Ty)k&%kqN_W*_t$XYtWx}
z1h0V{10s;{SJQdV;JwIJ;`s4(ZSDNxrt|JWbMT_plOWZ`GgedY`d$3m#XES=0LPOp
z1d)@X33Ob+MXRZ(=C3PW)#l98WI`qolamgP>;i7~HO0}5a`H8}&(~B(Rn|^QU90&r
z6Q_SoE%#nL71ZC-7w3Eh68Q5qRPT(OIE}i0R&*0<&_}d7t98idjhZ>yq}SBKl;;<x
zcCw{t)K+dMEXK_m2gM*q?7W)Vy6W@=3SYnmMaW7lfuBT$lN!6IbtsUsT5FWig2#fu
zI>>pg$<AI!Qy?tvqv-%MU*QK6anw$McOpU=B;CdFJ08E58X7du)yf_No0zTH2duHy
zTo)}3|Fo838n1J;EMsuXbyRrcGNtL}P>sPc&{S2pdN1Jx>nJY1($!j;<Xqe%b&QqX
zrOeim;iPyqwfi21S@yREC}cN>708Rdj{*rMnyt)p(?r;QS3Sns*(Ka93Hz<5!i}6u
z$P<K`9`IInB-R??qP_S~(WuR8tpeLP7z4z@^UA168UjyWPg$6-m98VU(#jN(BL@V)
zShB%bT$ZChU+AVx;N=PzBX+E(g0Xr7<==X^qJuu|rq~^@5U1S~(@|=URv+TX4V2}b
zMQQcN>1WF+13R;7;H+aE-_3W@ZB@3CV^$c(u@3Lt02k*AJnS2)i(jcSGU>Q5O5yT)
zuo`A?^yw~Kwu$PD&wfL-Km@+HiRywq^QqP(y&J!iPw7Lvb}K@sDd$w&oztjHbPcc{
zEc+<ylG&b5d7&s=m``={6P+TCVRdX8g)MF;R&S(qC<)Kn2r7~{QXVK-sdFeD@7qXO
z&^-K9DRMEpiL!XCgE4HU!Rm>;qe1WB&6}tezFS=5ewE--KLPUPqgNF59K5TlHdF2V
z%3T~C>o_0-C63a2lof`1=A4I(inX0~kmGUsW=a#_wa2*~`$xEjn+MEABG7Q=Mydn;
zX*1ObMdJILDbXVus0}7Fcnj5B)yE}WiKlL%TIkbVtxLmQW37XIip?2O?ns1h1anW)
zaPdNIUtWg^^tY~aox&!&eGBD|BDT0BR}51mRkrDx`Oi~#DZZs|jsAk8(NdRv46>#v
zV#tx~<nw~wkqP<>!yNbQueMT=s7oab^GIX!4gjl(wJO$Vtx!nKY`zMqzw0(%2a<yr
zi>GX-0(`E4Q?QjeJ}7!sJ1EBbRO$Kwui8%aR@Fc~))AY6A8)7L_4N7{G`mlr9f3tS
zYzNiXLsL&UfoJZZTBF{0#SW^CM`S&DHZI;lg>|XTam{^#DyMIm^}I4>t?#~3v>J?W
zesKyn*qU4~5q=P>cR~o+joF>ld+_>}v=eL~U~iq`T)cB9)y_v<H=wn$UM{{6f4773
z$FFu$p6I5%@h++t-Q`f8;(Xx7<jl=QnM90r-Imm5j*V}qw%lf!;CI#)0`+s8xtE$8
z5aR44B0$6uQVb%AuxAd>JnU9LNoW=BUO){beJ0>l1=N|g-E);Q^|DcLQl2*7%r6Ev
zThz_xk;gZ=P;>l)=j?-k>b@0k*++HgCJiMBSS%Ish_s!Eu_o6qY2df7;JnqtM!G&b
zxla4ueAkW*wu<$9UB1Q5_EYb`JC?YgGSXdEgWsxK+~K#2TkwWzJN$NW$$0HSYO+7+
z>~t>9C-lwYDsfm5C8Jq*bP+WWJ;Q}X)Va1{i~e6ryM;F#qK1&MYw)W>)Bqe2O0~cP
z4pUNKR{d=AwmMfeQeT|lT2V*59T<ANIZ46E;5F<m$Hm!o7CvBb?Uy_Lsa0GPTo;{f
z{vK$=Sk(n}MnG)E;YTQc_zcwJ2$kL9Wun4LzbJvLMyGmAARLAGw<C~7#H_XVI|>;P
zDU{>6$EehHed<Sechjp{+c_}8LZ=bJ=D(Te0o=Nn>fI>r#;aO~<);0kV(J63`Ss6~
zy@rj04~$NOIE~AWQ<X@IkDLHkwi#EQfRnk415Z+c%}SljV08mrmQ{$~KS_1*4b6n*
z`R3;hZU*aG<m)t%yLiz_Dg?paoTOR?7T0gy$n`M2zBOPK@HG-<=6H&KI!T41VVFEc
zMK{^N!bsKgYg1BfFB}7L{3)t!tNC)hdwGAbL)ERm!CT?8#wp6@{lPt5)|V5H2E4Vs
zsq0?Vo{rQ6fx{ynH6370uiv0}=m7Pgqr==|70^qhG_w8VXof3KQSYKdIG}_Y5b);q
z7p`@3C+LfZov;>P!gEWgQ2)Wv|EorPxP*#syhTw&JG#o)`!v<1ajC26DdX;^sW?@o
ztGNrWJxz%y1ec$t!pT2>!Cs|Q2XqFrrBtYgYG0i-T)>H?RA&ewIi*w=53!y+9-l0w
zBH+!|?F^Ok)=@3RtItsHc_!Ag#jnQK&QKi#UPm^VZB~76z-sJwmYNi_x}LE9D`ll#
z;BkxV{IUVBIZIs(f5UNLmBQiEfTPz(F1xmQE1qu=IEpg+SLdi1?&QO1_`7?Q4|!!8
zF1|(iprg3!Wok0Kwd}r3`I7uJJhYrjB}etbm&&P-Mo!Z<_rm{_Qyp>657dwPRgm-9
za;lW8@|{;sS9(zdy@-fCjfkt1+A$0Ezs`stJ~*ArFo%fo6)L^)+ld5SrLx`0K@*%4
zK@s@aEy@?YgRkDACX<K9<2{#QTAT2Ya%wudfXm9MPUsu^%W??W{x8Ql$G6RQ>ObkF
z#Gs<#1h!-%UmOvM+;RImR0oeY8&iS@-=Xv*`6<r6LmALHd>p!Aw1;=75S3?f{SK=#
zu-|<u)uXDOkcGdz4+&queu!c1iU@q}KGoLq%?Wk-6hFI9O>gsteaq~(wpdj57p1m+
z?^uRyB~&Z_p6&m)GyV`4Il%AT#_9)@nf$8)_kKW)P)!1LO1g&kJfH$p=}L=qOvYso
zD6Vm~tFKESZuXEecS?RnsjV^a1J2<vbk+K5KU6}S8eSB^e+61ky7<rHX%8u_%He8#
zfww=T7?tXPQ_m25_aW6eG}zT@*UFhZ<aCE`O~YJ&m#DFpDQa@<x<^zXY99@ZHs3z*
zyGXUzJ4PvEXq&I{72jI*6|JQGDhDX6q&N+N><eB6y!uaoa25xwj?Xo4bXCgzex7n3
z_Q#TdFIG~#mlZk(*Zu$oZcV|yk10`=1{BzayLiZB>Vik9(sGBi`mtU6J2itudG>8p
z)L0d&#LfPu=A*F~|4o&UZ71N7FCk1ukGCIqN#!H>7C)?pYT}0S@B~C>lkTJK)rg*f
zkj?%vMK5(jm3F!@JrIF04E3O+$c*Hcu#1{6BcQN(KLw?*NZ)EGvtsBIHt(7`3SqCO
z&`?{XviYi%GKL;&^Y((;*hSH*6E<J9LWF^Qlrow=ahe!7peq3#0nQF!4stQmi+$Tb
zEh{6&9kc{1y{fS`UyZZZskvi4t@B%&ww}h;(_*b0RAXv=6J06JiCAl&|0E3mH(_W1
zt!@L$odo5l!SM4HU?*T7;1b|Bz~2CGV0sT9@uqRcG8jTx^a`bf)AwGjRHA{h&Pnlt
zmE}VXwn4qvcN5gIVw%IkGL>H7n&;#Kxh$ok$Ynbzid-(#TykGP%_Wzt^a59klZ*DY
zd8aA0Xl0MmaYYmQ8GM1i)|9?PsrEq!n9UNry9ND=>bk3yk5~H8A2zO0TBO5Vh24DV
z+QxOA%oFVGN59iXQwY73<Mr?VC|(r4cSm`}46;VMs17_3cvMMB3pozpg?{uklxa`!
zr=uxVwu|~X-qnhp1Ah}@0%^T!pNn`2PYR@4s~oP@4!kswZlel5=p1H&-5yA{K&n1U
zlXOh9Uk;+-a|y=x+R*Juq6co$mL5Si>tUbVmL5o>H2aA#nx?>JOWV`a8j;P6SPG}Z
z&}#dra5@c<VXXbudvqj1x9!0UeWx+<!?is9k$305aPdmvMe8)J>1LlL(5*<c$G%*m
zWfEP-S1t4iRE_l!^b`nL8zSgJ_x!`O`e;5*>`Di_?@;PHlzI@}(3Rfg&cWYttUYnR
zZuDQMC+^mr9*?HmcXX!%-2AyhNFL%es+?|KwqDixQpe*zYHJJk;9Jpj%T6lj%!#@Z
z<G8s0RqY9=J$P<!z+MLI+ZFa;+`1>-u2b4kTK!;WO>OOY<*`Mn9#}!{&FEFYK0;y7
z#}j+fL9L<+pfgG}w>UAzv2`UVu%)WzmLxyuQh?X@q<sP_l;L>iaJJN{xh3=iH>X79
zgU7h6C+*wb=NK?}xET6YJ=g+cyixWPlpU!8Wf9o37af(c_Y_SW2PjX~C7MV-OA}K7
zLjgSiS^xom-@XQYMSx9!EWji{JRlO_2mNh;Zx@v9q1^`18R{x1tIKG@0Z^W0P{sjh
z!10STG3O$kK}163_4hPU4mb=*1gr)qPkShX0M!>j0I&<N0<Zv(2ABXy0Q3Vy0Ca#>
z05!lJkPnks0hj|w1B?d517ZL@05#_`XyVWFH1QBn0Vo5M0*(T90oDMP0OkNb28;&8
z1B?Jaz{_(qaT8DmC;=1!b^+D_mIJZ@a{y_8WPlZr2p9zD2k4OjKO#T}Xb)%u@Bw%L
zUMoics}})Jp?(~29&iot3!oCfLZ9-ePtrs%KnsWf!~li^tbpl&1%NLAYXI8-g@95(
z#x?k<1k?aLzz+NX8h{oM0f+~T1xyDl0DJ*Zo|{lQ05t%Q5;!J+4$uQI9FPq76tE0X
za~gC2t^-N{`v4mNOHRZ2r$NOEhyjRzP=Fc$H=L*h;cI~7fW3fq0Oh%J0{Q^O0OeT)
zJFx}ee4zaO3@8Jf1ndE<24n$d0>%Pj01*J~857JLDk{L!Qku96xB^g~15joIJ_aNL
z`T(?mV8Ck3d_cdidf0<j4~wJKOGA8G*Z)@%5=6fML==IJd>F2XR<E&t`vLudJcIxT
z6j6!P3qVd$QFw?}7ypjbUqHJaxzCU~_bF1B{qdGw47B1u-?r;{l~NgJ5?;TA*83{W
zOo~)%X;MunfG5ZfUD%_2oOMj_v{BQ?q|8Vj6Fl~#kAqWyFmBZ3F~Bnb=y5<N2)l75
z?M~XGzoH{ad+yhCt_uEq6S9d8MBtw{(Vw?*z-p9Xl}CBqsaD#s3MZigf4`abLk^5K
z(=A$S>&eikeC>*Wb_`%O;4Wr1({16!FBUjkW;WndwlDV$*KFYG)UaF86ZAW+KHoq@
znMb*E&{M$PrD2!C9tZ3`u<=S=c@zyAXeR-*xY-uEZAhO6-O6agm99FPB98DSm}iJG
zO3x4AHpjtD2UGx518HIaU@l+_&e=l0+p}*km$H^nb^*XwD&_yQ5a;VkrJdiKR$l-p
z^!olQ4f+-OI~Z++$=&PoZ?@|V*k<*k)k|>Kt#Cluc*IsZtaCDiv^an=fEG+mDYKys
zLbb_Ys-bRqEtMs10UDSsF5XJ38n1&6g<%W6w3YTJ_r~FeTj@~08sJg*A>0yIpsvVy
z9mS#B=x$;h1R<qQ+096(D}6~&Lh<HNXv(m}z_)r=15dr)U@deg+yayeb95b}VlJf(
z7z2{)7-!WnC|YTVa`hvr*VT0>qi}T{RTF4BgRXNCKqqMMaeGG7M8NSnR{^wq@LwlK
zL0l?+ODhAK^1rdN8t^rNThD@Qc7yT!fX00Y?yCW<1ZX}$3wF_lD|!hv_@wh7oY+7~
zHqg94iBALJ13)VVzN!X%8i-@7fv>m$?Ir}!Ns08*5a0jC@BhZ{|HkkCzxXZK_w1&9
znub)@{U^}UtF$ww!51GwK{aHE0axIP<KK?b_cM|;kmrSgXMmDu2f097D1#x>fwCeL
z`k)>R{fY09L>V9#P*F?~5fv119fqz1)B;*uqltC^9?%z%1egWDfL(wRKsn$kpz)88
zp8&#tgiNU$RAK=i0@46W02=@Y0p|fX01pBG0KBe4CJcBNAOm6nNr0(<*??t$ZGb|+
zIlv7-C7>4IdjnEHfF95d5CcfOF$`7;l}y0rfc1d=fD%9%;1-|~K;48H1N4BNfPsKy
zKssOvU<05Ca2jw0@H60<z1?^8IrrtI^l)_EKBAQN{0u#{kMHT`iJEocST2Q|$z^gj
zu9WjNzk}!Za(g!;l<&yv_^$l>{0ICHel$OgpTRHTzvS2PyZ8dWkpGT9&0pfL@qh9!
zcuHt5bP-~OA;M%~rm#uaD_j+B3l9V@(MJpsqr^CItoVsITU;!DBkmS2i#J7w_`CR8
zq$HIjNbyppG*4PD?Un4(G3ku-P$K1a8L~-^ln2WRa=N@gUL$Xk56j2p083{}f@QL$
z&~nUj*-~zKYym6ULlMOgmAtisw2QTCw3oFWOm}83bAq9Cy>tn>Bf3jEtv*seU0<O8
zTkpeK*b(eb_6Yk6`;sLLeGRFG4Tf!o1BMHRpA1h7q_Meiv~j92Bj32&SYkYHykxv#
z{K<INSZVyz_`>L6Qkyg;ooR$=jA?=?)s$(<G3A*yn6{YCny#3BGd(o@VIsJuoFB(=
zJ-9*KFm5#W8JER<$!+Aeb9=eJICpbfv)<g@+|wLmo@kzB&NMGHZ#ADa-!nfl|7m_{
zrg%@@hi{$1x8uWk6K~<8`B>)xOoSsy=jZb|{BnLRznR~|AB00V%m2XN;_vd0`D&gP
z)Iy-pLC_1b&`TI3jDq8sA<PqUh1J4lp+Gn$oE5GKzX*?ozXdl@Ee44lMZIVddyBE+
zU~#lKMVu+l7nh1(i(ABuePXeAPW(~)6;A4<=q@#rf}~I>Trx;qrM_@xNm8;jOIj%9
zNo%BS(gEqbbX~e5J(WD<wz64{k_XD8<jL~Ka+<tEUMugGzmw0%x8(=&GnuvoSXx^o
zOAkwLIK(@a-z@}O;*OAUkXkQoOYOT_Mk{1!duwC0Q?$#qo3uN%d$k9(PqfwA#!Pc2
zkO^ZtGX_RtdN3a_gPBBTJTsM<2`6r2F!K$wiz#ACm`luU<^l7RA#`3ke_fdFJsq#>
zq3f?3p&PGD)n)3kbt`n==yvN4=}L5$b$4_RbkB51@1+mWYxM8w1%1Z*`u_R^{RDk7
z7|v(<9Q{gtzJ8DXu>Q3E2mMd_hx+GwlJ#a=vh7$cE3(mSUp9_SWGAtouyfhZ*;VW&
zb}ty&8TKmsh<(AnVp|wG8DvAeA<2+p$TVadmKv~Or{SpKdqaick)g(*GWr<9j3%RK
z9Bv$AoR9(L_S)FQ6l&^hGMi*mFH?+Zs43Yr-?YZG)pXEw!t~Ol<p#se&EigQKXAWu
zUCg|>k2%3S)|_WvX<lpIV%}*!X0A5Vd{aJ<?*Nxs=6mr2`BD62K8>Hp=ki~H6&3JD
z!G^B!KZ6DR?X;jEp|ijV8Ii&V!Z2Z+Filt>tPr-rjjj+Xg=&EkTZ-*Ottg7o;s9}^
zI8mG~&JmZ0E5(iCx1wD<B9@9*#0v3|_*|?J8%s^4K&gYIlVquvG*B8PO_tK&w&zM;
zNxP)|Qi*gKtmc9AOhU4k93X4t_v8q9fIK8ao*;iBkFm_MEVk^oT(bOZd185H`A50$
zWfV~b_Z?}QYFlZ;v<B?}?GSB}_JUT+^k*hAYndy|Gp2^|)P?9cIPuZC`Ec4_>hg7`
zbXRmYb${wKdXs*zK1u&E9Bh_;z5ZMMS^Z6Y6&$IG4Pe`|JlmDc=*JFar?Ru*6pyhN
z*xT$qwvwd{Eex#;AqJfx$}r3@(J;#}->}TE-Eag>@v7ma!QB{Yj5fv^hZ#p1CmW|3
zXB!tANs~AD3my({jA@E#x+%kyWy&?J1fQ|ZRA4%6I%)debkpQ8JvX^=-rzUdaveAw
z7m>mB<A!q+!7DG~mU3TnTe*E)F?XK(k^7Z<!o37H(%jtI+{tV(N5HAa!>La<XTiB|
zGaoizFyAp(nGxTd*YF0u2S1XZz)$Drfah4rZv?+_m@fsd@e}`uf6kLa6QQNhPGAI4
zh!*06k-|jb6Jd^!u|!xUY!to~jtHf~6*&7x!V5V2CSohGy~v1?*b}^ZqBsfs`aCfY
z{Q5qz1iXa<e1#`?ig2li)L%-F#!IQvXHvGb0#5s+bW^$~J(B*BD7mTJN^UPlgL|JK
z&y=&}mGVaUTX6B`WQY7*_Ob+ISUOpbTfVpaX!*%<*Fr#qR~$r;wwE?eTcACp{ayRF
zmSjAb7EBPMVY)CzMrPh;VwiYlG&6-sXBIOnnf1&zrhqvF-rx%J3sc3^GCsQ2x^_B7
zC+VVfak@m^MBOL4xw<8~Rk}^OZy{2g0Sl?nRq9^qGCcG_`Yw7|AEO@yhB8n8rGAsX
zP=5vt<uCnfy$9>ZhOk{&GaJdqu*2DL>@+rmUCb_LH$ZSX$ev=$*mBmv{>9d^o(4Zd
zs3F{72CIoR3^!Q817sL%aQ`<Lb{UEcrwo@2w+#-%Qv+f2GzJ(ufES3)Fb*|NG^QJu
z7}py27>^ro8t;Kecx7yC@-+p6Pv~Zf2XmSU=JdG<o4zsaG8LK1O@EqRo0@RJTo=yF
zMR76QNG_dQ%x&OyamToU=0vcObn_f@rTLZFpKr}a@KJm}K8gR7&*nFQCrA}O6SCp5
z=L@@qj6=d{;j(Z?cqlv*kmxN2h#I){g7`k%`UG(T-1^VN9JuxQ;vVs^cv}2H{7HN$
zdPsg!h}1<gOOaBHG+Y`dO_MUD#nN(VgS1mRD4mkZq;kn2{Uy~(p0b}DDu+9xMXWqr
zw#q4ThHR6uyg}ZTAs5M~<Vz4T9P(3{uy|VhEn${$3vcOX8EpB;k_w(-j%AtUYs)t9
z55<<VmK$IvPZa-9MG+cjKF~%Ru4T0rZBK2y_CxJtZJKtDcByu?cC+@3_NMlswo3b4
zOEJDo8>SOuV!DF$3}ePJ^O@z$CMIJCvzIvrVdN&`VE$rWF-jN-h43*>m!bO{!p1oW
z8iIbBex`nv{;uAQ^<o2AhV20{AesG)UB+%^?O+8zu<nNDhG2u%U^Ix}{nHGqz+V&^
zZh+T+X{ZH{;bjaoa>jnf0mg;KY~wcLx5i>)x$)-=;{!NrfAIUmO&^-3n$k?GOnXh|
zOs`B7=gIkSEjcT<i7Vg^awoZS+zsvycb|LCA@B&(%=664%)88`=4<9A;Pn&W=KsvM
z6s8JW!HNGQ=)?#Sc8P!#6n=STo^F7C9lPFe2n_KeOzc;~W5WwW#uYR4sv${+;tR0-
zEBXTPgAdsp<3(dH(_f|*+y{`~4Cj)#Dcp2$Q(4>>;HEZm2f)<MKtL*o2~~0baJ0Fp
z+0Pto?qFuj95|~;b2K=t7;_vrt>IvjNoK2g5(FtP-j{FV%sE9qlJA?r58@NSZ>2bM
zp3nIMkZy)RZesx-HA$E+lnD2Q*FqS$q8{Q_v5C}KiiO}}lbXv{<va2txe5}EmvSv6
z8;vbZEG?WVN0>!t5iH#;v0y<TThc8HE!mdkmK~PwEN7gaMu{=7T6oJyLKy_%1_8!j
z$wjnXwPUqAwAUd4X~g(3?V0x&GZV?gLfVlJ>Bc_hKG=u9uC1;Uq!~kWlXNM%EZtJw
za@~5}c3q+FH{BE63!S&#M<1&1tmnX|^w1B`PjLpH<@z<Sw*~sEkW<{(zW_UG%KEc<
zwoeA66Vus+;7|(Ka}a(=gC_(Zy@5CMGYm4!G-Mf;K<HU(*kagiIBvKCCst!XMt5)^
zYNM~Qm9ec+W9(!MH|oK-Bx5%SOMQ)ljLF97;8T_v4;W7x&loF=HAc$h1OB7~<QP3n
zeN7`xlT6dV(zci~cAEA%(~PsGA57OF*`PQNPR(h+we;d*;nXK{Q{kmy5tqy5LuUIe
z_Z_@ET;Q&9FTe;@aK<_2Heh@``2qY0ejGoQp9QJwx4b806dhpmVVkw^G6zKq?I*BT
zzU&P4K0Cs&*Kp13FTF1lu>TS8k_Gqp6Xu0}jDdz#yl+f1W`RdsW?W_5Wqb<x5oJ=D
z+L+!k^)?MLjWta)Erq#nhurA8>9*-t(?5`kdvQTrDA$RLfOLE)_c3_GT<#mln67X?
zfq^Qf8R#@l)*NLXZT<+7@tfvG@XC|15W;011kAM%GIxM;EP`aal)nh6(jERD|2zK@
z-g;CJJOhLfXTl^2eTDu)ypSNI2(uvR{zd2xY4vbOt5e~<=Sy+BctX4Y{;{c~g&ewC
zdL=cLyU1PT_vKykK5%x$PG|Rr+{7}>l4$wl1IsGQW=nzPkmZEsqNUnG#K6aH*e(K6
z<mTD{Z5ypd`;JztHEKoepV}tO8ZgCe%pN9)4P`sBBiSSfM(5c-*;a-zhA$z=*eAui
zopj4!d5*7u*M+C>x<J6(JHp&WAwr0R;2$Gcg)|`@LO`yt3|<-b2`3@;Ul+=SyFv}T
z%c;d+hyfiT3Pg+Xu(BjE9df-g$o4A5Dp3vV>H|JMUYaDONLi5KEt6JD`O*%l5Z(+b
zV8tpqC{*q!Yvn|6^qF#&yiVRBpO>%5<>2F07PTeFB3hysUP^GYUrKO)uftNU>i+<w
C<b<~X

delta 15007
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
I-;OQ+58=$bB>(^b

diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_n64.txt b/BizHawk.MultiClient/output/gamedb/gamedb_n64.txt
index 62e5874029..c1fda889b0 100644
--- a/BizHawk.MultiClient/output/gamedb/gamedb_n64.txt
+++ b/BizHawk.MultiClient/output/gamedb/gamedb_n64.txt
@@ -48,13 +48,13 @@ F32B6DE2F87928378F26CA17B68B27D87FDEFCE1	G	Army Men - Sarge's Heroes 2 (USA)	N64
 2DBFE78F97B8D6E1A33B73D244BE831D18B0491E	G	Bakuretsu Muteki Bangaioh (Japan)	N64		RiceIncTexRectEdge=true;Glide_filtering=0
 28E6D11F6F48C86A9B7C112C672109E1C2D7E5D0	G	Bakushou Jinsei 64 - Mezase! Resort Ou (Japan)	N64		Glide_filtering=0
 90726D7E7CD5BF6CDFD38F45C9ACBF4D45BD9FD8	G	Banjo to Kazooie no Daibouken (Japan)	N64		Glide_fb_smart=true
-5A5172383037D171F121790959962703BE1F373C	G	Banjo to Kazooie no Daibouken 2 (Japan)	N64		Glide_fb_smart=true
+5A5172383037D171F121790959962703BE1F373C	G	Banjo to Kazooie no Daibouken 2 (Japan)	N64		Glide_fb_smart=true;SaveType=EEPROM_16K
 BB359A75941DF74BF7290212C89FBC6E2C5601FE	G	Banjo-Kazooie (Europe) (En,Fr,De)	N64		Glide_fb_smart=true
 DED6EE166E740AD1BC810FD678A84B48E245AB80	G	Banjo-Kazooie (USA) (Rev A)	N64		Glide_fb_smart=true
 1FE1632098865F639E22C11B9A81EE8F29C75D7A	G	Banjo-Kazooie (USA)	N64		RiceFrameBufferOption=8;RiceRenderToTextureOption=4;RiceScreenUpdateSettingHack=4;Glide_fb_smart=true
-4CA2D332F6E6B018777AFC6A8B7880B38B6DFB79	G	Banjo-Tooie (Australia)	N64		Glide_fb_smart=true
-93BF2FAC1387320AD07251CB4B64FD36BAC1D7A6	G	Banjo-Tooie (Europe) (En,Fr,De,Es)	N64		RiceEnableHacksForGame=1;Glide_fb_smart=true
-AF1A89E12B638B8D82CC4C085C8E01D4CBA03FB3	G	Banjo-Tooie (USA)	N64		RiceEnableHacksForGame=1;Glide_fb_smart=true
+4CA2D332F6E6B018777AFC6A8B7880B38B6DFB79	G	Banjo-Tooie (Australia)	N64		Glide_fb_smart=true;SaveType=EEPROM_16K
+93BF2FAC1387320AD07251CB4B64FD36BAC1D7A6	G	Banjo-Tooie (Europe) (En,Fr,De,Es)	N64		RiceEnableHacksForGame=1;Glide_fb_smart=true;SaveType=EEPROM_16K
+AF1A89E12B638B8D82CC4C085C8E01D4CBA03FB3	G	Banjo-Tooie (USA)	N64		RiceEnableHacksForGame=1;Glide_fb_smart=true;SaveType=EEPROM_16K
 1718C9048CB7849A59D48138A058B20BF191EBF6	G	Bass Rush - ECOGEAR PowerWorm Championship (Japan)	N64
 946B3E08A1A4DE4F917AD547BB24F533B737F712	G	Bassmasters 2000 (USA)	N64
 F7382358250965E9757BA9A89FE42D033DBE7FE8	G	Batman Beyond - Return of the Joker (USA)	N64
@@ -136,15 +136,15 @@ FEC40EF7D8B973C5937ADE10423D0CF1B5A18E3C	G	Clay Fighter 63 1-3 (Europe)	N64
 0D5211E211E7FC063C63C3E8235B62BC288CE305	G	Command & Conquer (Europe) (En,Fr)	N64		Glide_fix_tex_coord=1;Glide_fog=false
 725083ECE68D5DEB9724D3FA3F2A65F0291B2D5D	G	Command & Conquer (Germany)	N64		Glide_fix_tex_coord=1;Glide_fog=false
 B559E86D98DE598B1D25583CA082FAA4B7C62641	G	Command & Conquer (USA)	N64		RiceEnableHacksForGame=21;Glide_fix_tex_coord=1;Glide_fog=false
-EE7BC6656FD1E1D9FFB3D19ADD759F28B88DF710	G	Conker's Bad Fur Day (Europe)	N64		Glide_fb_ignore_previous=true;Glide_fb_smart=true;Glide_fb_clear=true
-4CBADD3C4E0729DEC46AF64AD018050EADA4F47A	G	Conker's Bad Fur Day (USA)	N64		RiceEnableHacksForGame=14;RiceFrameBufferOption=3;RiceRenderToTextureOption=4;Glide_fb_ignore_previous=true;Glide_fb_smart=true;Glide_fb_clear=true
+EE7BC6656FD1E1D9FFB3D19ADD759F28B88DF710	G	Conker's Bad Fur Day (Europe)	N64		Glide_fb_ignore_previous=true;Glide_fb_smart=true;Glide_fb_clear=true;SaveType=EEPROM_16K
+4CBADD3C4E0729DEC46AF64AD018050EADA4F47A	G	Conker's Bad Fur Day (USA)	N64		RiceEnableHacksForGame=14;RiceFrameBufferOption=3;RiceRenderToTextureOption=4;Glide_fb_ignore_previous=true;Glide_fb_smart=true;Glide_fb_clear=true;SaveType=EEPROM_16K
 428F53A060103FD88EBFBDCC032A99CAEA901E17	G	Cruis'n Exotica (USA)	N64		RiceForceScreenClear=true;RiceFrameBufferOption=2;Glide_buff_clear=false;Glide_swapmode=0
 404AB549CD148EA07F40D66C0B896A343741BBF6	G	Cruis'n USA (Europe)	N64
 71BB3D8850B6A4A294AECA2ABAD1F936E4F85F0F	G	Cruis'n USA (USA) (Rev A)	N64
 54A875EE0B482036FA401A6BC2B242699F0259F7	G	Cruis'n USA (USA) (Rev B)	N64
 AEFE77A5518FE74519908B6CBC97CB81B8570897	G	Cruis'n USA (USA)	N64
-EE508F14C936265D101C9699B5AE1A722B3E7D9E	G	Cruis'n World (Europe)	N64		RiceUseCIWidthAndRatio=2
-6DA1A6A2BDA687D50E798D80C342948AD1738202	G	Cruis'n World (USA)	N64
+EE508F14C936265D101C9699B5AE1A722B3E7D9E	G	Cruis'n World (Europe)	N64		RiceUseCIWidthAndRatio=2;SaveType=EEPROM_16K
+6DA1A6A2BDA687D50E798D80C342948AD1738202	G	Cruis'n World (USA)	N64		SaveType=EEPROM_16K
 49DE08F08400A477485C4798D6CD81D95842C806	G	Custom Robo (Japan)	N64		Glide_filtering=0
 F9515C2482AF8DF791339536F60260509C424F6A	G	Custom Robo V2 (Japan)	N64		Glide_filtering=0
 AE220AC1CD6D892098937DC639C925F9EF158759	G	CyberTiger (Europe)	N64		Glide_fix_tex_coord=16;Glide_filtering=0
@@ -177,8 +177,8 @@ B63060F69BB4E1547DA1D762E740D19393977055	G	Doom 64 (Europe)	N64		Glide_fillcolor
 6FB0CE9C75BBE54B6E1EDE337652B0221E5F2AAD	G	Doom 64 (USA) (Rev A)	N64		Glide_fillcolor_fix=true;Glide_filtering=0
 799A588D73DA3FCCE8031026A8187DA92B91C817	G	Doom 64 (USA)	N64		Glide_fillcolor_fix=true;Glide_filtering=0
 BBEB7B7A92A68B17CA72DCB9D7FB16F7B771C4F6	G	Doraemon - Nobita to 3tsu no Seireiseki (Japan)	N64
-4B187360E1999556662C28B65DD179432EC61F9A	G	Doraemon 2 - Nobita to Hikari no Shinden (Japan)	N64
-DD9BA0F6CFC10C3B78401CC55D06AD534F39D5B1	G	Doraemon 3 - Nobita no Machi SOS! (Japan)	N64
+4B187360E1999556662C28B65DD179432EC61F9A	G	Doraemon 2 - Nobita to Hikari no Shinden (Japan)	N64		SaveType=EEPROM_16K
+DD9BA0F6CFC10C3B78401CC55D06AD534F39D5B1	G	Doraemon 3 - Nobita no Machi SOS! (Japan)	N64		SaveType=EEPROM_16K
 E106DFF7146F72415337C96DEB14F630E1580EFB	G	Doubutsu no Mori (Japan)	N64
 A130D3622CE40E0158DB2DA4247101F6E92206FC	G	Dr. Mario 64 (USA)	N64		RiceEnableHacksForGame=2;RiceFastTextureCRC=2;RiceTextureScaleHack=true;RiceFrameBufferOption=7;RiceRenderToTextureOption=3;Glide_fix_tex_coord=256;Glide_fb_optimize_write=true;Glide_filtering=0;Glide_fb_smart=true
 EFBDBCB499A3D8A37613CA1D94528016BDBF5735	G	Dragon Sword 64 (USA) (Proto)	N64
@@ -201,10 +201,10 @@ D460DC1EB24EF3E1E27C6B125C8C8D8324A64125	G	ECW Hardcore Revolution (USA)	N64
 97777CA06F4E8AFF8F1E95033CC8D3833BE40F76	G	Elmo's Letter Adventure (USA)	N64
 7195EA96D9FE5DE065AF61F70D55C92C8EE905E6	G	Elmo's Number Journey (USA)	N64
 4161B5C100EC82B0241B20CA8F81366E23564CCB	G	Eltale Monsters (Japan)	N64		Glide_filtering=2
-5ABFB6024F935EF5FE0067F39FD594C50697C749	G	Excitebike 64 (Europe)	N64		Glide_filtering=0;Glide_fb_smart=true
-E2C8D01FC66C0A575E79CB338678F1FD065226D6	G	Excitebike 64 (Japan)	N64		Glide_filtering=0;Glide_fb_smart=true
-DAAF564815E9EEF3FC163B9546B5880EE256274B	G	Excitebike 64 (USA) (Demo) (Kiosk)	N64		Glide_filtering=0;Glide_fb_smart=true
-A847DD011E98204AD198CADEB6C80DDA10D9A40E	G	Excitebike 64 (USA)	N64		RiceFastTextureCRC=1;RiceRenderToTextureOption=3;Glide_filtering=0;Glide_fb_smart=true
+5ABFB6024F935EF5FE0067F39FD594C50697C749	G	Excitebike 64 (Europe)	N64		Glide_filtering=0;Glide_fb_smart=true;SaveType=EEPROM_16K
+E2C8D01FC66C0A575E79CB338678F1FD065226D6	G	Excitebike 64 (Japan)	N64		Glide_filtering=0;Glide_fb_smart=true;SaveType=EEPROM_16K
+DAAF564815E9EEF3FC163B9546B5880EE256274B	G	Excitebike 64 (USA) (Demo) (Kiosk)	N64		Glide_filtering=0;Glide_fb_smart=true;SaveType=EEPROM_16K
+A847DD011E98204AD198CADEB6C80DDA10D9A40E	G	Excitebike 64 (USA)	N64		RiceFastTextureCRC=1;RiceRenderToTextureOption=3;Glide_filtering=0;Glide_fb_smart=true;SaveType=EEPROM_16K
 E7120856ECC9A7F29C21F45130ECA0ECA8A7BFEC	G	Extreme-G (Europe) (En,Fr,De,Es,It)	N64		Glide_filtering=0;Glide_fb_smart=true
 D9D6F7CC456B530FD3233EF2D8D6B9F845CEE043	G	Extreme-G (Japan)	N64
 EB9B273431970A6124319A8FD125F0B2CACD8966	G	Extreme-G (USA)	N64		Glide_filtering=0;Glide_fb_smart=true
@@ -377,8 +377,8 @@ B3242226237A401436D9D7A8D533296333E64240	G	Knife Edge - Nose Gunner (Japan)	N64
 B247167E37E7F62924BE6B0D2362A091FD2352AC	G	Knife Edge - Nose Gunner (USA)	N64		Glide_wrap_big_tex=true
 181D220EFAA3E06AC5A7BAAC4B6A351B762EC384	G	Knockout Kings 2000 (Europe)	N64		Glide_filtering=0
 AE7229676DA9ACB39BECB03246969693585B7728	G	Knockout Kings 2000 (USA)	N64		RiceUseCIWidthAndRatio=1;RiceRenderToTextureOption=3;Glide_filtering=0
-6390DC1CD4600CA57069D92F39F108A4CC1B62F1	G	Kobe Bryant in NBA Courtside (Europe)	N64
-49346B3124750C14DDDF56B9BB2FE38B618F28F2	G	Kobe Bryant's NBA Courtside (USA)	N64
+6390DC1CD4600CA57069D92F39F108A4CC1B62F1	G	Kobe Bryant in NBA Courtside (Europe)	N64		SaveType=EEPROM_16K
+49346B3124750C14DDDF56B9BB2FE38B618F28F2	G	Kobe Bryant's NBA Courtside (USA)	N64		SaveType=EEPROM_16K
 DFDF852D0939466AD1F1627F4DE29B7288A77589	G	Last Legion UX (Japan)	N64
 B38B71D2961DFFB523020A67F4807A4B704E347A	G	Legend of Zelda, The - Majora's Mask (Europe) (En,Fr,De,Es) (Beta)	N64		Glide_enable_hacks_for_game=1
 BB4E4757D10727C7584C59C1F2E5F44196E9C293	G	Legend of Zelda, The - Majora's Mask (Europe) (En,Fr,De,Es) (Rev A)	N64		Glide_enable_hacks_for_game=1
@@ -401,8 +401,8 @@ D3A13C0CFDFF835FDF87D5DC7C5149FBA564877F	G	Lode Runner 3-D (USA)	N64
 05B307B8804F992AF1A1E2FBAFBD588501FDF799	G	Lylat Wars (Europe) (En,Fr,De)	N64
 19FC1FE13A3C50A5D03D44D2E93440967C7F3618	G	Mace - The Dark Age (Europe)	N64		Glide_fix_tex_coord=8
 05D82A2C73AC536180B68137DBB9972A9E8E883E	G	Mace - The Dark Age (USA)	N64		Glide_fix_tex_coord=8
-ACF22B715B11609F42DF24ABAC143BC0221D12F4	G	Madden Football 64 (Europe)	N64
-B0DE34B759F18AD86D39A4C68C9840D35CE25809	G	Madden Football 64 (USA)	N64
+ACF22B715B11609F42DF24ABAC143BC0221D12F4	G	Madden Football 64 (Europe)	N64		SaveType=EEPROM_16K
+B0DE34B759F18AD86D39A4C68C9840D35CE25809	G	Madden Football 64 (USA)	N64		SaveType=EEPROM_16K
 EC01DE96960EA23A9EE997F4456C5C8EE7BAF7E4	G	Madden NFL 2000 (USA)	N64
 93F5BA646098E1AA45ECEC6312604A0932EDD24B	G	Madden NFL 2001 (USA)	N64		RiceScreenUpdateSettingHack=4
 DE51147A238158ADC059D0CC75FD39BBB08DCFC6	G	Madden NFL 2002 (USA)	N64		Glide_fix_tex_coord=1;Glide_filtering=0
@@ -433,13 +433,13 @@ D7BA071C220A71F5E4503E55C98C91FF8F027848	G	Mario Party (Europe) (En,Fr,De)	N64
 FA5D1426488B298A1C5C383360A78F1A3DE18DC7	G	Mario Party 2 (Europe) (En,Fr,De,Es,It)	N64		Glide_filtering=0;Glide_swapmode=2
 26F4637167AAAA0E420BB4FDB26A965FD34F8D19	G	Mario Party 2 (Japan)	N64		Glide_filtering=0;Glide_swapmode=2
 166EDA1C05670D337E2C3F15A5DB528AE1E5D6E3	G	Mario Party 2 (USA)	N64		Glide_filtering=0;Glide_swapmode=2
-9E1DDFE872C6D43AE51010A9E8A6FE2D2E634B50	G	Mario Party 3 (Europe) (En,Fr,De,Es)	N64		RiceTextureScaleHack=true;Glide_fix_tex_coord=1;Glide_filtering=0
-43CF5EB8BD68EF57BA1C9B4CAE7BD18F1826E543	G	Mario Party 3 (Japan)	N64		Glide_fix_tex_coord=1;Glide_filtering=0
-6BEB80FF822B96BCF85DCDB512E8B2B7969D8259	G	Mario Party 3 (USA)	N64		RiceFastTextureCRC=1;RiceTextureScaleHack=true;Glide_fix_tex_coord=1;Glide_filtering=0
+9E1DDFE872C6D43AE51010A9E8A6FE2D2E634B50	G	Mario Party 3 (Europe) (En,Fr,De,Es)	N64		RiceTextureScaleHack=true;Glide_fix_tex_coord=1;Glide_filtering=0;SaveType=EEPROM_16K
+43CF5EB8BD68EF57BA1C9B4CAE7BD18F1826E543	G	Mario Party 3 (Japan)	N64		Glide_fix_tex_coord=1;Glide_filtering=0;SaveType=EEPROM_16K
+6BEB80FF822B96BCF85DCDB512E8B2B7969D8259	G	Mario Party 3 (USA)	N64		RiceFastTextureCRC=1;RiceTextureScaleHack=true;Glide_fix_tex_coord=1;Glide_filtering=0;SaveType=EEPROM_16K
 B9CCA3FF260B9FF427D981626B82F96DE73586D3	G	Mario Story (Japan)	N64		Glide_enable_hacks_for_game=15;Glide_fb_hires_buf_clear=false;Glide_fb_optimize_texrect=false;Glide_swapmode=2;Glide_fb_smart=true;Glide_fb_read_alpha=true
-B5E4AA1ABF8FC8022FC47F30CD6D4AC6A6B21684	G	Mario Tennis (Europe)	N64
-999047F07CEC931FFBDCC7B33B8502EF602807EE	G	Mario Tennis (USA)	N64		RiceEnableHacksForGame=4;RiceAccurateTextureMappingHack=1;RiceFastTextureCRC=1;RiceTxtSizeMethod2=true;RiceFrameBufferOption=4;RiceRenderToTextureOption=4
-8AA424795BBE87C659F777D0843E236340B12E16	G	Mario Tennis 64 (Japan)	N64
+B5E4AA1ABF8FC8022FC47F30CD6D4AC6A6B21684	G	Mario Tennis (Europe)	N64		SaveType=EEPROM_16K
+999047F07CEC931FFBDCC7B33B8502EF602807EE	G	Mario Tennis (USA)	N64		RiceEnableHacksForGame=4;RiceAccurateTextureMappingHack=1;RiceFastTextureCRC=1;RiceTxtSizeMethod2=true;RiceFrameBufferOption=4;RiceRenderToTextureOption=4;SaveType=EEPROM_16K
+8AA424795BBE87C659F777D0843E236340B12E16	G	Mario Tennis 64 (Japan)	N64		SaveType=EEPROM_16K
 F24FE0AFF01AEC018E2DD558EC4F076CF328129F	G	Mega Man 64 (USA)	N64		Glide_increase_texrect_edge=true;Glide_filtering=0
 62CE9D1C1F4CF7BEAA1EF7C456C155F63F13F057	G	Mia Hamm Soccer 64 (USA) (En,Es)	N64
 F629A56ED36FB3889841A047D7C4CD2B9731EB43	G	Michael Owen's World League Soccer 2000 (Europe)	N64
@@ -509,7 +509,7 @@ D4CB60EB3645AE803A1EFC234CEFFD8F424DC8F7	G	NBA Live 2000 (Europe) (En,Fr,De,Es)
 94416270D83A87E360BAC5059CC5F7365CA120AC	G	NBA Pro 98 (Europe)	N64
 5DECF930D859E8B834A5F897955880556CA6AADF	G	NBA Pro 99 (Europe)	N64
 702D6D55FC23C56B8A57D7348D159098FFF98650	G	NBA Showtime - NBA on NBC (USA)	N64
-A9BA0A4AFEED48080F54AA237850F3676B3D9980	G	Neon Genesis Evangelion (Japan)	N64		RiceAccurateTextureMappingHack=1;RiceFastTextureCRC=1;Glide_filtering=0
+A9BA0A4AFEED48080F54AA237850F3676B3D9980	G	Neon Genesis Evangelion (Japan)	N64		RiceAccurateTextureMappingHack=1;RiceFastTextureCRC=1;Glide_filtering=0;SaveType=EEPROM_16K
 2392F403B0993F838912CEFA83AEFD35D34A05A0	G	New Tetris, The (Europe)	N64		RiceIncTexRectEdge=true;Glide_fix_tex_coord=1;Glide_increase_texrect_edge=true;Glide_filtering=0;Glide_fog=false
 83FFF25E82181A6993F28C91B9EEB8430396838B	G	New Tetris, The (USA)	N64		RiceVIWidth=400;RiceVIHeight=300;Glide_fix_tex_coord=1;Glide_increase_texrect_edge=true;Glide_filtering=0;Glide_fog=false
 2853AFD9E38D63D913C8484F546804708C8AD712	G	NFL Blitz (USA)	N64
@@ -558,13 +558,13 @@ B8F29E8EFCF51EE9A6A16E2A1E60442B4F304950	G	Pachinko 365 Nichi (Japan)	N64
 7DB4808042B9651B47592E814AC4C125B51D4D2F	G	Paperboy (Europe)	N64
 B043C47B9758FA6BB289CA7DBA2068BDA6CAFA3A	G	Paperboy (USA)	N64
 9887A0E4BFE3C5E85E31638853574069F6C41CD3	G	Parlor! Pro 64 - Pachinko Jikki Simulation Game (Japan)	N64		Glide_force_microcheck=true
-16783D9DE1FF772E215F47441612D6805AA98C67	G	PD Ultraman Battle Collection 64 (Japan)	N64		Glide_filtering=0
+16783D9DE1FF772E215F47441612D6805AA98C67	G	PD Ultraman Battle Collection 64 (Japan)	N64		Glide_filtering=0;SaveType=EEPROM_16K
 9848CC288B388D23E0AE026EF58DA8FC936D7605	G	Penny Racers (Europe)	N64
 1D4FCE8AD6B1F0072D89AEB4C3187BC853B750A0	G	Penny Racers (USA)	N64
-A663D3F4EEE0B198471132DB92E9639A9EDD1985	G	Perfect Dark (Europe) (En,Fr,De,Es,It)	N64		Glide_decrease_fillrect_edge=true;Glide_fb_optimize_texrect=false;Glide_fb_smart=true;Glide_fb_clear=true
-99BCAAA4841B09C845E1094006DF8F637862F02E	G	Perfect Dark (Japan)	N64		Glide_decrease_fillrect_edge=true;Glide_fb_optimize_texrect=false;Glide_fb_smart=true;Glide_fb_clear=true
-AF8788AC4D1A57260EAE9C53FFE851FCF2A3319B	G	Perfect Dark (USA) (Rev A)	N64		Glide_decrease_fillrect_edge=true;Glide_fb_optimize_texrect=false;Glide_fb_smart=true;Glide_fb_clear=true
-60DFE17923C03875B499B3CD3200F05CB538B7AD	G	Perfect Dark (USA)	N64		Glide_decrease_fillrect_edge=true;Glide_fb_optimize_texrect=false;Glide_fb_smart=true;Glide_fb_clear=true
+A663D3F4EEE0B198471132DB92E9639A9EDD1985	G	Perfect Dark (Europe) (En,Fr,De,Es,It)	N64		Glide_decrease_fillrect_edge=true;Glide_fb_optimize_texrect=false;Glide_fb_smart=true;Glide_fb_clear=true;SaveType=EEPROM_16K
+99BCAAA4841B09C845E1094006DF8F637862F02E	G	Perfect Dark (Japan)	N64		Glide_decrease_fillrect_edge=true;Glide_fb_optimize_texrect=false;Glide_fb_smart=true;Glide_fb_clear=true;SaveType=EEPROM_16K
+AF8788AC4D1A57260EAE9C53FFE851FCF2A3319B	G	Perfect Dark (USA) (Rev A)	N64		Glide_decrease_fillrect_edge=true;Glide_fb_optimize_texrect=false;Glide_fb_smart=true;Glide_fb_clear=true;SaveType=EEPROM_16K
+60DFE17923C03875B499B3CD3200F05CB538B7AD	G	Perfect Dark (USA)	N64		Glide_decrease_fillrect_edge=true;Glide_fb_optimize_texrect=false;Glide_fb_smart=true;Glide_fb_clear=true;SaveType=EEPROM_16K
 6E8DFCCFE93318A597E99C9186D5E8CDCA3BE987	G	PGA European Tour (USA)	N64
 F9E838CF5CFD0FA493D5E5F7A7D450A80787C814	G	PGA European Tour Golf (Europe) (En,Fr,De,Es,It)	N64
 A28C689E58F58B4A2A672D3D010436661D247476	G	Pikachuu Genki de Chuu (Japan)	N64
@@ -652,8 +652,8 @@ D86A7ED2F203BA9DF0CE5B18D9E4E2E2D9B62A3F	G	Robotron 64 (Europe)	N64
 A1AA086F0826BEE4BE71C16BC67468B8D8A49065	G	Rocket - Robot on Wheels (Europe) (En,Fr,De)	N64
 622D71A44DA0B81EA68092CAC9198C66154A4F4A	G	Rocket - Robot on Wheels (USA)	N64		RiceFastTextureCRC=1
 E807ED78DB0B3440F76B445BF989A943BC05E0AD	G	Rockman Dash - Hagane no Boukenshin (Japan)	N64		Glide_increase_texrect_edge=true;Glide_filtering=0
-FAA21C8E0282D21EAC2D1B35B020F40381E18FC4	G	RR64 - Ridge Racer 64 (Europe)	N64		Glide_filtering=0
-5F079CD9827B24D12AF4961482A0FCC679E53042	G	RR64 - Ridge Racer 64 (USA)	N64		Glide_filtering=0
+FAA21C8E0282D21EAC2D1B35B020F40381E18FC4	G	RR64 - Ridge Racer 64 (Europe)	N64		Glide_filtering=0;SaveType=EEPROM_16K
+5F079CD9827B24D12AF4961482A0FCC679E53042	G	RR64 - Ridge Racer 64 (USA)	N64		Glide_filtering=0;SaveType=EEPROM_16K
 A68294E47C82639C9BCDAE1B7306AC2A2E2F47B5	G	RTL World League Soccer 2000 (Germany)	N64
 32CABA1042CABBF366852D629D3FEE1A5186BCE3	G	Rugrats - Die grosse Schatzsuche (Germany)	N64
 FB2A62F1625630D6F0BEB5FD00A32E12155D50E8	G	Rugrats - Scavenger Hunt (USA)	N64
@@ -724,9 +724,9 @@ D8BDDB9727264C14BF3BC20B2FE983FB86EADA32	G	Star Wars - Shutsugeki! Rogue Chuutai
 93ED6F1497EDE2239F9D75B4A39204B6C9DD9FFD	G	Star Wars - Teikoku no Kage (Japan)	N64
 C949856A6CB0B59A2D171C8AD2E8D913CCA23022	G	Star Wars Episode I - Battle for Naboo (Europe)	N64
 E4441A6EEB67861408C2E009BAAE8AAD4DF34021	G	Star Wars Episode I - Battle for Naboo (USA)	N64
-899A8245DA017289C88E97327FDCD6694B770A25	G	Star Wars Episode I - Racer (Europe) (En,Fr,De)	N64
-9577CCD2D069D0E7E306CF21DDB0E4765A308072	G	Star Wars Episode I - Racer (Japan)	N64
-3542D5597C8A56EA8F5C63BCEAE97A24C4C08D58	G	Star Wars Episode I - Racer (USA)	N64		RiceZHack=true
+899A8245DA017289C88E97327FDCD6694B770A25	G	Star Wars Episode I - Racer (Europe) (En,Fr,De)	N64		SaveType=EEPROM_16K
+9577CCD2D069D0E7E306CF21DDB0E4765A308072	G	Star Wars Episode I - Racer (Japan)	N64		SaveType=EEPROM_16K
+3542D5597C8A56EA8F5C63BCEAE97A24C4C08D58	G	Star Wars Episode I - Racer (USA)	N64		RiceZHack=true;SaveType=EEPROM_16K
 BD8AB8994BE02368C844234006E5C11509CE2894	G	StarCraft 64 (Australia)	N64		RiceNormalBlender=2;RiceUseCIWidthAndRatio=1;RiceRenderToTextureOption=3;Glide_detect_cpu_write=true;Glide_filtering=2;Glide_fog=false
 BC585DA421CABA45F5EB87CAA6D7A138A09E9B43	G	StarCraft 64 (Germany) (Proto)	N64		Glide_detect_cpu_write=true;Glide_filtering=2;Glide_fog=false
 472573D057E42653B7413861319B9F7342F2467D	G	StarCraft 64 (USA) (Beta)	N64
@@ -909,9 +909,9 @@ E020C26DEDE0C349181CF08A3541816DC47F63A8	G	WWF WrestleMania 2000 (Japan)	N64
 E3316269B8466FE1FB968AC9338E6ACDC0379970	G	Xena - Warrior Princess - The Talisman of Fate (USA)	N64
 3A13B42074C2B6948F55F22D3E4FE44FBF2CDE6A	G	Xplorer 64 (Germany) (v1.067) (Unl)	N64
 09929CA361D47FB9FC0EB4077CF1FB77CB843CEF	G	Yakouchuu II - Satsujin Kouro (Japan)	N64		Glide_filtering=0
-FF320B4122894C773F465A8996E82A00F3116E83	G	Yoshi Story (Japan)	N64		Glide_enable_hacks_for_game=13;Glide_fix_tex_coord=32;Glide_fog=false
-5B56EC1DA78456F968129BADDC1F233E1FB4F4F3	G	Yoshi's Story (Europe) (En,Fr,De)	N64		RiceEnableHacksForGame=9;RiceFrameBufferOption=3;RiceRenderToTextureOption=3;Glide_enable_hacks_for_game=13;Glide_fix_tex_coord=32;Glide_fog=false
-B13072FEF6C6DF48C07D8822C01E5BC59036F6DA	G	Yoshi's Story (USA) (En,Ja)	N64		RiceEnableHacksForGame=9;RiceFrameBufferOption=3;RiceRenderToTextureOption=3;Glide_enable_hacks_for_game=13;Glide_fix_tex_coord=32;Glide_fog=false
+FF320B4122894C773F465A8996E82A00F3116E83	G	Yoshi Story (Japan)	N64		Glide_enable_hacks_for_game=13;Glide_fix_tex_coord=32;Glide_fog=false;SaveType=EEPROM_16K
+5B56EC1DA78456F968129BADDC1F233E1FB4F4F3	G	Yoshi's Story (Europe) (En,Fr,De)	N64		RiceEnableHacksForGame=9;RiceFrameBufferOption=3;RiceRenderToTextureOption=3;Glide_enable_hacks_for_game=13;Glide_fix_tex_coord=32;Glide_fog=false;SaveType=EEPROM_16K
+B13072FEF6C6DF48C07D8822C01E5BC59036F6DA	G	Yoshi's Story (USA) (En,Ja)	N64		RiceEnableHacksForGame=9;RiceFrameBufferOption=3;RiceRenderToTextureOption=3;Glide_enable_hacks_for_game=13;Glide_fix_tex_coord=32;Glide_fog=false;SaveType=EEPROM_16K
 039A75636C34D219D489D0A84A671D00DC23E7C4	G	Yuke Yuke!! Trouble Makers (Japan)	N64
 41FDB879AB422EC158B4EAFEA69087F255EA8589	G	Zelda no Densetsu - Mujura no Kamen (Japan) (Rev A)	N64		Glide_enable_hacks_for_game=1;Glide_wrap_big_tex=true;Glide_fb_smart=true;Glide_fb_clear=true
 5FB2301AACBF85278AF30DCA3E4194AD48599E36	G	Zelda no Densetsu - Mujura no Kamen (Japan)	N64		RiceDisableObjBG=true;Glide_enable_hacks_for_game=1;Glide_wrap_big_tex=true;Glide_fb_smart=true;Glide_fb_clear=true
diff --git a/libmupen64plus/mupen64plus-core/src/main/rom.c b/libmupen64plus/mupen64plus-core/src/main/rom.c
index 1684cb90e7..2e924466b7 100644
--- a/libmupen64plus/mupen64plus-core/src/main/rom.c
+++ b/libmupen64plus/mupen64plus-core/src/main/rom.c
@@ -125,6 +125,7 @@ m64p_error open_rom(const unsigned char* romimage, unsigned int size)
     char buffer[256];
     unsigned char imagetype;
     int i;
+	m64p_handle CoreSection = NULL;
 
     /* check input requirements */
     if (rom != NULL)
@@ -169,6 +170,7 @@ m64p_error open_rom(const unsigned char* romimage, unsigned int size)
     trim(ROM_PARAMS.headername); /* Remove trailing whitespace from ROM name. */
 
     /* Look up this ROM in the .ini file and fill in goodname, etc */
+	/*
     if ((entry=ini_search_by_md5(digest)) != NULL ||
         (entry=ini_search_by_crc(sl(ROM_HEADER.CRC1),sl(ROM_HEADER.CRC2))) != NULL)
     {
@@ -188,6 +190,22 @@ m64p_error open_rom(const unsigned char* romimage, unsigned int size)
         ROM_SETTINGS.players = 0;
         ROM_SETTINGS.rumble = 0;
     }
+	*/
+
+	strcpy(ROM_SETTINGS.goodname, ROM_PARAMS.headername);
+    strcat(ROM_SETTINGS.goodname, " (unknown rom)");
+
+	ROM_SETTINGS.savetype = 0;
+    if (ConfigOpenSection("Core", &CoreSection) == M64ERR_SUCCESS)
+    {
+		ConfigSetDefaultInt(CoreSection, "SaveType", NONE, "The savetype for the game");
+		ROM_SETTINGS.savetype = ConfigGetParamInt(CoreSection, "SaveType");
+    }
+    
+    ROM_SETTINGS.status = 0;
+    ROM_SETTINGS.players = 0;
+    ROM_SETTINGS.rumble = 0;
+
 
     /* print out a bunch of info about the ROM */
     DebugMessage(M64MSG_INFO, "Goodname: %s", ROM_SETTINGS.goodname);