diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/data/data_hiscore.lua | 18 | ||||
-rw-r--r-- | plugins/data/load_dat.lua | 4 | ||||
-rw-r--r-- | plugins/hiscore/hiscore.dat | 436 |
3 files changed, 265 insertions, 193 deletions
diff --git a/plugins/data/data_hiscore.lua b/plugins/data/data_hiscore.lua index 9c888ddffdf..515b87a2302 100644 --- a/plugins/data/data_hiscore.lua +++ b/plugins/data/data_hiscore.lua @@ -86,8 +86,9 @@ end function env.byte_trim(bytes, val) val = tonumber(val) - for i = 1, #bytes do - if bytes[i] ~= val then + len = #bytes + for i = 1, len do + if bytes[1] ~= val then return bytes end table.remove(bytes, 1) @@ -95,6 +96,19 @@ function env.byte_trim(bytes, val) return bytes end +function env.byte_trunc(bytes, val) + val = tonumber(val) + for i = 1, #bytes do + if bytes[i] == val then + break + end + end + while #bytes >= i do + table.remove(bytes) + end + return bytes +end + function env.byte_swap(bytes, val) local newbytes = {} val = tonumber(val) diff --git a/plugins/data/load_dat.lua b/plugins/data/load_dat.lua index 172f2ef71ca..024dbac0ad3 100644 --- a/plugins/data/load_dat.lua +++ b/plugins/data/load_dat.lua @@ -46,7 +46,7 @@ function datfile.open(file, vertag, fixupcb) if not fh and dbver then -- data in database but missing file, just use what we have - return read, dbver + return readret(file), dbver elseif not fh then return nil elseif not dbver then @@ -77,7 +77,7 @@ function datfile.open(file, vertag, fixupcb) end if ver == dbver then fh:close() - return read, dbver + return readret(file), dbver end if dbver then diff --git a/plugins/hiscore/hiscore.dat b/plugins/hiscore/hiscore.dat index af679191c65..ed6ac1878b5 100644 --- a/plugins/hiscore/hiscore.dat +++ b/plugins/hiscore/hiscore.dat @@ -1418,6 +1418,7 @@ beezer: ;@s:berzerk.cpp berzerk: +berzerka: berzerkb: berzerkf: berzerkg: @@ -1538,6 +1539,13 @@ quarth: ;@s:blockout.cpp +blockout2: +blockout3: +blockoutj: +@:maincpu,program,1d5fa2,78,32,05 +@:maincpu,program,1d5ece,4,00,00 + + blockout: @:maincpu,program,1d5fa4,78,32,05 @:maincpu,program,1d5ece,4,00,00 @@ -1551,12 +1559,6 @@ agressb: @:maincpu,program,1d5c81,1,1d,1d -blockout2: -blockoutj: -@:maincpu,program,1d5fa2,78,32,05 -@:maincpu,program,1d5ece,4,00,00 - - ;@s:bloodbro.cpp ;bloodbroa:******Blood Bros. (set 2) @@ -2283,6 +2285,27 @@ cchasm1: ;@s:cclimber.cpp +;ckongpt2j:******Crazy Kong Part II (Japan) +ckong: +ckongalc: +ckongdks: +ckongg: +ckonggx: +ckongmc: +ckongo: +ckongpt2: +ckongpt2a: +ckongpt2b: +ckongpt2b2: +ckongpt2j: +ckongpt2jeu: +ckongs: +dking: +monkeyd: +@:maincpu,program,6100,aa,94,92 +@:maincpu,program,60b8,3,50,00 + + ;rpatrol:******River Patrol (Orca) rpatrol: rpatroln: @@ -2312,26 +2335,6 @@ cclimbroper: @:maincpu,program,80cd,0a,30,52 -;ckongpt2j:******Crazy Kong Part II (Japan) -ckong: -ckongalc: -ckongdks: -ckongg: -ckonggx: -ckongmc: -ckongo: -ckongpt2: -ckongpt2a: -ckongpt2b: -ckongpt2j: -ckongpt2jeu: -ckongs: -dking: -monkeyd: -@:maincpu,program,6100,aa,94,92 -@:maincpu,program,60b8,3,50,00 - - ccbootmr: @:maincpu,program,8083,54,02,52 @:maincpu,program,808f,1,02,02 @@ -2406,6 +2409,19 @@ silvland: ;@s:centiped.cpp +;centipdd:******Centipede Dux (hack) +centipdb: +centipdb2: +centipdd: +centiped: +centiped1: +centiped2: +centiped3: +centipedj: +@:maincpu,program,000b,0f,10,01 +@:maincpu,program,0023,0f,04,12 + + ;*******caterpillar: caterplr: @:maincpu,program,02,18,57,01 @@ -2431,18 +2447,6 @@ warlords: @:maincpu,program,13a,2,00,00 -;centipdd:******Centipede Dux (hack) -centipdb: -centipdb2: -centipdd: -centiped: -centiped2: -centiped3: -centipedj: -@:maincpu,program,000b,0f,10,01 -@:maincpu,program,0023,0f,04,12 - - magworm: @:maincpu,program,0002,30,52,1a @@ -2754,6 +2758,7 @@ combatsct: commando: commandob: commandob2: +commandob3: commandoj: commandou: commandou2: @@ -2796,6 +2801,13 @@ mightguy: ;@s:cosmic.cpp +cosmica: +cosmica1: +cosmica2: +cosmica3: +@:maincpu,program,400e,3,00,00 + + ;(no man's land) (by GeoMan) nomnlnd: nomnlndg: @@ -2869,68 +2881,19 @@ magspot: @:maincpu,program,6008,1,20,20 -cosmica: -cosmica1: -cosmica2: -@:maincpu,program,400e,3,00,00 - - ;@s:cps1.cpp -sf2yyc: -@:maincpu,program,ffd276,28,02,20 -@:maincpu,program,ffd2c6,14,ff,96 -@:maincpu,program,ffd2ee,04,02,53 - - -;street fighter 2 (US 910318)(clone)(by tamphax) -sf2: -sf2b: -sf2ea: -sf2eb: -sf2ebbl: -sf2ebbl2: -sf2ebbl3: -sf2ed: -sf2ee: -sf2em: -sf2en: -sf2j: -sf2j17: -sf2ja: -sf2jc: -sf2jf: -sf2jh: -sf2jl: -sf2qp1: -sf2qp2: -sf2rk: -sf2stt: -sf2thndr: -sf2thndr2: -sf2ua: -sf2ub: -sf2uc: -sf2ud: -sf2ue: -sf2uf: -sf2ug: -sf2uh: -sf2ui: -sf2uk: -@:maincpu,program,ffd28a,30,00,20 -@:maincpu,program,ffd302,04,00,00 - - ;******Street Fighter II' - Hyper Fighting (World 921209) sf2acc: sf2acca: sf2amf: sf2amf2: +sf2amf3: sf2bhh: sf2ce: sf2ceb: sf2ceblp: +sf2ceds6: sf2ceea: sf2ceja: sf2cejb: @@ -2964,11 +2927,84 @@ sf2mdtb: sf2rb: sf2rb2: sf2rb3: +sf2re: @:maincpu,program,ffd276,28,00,20 @:maincpu,program,ffd2c6,14,ff,96 @:maincpu,program,ffd2ee,04,00,00 +;*******Knights of the Round (world 911127 & clones)) +knights: +knightsb: +knightsb2: +knightsb3: +knightsj: +knightsja: +knightsu: +@:maincpu,program,ffe53a,257,00,00 +@:maincpu,program,ffe78f,1,05,05 +@:maincpu,program,ffe7ca,1,02,02 +@:maincpu,program,ffa4b6,4,00,00 + + +;captcommb:******Captain Commando (bootleg) +captcomm: +captcommb: +captcommb2: +captcommj: +captcommjr1: +captcommr1: +captcommu: +@:maincpu,program,ff0000,190,08,00 +@:maincpu,program,ff018d,1,01,01 +@:maincpu,program,ffa8c2,04,00,00 + + +sf2yyc: +@:maincpu,program,ffd276,28,02,20 +@:maincpu,program,ffd2c6,14,ff,96 +@:maincpu,program,ffd2ee,04,02,53 + + +;street fighter 2 (US 910318)(clone)(by tamphax) +sf2: +sf2b: +sf2ea: +sf2eb: +sf2ebbl: +sf2ebbl2: +sf2ebbl3: +sf2ed: +sf2ee: +sf2em: +sf2en: +sf2j: +sf2j17: +sf2ja: +sf2jc: +sf2jf: +sf2jh: +sf2jl: +sf2qp1: +sf2qp2: +sf2rk: +sf2stt: +sf2thndr: +sf2thndr2: +sf2ua: +sf2ub: +sf2uc: +sf2ud: +sf2ue: +sf2uf: +sf2ug: +sf2uh: +sf2ui: +sf2uk: +@:maincpu,program,ffd28a,30,00,20 +@:maincpu,program,ffd302,04,00,00 + + sf2b2: sf2rules: @:maincpu,program,ffd28a,30,00,20 @@ -3051,18 +3087,6 @@ wofu: @:maincpu,program,ff63d4,04,00,00 -;captcommb:******Captain Commando (bootleg) -captcomm: -captcommb: -captcommj: -captcommjr1: -captcommr1: -captcommu: -@:maincpu,program,ff0000,190,08,00 -@:maincpu,program,ff018d,1,01,01 -@:maincpu,program,ffa8c2,04,00,00 - - sf2accp2: @:maincpu,program,ffd276,27,00,4b @:maincpu,program,ffd2ee,4,00,00 @@ -3118,14 +3142,6 @@ ffightjh: @:maincpu,program,ff80a0,04,00,00 -;Saturday Night Slam Masters clones -mbomberj: -slammast: -slammastu: -@:maincpu,program,ffa138,02,00,10 -@:maincpu,program,ffa13a,ae,00,00 - - ;willow (japan, english)(clone)(by tamphax) willow: willowj: @@ -3214,18 +3230,6 @@ pang3r1: @:maincpu,program,ff9726,8c,00,09 -;*******Knights of the Round (world 911127 & clones)) -knights: -knightsb: -knightsj: -knightsja: -knightsu: -@:maincpu,program,ffe53a,257,00,00 -@:maincpu,program,ffe78f,1,05,05 -@:maincpu,program,ffe7ca,1,02,02 -@:maincpu,program,ffa4b6,4,00,00 - - nemo: nemoj: nemor1: @@ -3289,8 +3293,35 @@ lostwrldo: @:maincpu,program,ffb2a0,04,00,00 +;@s:cps1bl_pic.cpp + +;Saturday Night Slam Masters clones +mbomberj: +slammast: +slammastu: +slampic: +slampic2: +@:maincpu,program,ffa138,02,00,10 +@:maincpu,program,ffa13a,ae,00,00 + + ;@s:cps2.cpp +;19xxd:******19XX: The War Against Destiny (USA 951207 Phoenix Edition) (bootleg) +19xx: +19xxa: +19xxar1: +19xxb: +19xxd: +19xxh: +19xxj: +19xxjr1: +19xxjr2: +19xxu: +@:maincpu,program,ff4dca,4,00,00 +@:maincpu,program,ff0443,9f,14,70 + + ;pzloop2:******puzz loop 2 (euro 010302) ;** stage scores not right ** ** you must wait untill the hiscore table has displayed ** ;** at least once before you start a game for this save to work **** @@ -3650,20 +3681,6 @@ avspu: @:maincpu,program,ffedda,1,44,44 -;19xxd:******19XX: The War Against Destiny (USA 951207 Phoenix Edition) (bootleg) -19xx: -19xxa: -19xxar1: -19xxb: -19xxd: -19xxh: -19xxj: -19xxjr1: -19xxjr2: -@:maincpu,program,ff4dca,4,00,00 -@:maincpu,program,ff0443,9f,14,70 - - ;(cyberbots: fullmetal madness (japan 950420)) (by GeoMan) cybots: cybotsj: @@ -3787,6 +3804,7 @@ crgolf: crimfght: crimfghtj: +crimfghtu: @:maincpu,program,1a40,46,00,19 @@ -4202,6 +4220,10 @@ deadang: ;@s:dec0.cpp +hbarrelu: +@:maincpu,program,ffbe9c,58,00,26 + + bandit: @:maincpu,program,ffaa14,50,42,86 @@ -4259,10 +4281,6 @@ slyspy2: @:maincpu,program,306add,1,30,30 -hbarrelu: -@:maincpu,program,ffbe9c,58,00,26 - - ;Robocop clones ;(robocop (world revision 4)) robocop: @@ -4277,6 +4295,7 @@ robocopw: ;*******(birdy try (japan)) birdtry: +birdtrya: @:maincpu,program,ff8530,31a,01,40 @@ -5348,6 +5367,7 @@ sidetrac: venture: venture2: venture4: +venture2b: @:maincpu,program,0380,23,00,53 @@ -5359,6 +5379,12 @@ fax2: ;@s:expro02.cpp +;zipzap:******Zip & Zap +zipzap: +zipzapa: +@:maincpu,program,c80502,4e,4e,41 + + missw02: @:maincpu,program,f825b6,63,30,20 @@ -5399,11 +5425,6 @@ fantsia2n: @:maincpu,program,f825b6,64,30,00 -;zipzap:******Zip & Zap -zipzap: -@:maincpu,program,c80502,4e,4e,41 - - galsnew: galsnewa: galsnewj: @@ -5976,6 +5997,17 @@ galaxiac: ;@s:galaxian.cpp +frogger: +froggeram: +froggermc: +froggers1: +froggers2: +froggers3: +quaak: +@:maincpu,program,83f1,a,63,01 +@:maincpu,program,83ef,2,63,04 + + ;mooncmw:******Moon War (Moon Cresta bootleg) eagle: eagle2: @@ -6429,16 +6461,6 @@ exodus: @:maincpu,program,55e1,1,10,10 -frogger: -froggeram: -froggermc: -froggers1: -froggers2: -quaak: -@:maincpu,program,83f1,a,63,01 -@:maincpu,program,83ef,2,63,04 - - explorer: @:maincpu,program,4200,1e,49,01 @:maincpu,program,40a8,03,00,01 @@ -7073,6 +7095,7 @@ gradius4: hvyunit: hvyunitj: +hvyunitja: hvyunitjo: hvyunitu: @:master,program,e190,28,00,50 @@ -7328,11 +7351,13 @@ gtmrusa: ;@s:kangaroo.cpp +;****** Top score updates after game start or attract mode Loop ****** kangaroo: kangarooa: kangaroob: @:maincpu,program,e1a0,3c,00,00 -@:maincpu,program,e1da,1,50,50 +@:maincpu,program,e300,6,00,00 +@:maincpu,program,e302,1,05,05 ;(funky fish) (by GeoMan) @@ -8024,6 +8049,21 @@ fghtbskt: ;@s:m72.cpp +;dbreed:******Dragon Breed (M81 pcb version) +dbreed: +@:maincpu,program,88990,82,58,2e +@:maincpu,program,8896a,3,58,00 +@:maincpu,program,88959,1,2b,2b + + +;dbreedm72:******dragon breed (m72 pcb version) +dbreedm72: +dbreedm72j: +@:maincpu,program,9096a,03,58,00 +@:maincpu,program,90990,82,58,2e +@:maincpu,program,90950,01,06,06 + + airduel: @:maincpu,program,d3d4e,82,15,20 @@ -8052,13 +8092,6 @@ gallop: @:maincpu,program,a3dba,3c,00,5a -;dbreedm72:******dragon breed (m72 pcb version) -dbreedm72: -@:maincpu,program,9096a,03,58,00 -@:maincpu,program,90990,82,58,2e -@:maincpu,program,90950,01,06,06 - - ;********cosmic cop(world)(by Firebrand) cosmccop: @:maincpu,program,e3c5e,6e,10,41 @@ -8150,13 +8183,6 @@ majtitlej: @:maincpu,program,d2ba4,9b,4b,17 -;dbreed:******Dragon Breed (M81 pcb version) -dbreed: -@:maincpu,program,88990,82,58,2e -@:maincpu,program,8896a,3,58,00 -@:maincpu,program,88959,1,2b,2b - - ;(hammerin' harry (world)) clones (by GeoMan) dkgensanm72: @:maincpu,program,a09a0,9f,40,20 @@ -8636,6 +8662,13 @@ megaphx: ;@s:megasys1.cpp +p47: +p47b: +p47j: +p47je: +@:maincpu,program,f1800,78,00,4f + + rodland: rodlanda: @:maincpu,program,f60fc,226,00,01 @@ -8729,12 +8762,6 @@ astyanax: @:maincpu,program,f8863,1,02,02 -p47: -p47j: -p47je: -@:maincpu,program,f1800,78,00,4f - - avspirit: @:maincpu,program,79df2,53,00,54 @@ -10696,6 +10723,7 @@ pacman: pacmanf: pacmanfm: pacmanjpm: +pacmanug: pacmini: ; missing pacmini2: ; missing pacmod: @@ -11491,8 +11519,11 @@ popper: powerins: powerinsa: powerinsb: +powerinsc: powerinsj: powerinspu: +powerinspj: +powerinspu: @:maincpu,program,18e800,28,00,05 @@ -12713,6 +12744,10 @@ mjleague: ;@s:segas16b.cpp +dfjail: +@:maincpu,program,fffc00,46,00,47 + + fantzone: fantzonee: fantzoneta: @@ -13143,6 +13178,7 @@ rdftjb: rdfts: rdftu: rdftua: +rdftgr: @:maincpu,program,29bc1,aa,40,4f @@ -14231,6 +14267,13 @@ spcforce: @:maincpu,program,4300,50,30,30 +;@s:spdheat.cpp + +;** hiscore not working, this is just for reference ** +spdheat: +@:maincpu,program,80d8e,327,00,2e + + ;@s:spdodgeb.cpp nkdodge: @@ -14341,6 +14384,7 @@ srumbler3: sshangha: sshanghab: sshanghaj: +sshanghak: @:maincpu,program,fec478,13f,00,1c @@ -14569,20 +14613,21 @@ uballoon: ;@s:suna8.cpp -hardhea2: -hardhea2a: -@:maincpu,program,cf10,c8,00,48 -@:maincpu,program,c8a0,02,00,03 - - ;(hard head & popper) hardhead: hardheadb: +hardheadb3: pop_hh: @:maincpu,program,ce80,18e,03,3d @:maincpu,program,c051,3,00,00 +hardhea2: +hardhea2a: +@:maincpu,program,cf10,c8,00,48 +@:maincpu,program,c8a0,02,00,03 + + srangerb: @:maincpu,program,d220,4c,00,2e @:maincpu,program,c851,2,00,03 @@ -15615,6 +15660,7 @@ kurikint: kurikinta: kurikintj: kurikintu: +kurikintw: @:maincpu,program,8aa3,a0,00,2e @@ -16329,6 +16375,7 @@ tmht22pe: tmnt2: tmnt22pu: tmnt2a: +tmnt24pu: @:maincpu,program,107600,14,03,01 @:maincpu,program,1076c8,27,47,45 @@ -16385,6 +16432,7 @@ ssridersuda: punkshot: punkshot2: punkshotj: +punkshot2e: @:maincpu,program,80700,30,00,40 @@ -16635,6 +16683,7 @@ pipibibs: pipibibsa: pipibibsbl: pipibibsp: +pipibibsbl2: @:maincpu,program,0805d8,1,00,00 @:maincpu,program,0805d9,3,05,00 @:maincpu,program,0805e4,46,00,ff @@ -17298,10 +17347,15 @@ vendettaz: carnival: carnivalb: carnivalc: +verbena: @:maincpu,program,e397,3c,00,00 @:maincpu,program,e5a2,9,20,20 +wantsega: +@:maincpu,program,86f3,3,00,00 + + ;******n-sub (upright) nsub: @:maincpu,program,8397,2,00,00 @@ -17476,6 +17530,17 @@ volfieduo: ;@s:vsnes.cpp +;suprmrioa:******Vs. Super Mario Bros. (alt) +;(vs super mario bros) +suprmrio: +suprmrioa: +suprmriobl: +suprmriobl2: +suprmriobl3: +@:maincpu,program,6675,8b,05,00 +@:maincpu,program,7d7,6,00,00 + + nvs_machridera: @:maincpu,program,700,50,00,4b @:maincpu,program,701,1,05,05 @@ -17569,14 +17634,6 @@ skatekds: @:maincpu,program,6675,8a,05,05 -;suprmrioa:******Vs. Super Mario Bros. (alt) -;(vs super mario bros) -suprmrio: -suprmrioa: -@:maincpu,program,6675,8b,05,00 -@:maincpu,program,7d7,6,00,00 - - ;(vs. wrecking crew) wrecking: @:maincpu,program,a1,3,00,00 @@ -17883,6 +17940,7 @@ wrallyb: ;@s:wyvernf0.cpp wyvernf0: +wyvernf0a: @:maincpu,program,8800,190,00,26 |