Skip to content

Commit

Permalink
Merge branch 'finalburnneo-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
barbudreadmon committed May 1, 2021
2 parents e9e8049 + 24deec5 commit 717d044
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 21 deletions.
8 changes: 4 additions & 4 deletions src/burn/drv/galaxian/d_galaxian.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20031,7 +20031,7 @@ static INT32 MonsterzInit()

struct BurnDriver BurnDrvSfx = {
"sfx", NULL, NULL, NULL, "1983",
"SF-X\0", "Incomplete Sound", "Nichibutsu", "Galaxian",
"SF-X\0", "Incomplete Sound", "Taiyo System (Nichibutsu license)", "Galaxian",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_GALAXIAN, GBF_HORSHOOT, 0,
NULL, SfxRomInfo, SfxRomName, NULL, NULL, NULL, NULL, SfxInputInfo, SfxDIPInfo,
Expand All @@ -20041,7 +20041,7 @@ struct BurnDriver BurnDrvSfx = {

struct BurnDriverD BurnDrvSkelagon = {
"skelagon", "sfx", NULL, NULL, "1983",
"Skelagon\0", "Bad Dump", "Nichibutsu USA", "Galaxian",
"Skelagon\0", "Bad Dump", "Taiyo System (Nichibutsu USA license)", "Galaxian",
NULL, NULL, NULL, NULL,
BDF_CLONE, 2, HARDWARE_GALAXIAN, GBF_HORSHOOT, 0,
NULL, SkelagonRomInfo, SkelagonRomName, NULL, NULL, NULL, NULL, SfxInputInfo, SfxDIPInfo,
Expand All @@ -20050,8 +20050,8 @@ struct BurnDriverD BurnDrvSkelagon = {
};

struct BurnDriverD BurnDrvMonsterz = {
"monsterz", NULL, NULL, NULL, "19??",
"Monster Zero\0", "Protected", "Nihon", "Galaxian",
"monsterz", NULL, NULL, NULL, "1982",
"Monster Zero\0", "Protected", "Taiyo System", "Galaxian",
NULL, NULL, NULL, NULL,
0, 2, HARDWARE_GALAXIAN, GBF_HORSHOOT, 0,
NULL, MonsterzRomInfo, MonsterzRomName, NULL, NULL, NULL, NULL, SfxInputInfo, SfxDIPInfo,
Expand Down
4 changes: 2 additions & 2 deletions src/burn/drv/midway/d_wunit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1555,8 +1555,8 @@ struct BurnDriver BurnDrvNbamhtl10 = {
// NBA Maximum Hangtime (ver M1.0 11/08/96)

static struct BurnRomInfo nbamhtm10RomDesc[] = {
{ "m1.0_maximum_hangtime_u54_l_version.u54", 0x080000, 0xe4e665d5, 1 | BRF_PRG | BRF_ESS }, // 0 TMS34010
{ "m1.0_maximum_hangtime_u63_l_version.u63", 0x080000, 0x51cfda55, 1 | BRF_PRG | BRF_ESS }, // 1
{ "m1.0_maximum_hangtime_u54_m_version.u54", 0x080000, 0xe4e665d5, 1 | BRF_PRG | BRF_ESS }, // 0 TMS34010
{ "m1.0_maximum_hangtime_u63_m_version.u63", 0x080000, 0x51cfda55, 1 | BRF_PRG | BRF_ESS }, // 1

{ "l1.0_nba_hangtime_u_2_music_spch.u2", 0x100000, 0x3f0b0d0a, 2 | BRF_PRG | BRF_ESS }, // 2 DCS sound banks
{ "l1.0_nba_hangtime_u_3_music_spch.u3", 0x100000, 0xec1db988, 2 | BRF_PRG | BRF_ESS }, // 3
Expand Down
2 changes: 1 addition & 1 deletion src/burn/drv/midway/d_yunit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,7 @@ static struct BurnRomInfo narc6RomDesc[] = {
{ "rev6_narc_game_rom_u60.u60", 0x10000, 0x5f6b0429, (3 | 8) | BRF_PRG | BRF_ESS }, // 7
{ "rev6_narc_game_rom_u77.u77", 0x10000, 0x508cfa38, (3 | 8) | BRF_PRG | BRF_ESS }, // 8
{ "rev6_narc_game_rom_u59.u59", 0x10000, 0x84bc91fc, (3 | 8) | BRF_PRG | BRF_ESS }, // 9
{ "rev4_narc_game_rom_u42.u42", 0x10000, 0xee8ae9d4, (3 | 8) | BRF_PRG | BRF_ESS }, // 10
{ "rev6_narc_game_rom_u42.u42", 0x10000, 0xee8ae9d4, (3 | 8) | BRF_PRG | BRF_ESS }, // 10
{ "rev6_narc_game_rom_u24.u24", 0x10000, 0x4fbe2ff5, (3 | 8) | BRF_PRG | BRF_ESS }, // 11
{ "rev6_narc_game_rom_u41.u41", 0x10000, 0x43a1bbbc, (3 | 8) | BRF_PRG | BRF_ESS }, // 12
{ "rev6_narc_game_rom_u23.u23", 0x10000, 0xed0d149d, (3 | 8) | BRF_PRG | BRF_ESS }, // 13
Expand Down
1 change: 1 addition & 0 deletions src/burn/drv/midway/williams_cvsd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ void williams_cvsd_init(UINT8 *prgrom, INT32 prot_start, INT32 prot_end, INT32 s
BurnTimerAttachM6809(2000000);

hc55516_init(M6809TotalCycles, 2000000);
hc55516_volume(0.35);

DACInit(0, 0, 1, M6809TotalCycles, 2000000);
DACSetRoute(0, 0.25, BURN_SND_ROUTE_BOTH);
Expand Down
2 changes: 1 addition & 1 deletion src/burn/drv/pre90s/d_asteroids.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ static INT32 AstdeluxInit()

earom_init();

PokeyInit(12096000/8, 1, 2.40, 1);
PokeyInit(12096000/8, 1, 1.40, 1);
PokeySetTotalCyclesCB(M6502TotalCycles);
PokeyAllPotCallback(0, allpot_read);

Expand Down
2 changes: 1 addition & 1 deletion src/burn/drv/pre90s/d_tempest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ static INT32 DrvInit()

BurnWatchdogInit(DrvDoReset, 180);

PokeyInit(12096000/8, 2, 2.40, 0);
PokeyInit(12096000/8, 2, 1.40, 0);
PokeySetTotalCyclesCB(M6502TotalCycles);
PokeyPotCallback(0, 0, port1_read);
PokeyPotCallback(0, 1, port1_read);
Expand Down
54 changes: 54 additions & 0 deletions src/burn/drv/pst90s/d_aerofgt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3424,6 +3424,60 @@ struct BurnDriver BurnDrvSpinlbrj = {
};


// Spinal Breakers (Japan, prototype 11/14 15:00)

static struct BurnRomInfo spinlbrjpRomDesc[] = {
{ "spb0-e.ic98", 0x010000, 0x421eaff2, BRF_ESS | BRF_PRG }, // 68000 code swapped
{ "sbp1-o.ic94", 0x010000, 0x9576d508, BRF_ESS | BRF_PRG },
{ "sbp1-e.ic93", 0x010000, 0xd6444d1e, BRF_ESS | BRF_PRG },
{ "spb0-o.ic104", 0x010000, 0xa3f7bd8e, BRF_ESS | BRF_PRG },

{ "ic15", 0x080000, 0xe318cf3a, BRF_GRA }, // gfx 1
{ "ic9", 0x080000, 0xe071f674, BRF_GRA },

{ "ic17", 0x080000, 0xa63d5a55, BRF_GRA }, // gfx 2
{ "ic11", 0x080000, 0x7dcc913d, BRF_GRA },
{ "ic16", 0x080000, 0x0d84af7f, BRF_GRA },

{ "ic12", 0x080000, 0xd63fac4e, BRF_GRA }, // gfx 3
{ "ic18", 0x080000, 0x5a60444b, BRF_GRA },

{ "ic14", 0x080000, 0x1befd0f3, BRF_GRA }, // gfx 4
{ "ic20", 0x080000, 0xc2f84a61, BRF_GRA },
{ "ic35", 0x080000, 0xeba8e1a3, BRF_GRA },
{ "ic40", 0x080000, 0x5ef5aa7e, BRF_GRA },

{ "sbm-1-18.ic19", 0x010000, 0xe155357f, BRF_GRA }, // gfx 5, hardcoded sprite maps
{ "sbm-0-18.ic13", 0x010000, 0x16b79e45, BRF_GRA },

{ "11-14_music.ic117", 0x008000, 0x6b8c8f09, BRF_ESS | BRF_PRG }, // Sound CPU
{ "11-14_m-bank.ic118", 0x010000, 0xa1ed270b, BRF_ESS | BRF_PRG },

{ "ic166", 0x080000, 0x6e0d063a, BRF_SND }, // samples
{ "ic163", 0x080000, 0xe6621dfb, BRF_SND },

{ "epl16p8bp.ic100", 263, 0x00000000, BRF_OPT | BRF_NODUMP },
{ "epl16p8bp.ic127", 263, 0x00000000, BRF_OPT | BRF_NODUMP },
{ "epl16p8bp.ic133", 263, 0x00000000, BRF_OPT | BRF_NODUMP },
{ "epl16p8bp.ic99", 263, 0x00000000, BRF_OPT | BRF_NODUMP },
{ "gal16v8a.ic114", 279, 0x00000000, BRF_OPT | BRF_NODUMP },
{ "gal16v8a.ic95", 279, 0x00000000, BRF_OPT | BRF_NODUMP },
};

STD_ROM_PICK(spinlbrjp)
STD_ROM_FN(spinlbrjp)

struct BurnDriver BurnDrvSpinlbrjp = {
"spinlbrkjp", "spinlbrk", NULL, NULL, "1990",
"Spinal Breakers (Japan, prototype 11/14 15:00)\0", NULL, "V-System Co.", "V-System",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_SHOOT, 0,
NULL, spinlbrjpRomInfo, spinlbrjpRomName, NULL, NULL, NULL, NULL, spinlbrkInputInfo, spinlbrjDIPInfo,
spinlbrkInit,DrvExit,DrvFrame,spinlbrkDraw,DrvScan,&DrvRecalc,0x400,
352,240,4,3
};


// Power Spikes (World)

static struct BurnRomInfo pspikesRomDesc[] = {
Expand Down
2 changes: 1 addition & 1 deletion src/burn/drv/pst90s/d_nmk16.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7767,7 +7767,7 @@ static struct BurnRomInfo hotbublRomDesc[] = {
{ "afega10.cr5.uc15", 0x080000, 0x65bd5159, 4 | BRF_GRA }, // 4 Tiles
{ "afega10.cr7.uc19", 0x080000, 0xa89d9ce4, 4 | BRF_GRA }, // 5
{ "afega9.cr6.uc16", 0x080000, 0x99d6523c, 4 | BRF_GRA }, // 6
{ "afega9.cr1.uc6", 0x080000, 0xfc9101d2, 4 | BRF_GRA }, // 7
{ "afega8.cr1.uc6", 0x080000, 0xfc9101d2, 4 | BRF_GRA }, // 7
{ "afega9.cr3.uc12", 0x080000, 0xc841a4f6, 4 | BRF_GRA }, // 8
{ "afega9.cr2.uc7", 0x080000, 0x27ad6fc8, 4 | BRF_GRA }, // 9

Expand Down
4 changes: 2 additions & 2 deletions src/burn/snd/asteroids.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -560,8 +560,8 @@ void astdelux_sound_update(INT16 *buffer, INT32 length)
{
INT32 sum = 0;

sum += explosion(samplerate) / 2;
sum += thrust(samplerate) / 2;
sum += explosion(samplerate) / 7;
sum += thrust(samplerate) / 7;

*buffer++ = sum;
*buffer++ = sum;
Expand Down
2 changes: 1 addition & 1 deletion src/burn/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#define VER_MAJOR 1
#define VER_MINOR 0
#define VER_BETA 0
#define VER_ALPHA 1
#define VER_ALPHA 2

#define BURN_VERSION (VER_MAJOR * 0x100000) + (VER_MINOR * 0x010000) + (((VER_BETA / 10) * 0x001000) + ((VER_BETA % 10) * 0x000100)) + (((VER_ALPHA / 10) * 0x000010) + (VER_ALPHA % 10))

Expand Down
10 changes: 2 additions & 8 deletions whatsnew.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ <h3>v1.0.0.02</h3>
<!-- fixes and features -->
<h4>Fixes and new features</h4>
<ul>
<li>Game Genie support added to NES, info how to add codes, etc: <a href="https://neo-source.com/index.php?topic=2487.msg32108#msg32108">NES Game Genie Tutorial</a></li>
<li>Fix Japanese text in gameinfo history tab [dink, fusion]</li>
<li>Add big-endian support for most drivers [crystalct]</li>
<li>Fix screen flipping in Basic Blitter [dink]</li>
Expand Down Expand Up @@ -147,21 +148,14 @@ <h4>Fixes and new features</h4>
<li>Keeping ZX Spectrum library up-to-date [Svipur]</li>
<li>Added Macros for all inputs &amp; checkbox for Auto-Fire [taoenwen]</li>
<li> []</li>
<li> []</li>
<li> []</li>
<li> []</li>
<li> []</li>
<li> []</li>
<li> []</li>
<li> []</li>
</ul>
<!-- new drivers -->
<h4>New drivers</h4>
<ul>
<li>Added driver for Fairchild Channel F games [iq_132]</li>
<li>Added driver for Seibu SPI games: Raiden Fighters, Raiden Fighters 2 and Jet, Viper Phase 1, E-Jan HS and Senkyu [iq_132]</li>
<li>Added driver for Namco NB-1/NB-1 games: Gun Bullet/Point Blank, Nebulas Ray, The Outfoxies, Mach Breakers, Super World Statium 95-97, Great Sluggers 93-94 [iq_132, dink]</li>
<li>Added driver for Namco NA-1/NA-2 games: Fighter & Attacker, Super World Court, Exvania, Cosmo Gang the Puzzle, Tinkle Pit, Emeraldia, Knuckle Heads, Numan Athletics, X-Day 2, Nettou! Quiz [iq_132, dink]</li>
<li>Added driver for Namco NA-1/NA-2 games: Fighter &amp; Attacker, Super World Court, Exvania, Cosmo Gang the Puzzle, Tinkle Pit, Emeraldia, Knuckle Heads, Numan Athletics, X-Day 2, Nettou! Quiz [iq_132, dink]</li>
<li>Added driver for Midway Y-Unit games: NARC, Trog, Smash T.V., High Impact Football, Super High Impact, Strike Force, Terminator 2, Mortal Kombat, Total Carnage [iq_132, dink]</li>
<li>Added driver for Jaleco MegaSystem 32 games: Desert War, Gratia, Tetris Plus, Tetris Plus 2, Best Bout Boxing, PK Soccer V2, P-47 Aces, ... [iq_132]</li>
<li>Added driver for Midway X-Unit: Revolution X [iq_132, dink]</li>
Expand Down

0 comments on commit 717d044

Please sign in to comment.