mirror of
https://github.com/holub/mame
synced 2025-05-24 06:30:04 +03:00
Cleanups and version bump.
This commit is contained in:
Aaron Giles
parent
a8c3265ce7
commit
99d297a6fd
@ -812,14 +812,14 @@ void ay8910_reset_ym(void *chip)
|
||||
ay8910_write_reg(psg, AY_BCOARSE, 2);
|
||||
ay8910_write_reg(psg, AY_CFINE, 0);
|
||||
ay8910_write_reg(psg, AY_CCOARSE, 4);
|
||||
//#define AY_NOISEPER (6)
|
||||
//#define AY_NOISEPER (6)
|
||||
ay8910_write_reg(psg, AY_ENABLE, ~7);
|
||||
ay8910_write_reg(psg, AY_AVOL, 10);
|
||||
ay8910_write_reg(psg, AY_BVOL, 10);
|
||||
ay8910_write_reg(psg, AY_CVOL, 10);
|
||||
//#define AY_EFINE (11)
|
||||
//#define AY_ECOARSE (12)
|
||||
//#define AY_ESHAPE (13)
|
||||
//#define AY_EFINE (11)
|
||||
//#define AY_ECOARSE (12)
|
||||
//#define AY_ESHAPE (13)
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -156,7 +156,7 @@ void SCSPDSP_Step(struct _SCSPDSP *DSP)
|
||||
#endif
|
||||
//INPUTS RW
|
||||
// colmns97 hits this
|
||||
// assert(IRA<0x32);
|
||||
// assert(IRA<0x32);
|
||||
if(IRA<=0x1f)
|
||||
INPUTS=DSP->MEMS[IRA];
|
||||
else if(IRA<=0x2F)
|
||||
|
||||
@ -787,14 +787,14 @@ static DISCRETE_SOUND_START(boothill)
|
||||
* Combine all sound sources.
|
||||
************************************************/
|
||||
/* There is a 1uF cap on the input to the amp that I was too lazy to simulate.
|
||||
* It is just a DC blocking cap needed by the Norton amp. Doing the extra
|
||||
* work to simulate it is not going to make a difference to the waveform
|
||||
* or to how it sounds. Also I use a regular amp in place of the Norton
|
||||
* for the same reasons. Ease of coding/simulation. */
|
||||
* It is just a DC blocking cap needed by the Norton amp. Doing the extra
|
||||
* work to simulate it is not going to make a difference to the waveform
|
||||
* or to how it sounds. Also I use a regular amp in place of the Norton
|
||||
* for the same reasons. Ease of coding/simulation. */
|
||||
|
||||
/* The schematics show the Hit sounds as shown.
|
||||
* This makes the death of the enemy sound on the players side.
|
||||
* This should be verified. */
|
||||
* This makes the death of the enemy sound on the players side.
|
||||
* This should be verified. */
|
||||
|
||||
DISCRETE_MIXER2(NODE_91, BOOTHILL_GAME_ON_EN, BOOTHILL_L_SHOT_SND, BOOTHILL_L_HIT_SND, &boothill_l_mixer)
|
||||
|
||||
|
||||
@ -1392,14 +1392,14 @@ static DISCRETE_SOUND_START( btime_sound )
|
||||
DISCRETE_CRFILTER(NODE_41, 1, NODE_40, RES_K(10), CAP_U(10))
|
||||
|
||||
/* Amplifier is upc1181H3
|
||||
*
|
||||
* http://www.mydarc.de/dj7oh/fad/ics/upc1181/upc1181.htm
|
||||
*
|
||||
* A linear frequency response is mentioned as well as a lower
|
||||
* edge frequency determined by cap on pin3, however no formula given.
|
||||
*
|
||||
* not modelled here
|
||||
*/
|
||||
*
|
||||
* http://www.mydarc.de/dj7oh/fad/ics/upc1181/upc1181.htm
|
||||
*
|
||||
* A linear frequency response is mentioned as well as a lower
|
||||
* edge frequency determined by cap on pin3, however no formula given.
|
||||
*
|
||||
* not modelled here
|
||||
*/
|
||||
|
||||
/* Assuming a 4 Ohm impedance speaker */
|
||||
DISCRETE_CRFILTER(NODE_43, 1, NODE_41, 3.0, CAP_U(100))
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
todo:
|
||||
finish
|
||||
sprite fixes
|
||||
correct roz rotation
|
||||
correct roz rotation
|
||||
colour fixes for the sprites
|
||||
Dip-Switches
|
||||
make cntsteer work, comms looks awkward and probably different than Zero Target
|
||||
@ -178,10 +178,10 @@ static VIDEO_UPDATE( zerotrgt )
|
||||
*/
|
||||
static WRITE8_HANDLER(cntsteer_vregs_w)
|
||||
{
|
||||
// static UINT8 test[5];
|
||||
// static UINT8 test[5];
|
||||
|
||||
// test[offset] = data;
|
||||
// popmessage("%02x %02x %02x %02x %02x",test[0],test[1],test[2],test[3],test[4]);
|
||||
// test[offset] = data;
|
||||
// popmessage("%02x %02x %02x %02x %02x",test[0],test[1],test[2],test[3],test[4]);
|
||||
|
||||
switch(offset)
|
||||
{
|
||||
|
||||
@ -82,18 +82,18 @@ static MACHINE_RESET( mermaid )
|
||||
/* ticks for the attract mode. */
|
||||
mcu_ram.attract_timer = 0;
|
||||
/*
|
||||
helper for the program flow.
|
||||
0 = title screen
|
||||
1 = demo mode
|
||||
2 = ranking
|
||||
3 = Push 1p button
|
||||
4 = Push 1p AND/OR 2p button
|
||||
5 = player 1 plays
|
||||
6 = player 2 plays
|
||||
7 = service mode
|
||||
8 = game over screen
|
||||
...
|
||||
*/
|
||||
helper for the program flow.
|
||||
0 = title screen
|
||||
1 = demo mode
|
||||
2 = ranking
|
||||
3 = Push 1p button
|
||||
4 = Push 1p AND/OR 2p button
|
||||
5 = player 1 plays
|
||||
6 = player 2 plays
|
||||
7 = service mode
|
||||
8 = game over screen
|
||||
...
|
||||
*/
|
||||
mcu_ram.program_flow = 0;
|
||||
if(input_port_read(machine, "DSW1") & 4) //service mode
|
||||
mcu_ram.program_flow = 7;
|
||||
@ -102,7 +102,7 @@ static MACHINE_RESET( mermaid )
|
||||
|
||||
static WRITE8_HANDLER( mermaid_data_w )
|
||||
{
|
||||
// printf("%02x\n",data);
|
||||
// printf("%02x\n",data);
|
||||
if(mcu_ram.access_ram_w)
|
||||
{
|
||||
mcu_ram.internal_ram[(mcu_ram.internal_ram_index++)&0x7f] = data;
|
||||
@ -136,14 +136,14 @@ static READ8_HANDLER( mermaid_data_r )
|
||||
return mcu_ram.internal_ram[(mcu_ram.internal_ram_index++)&0x7f];
|
||||
}
|
||||
|
||||
// popmessage("%02x",test_mcu);
|
||||
// popmessage("%02x",test_mcu);
|
||||
|
||||
switch(mcu_data)
|
||||
{
|
||||
/*
|
||||
pc=55f1
|
||||
store internal mcu ram values, not yet handled.
|
||||
*/
|
||||
pc=55f1
|
||||
store internal mcu ram values, not yet handled.
|
||||
*/
|
||||
case 0:
|
||||
{
|
||||
/*next data will be an internal protection RAM read*/
|
||||
@ -151,26 +151,26 @@ static READ8_HANDLER( mermaid_data_r )
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
(PC=4f20) 01 $e003 = val
|
||||
(PC=4f2b) 01 $e004 = val
|
||||
(PC=4f5c) 01 val > 0xa and e06f = val coin counter (5)
|
||||
0 = title screen
|
||||
4 = "push 1p button"
|
||||
5 = "push 2p button"
|
||||
6 = copyright Kaneko msg (what is for?)
|
||||
7 = ranking
|
||||
8 = (trigger) attract mode
|
||||
b = (trigger?) player 1 plays
|
||||
c = (trigger?) player 2 plays
|
||||
0x10 = game over screen
|
||||
0x80 = coin error! msg
|
||||
(PC=4f82) 01 val<<=1 and check if < 0 program flow (6)
|
||||
(PC=4ef3) 01 $e06c = val, (complement it and AND $3)
|
||||
(PC=4f13) 01 $e06d = $e06e = val
|
||||
(PC=4f13) 01
|
||||
(PC=14b3) 01
|
||||
(PC=14ca) 81
|
||||
*/
|
||||
(PC=4f20) 01 $e003 = val
|
||||
(PC=4f2b) 01 $e004 = val
|
||||
(PC=4f5c) 01 val > 0xa and e06f = val coin counter (5)
|
||||
0 = title screen
|
||||
4 = "push 1p button"
|
||||
5 = "push 2p button"
|
||||
6 = copyright Kaneko msg (what is for?)
|
||||
7 = ranking
|
||||
8 = (trigger) attract mode
|
||||
b = (trigger?) player 1 plays
|
||||
c = (trigger?) player 2 plays
|
||||
0x10 = game over screen
|
||||
0x80 = coin error! msg
|
||||
(PC=4f82) 01 val<<=1 and check if < 0 program flow (6)
|
||||
(PC=4ef3) 01 $e06c = val, (complement it and AND $3)
|
||||
(PC=4f13) 01 $e06d = $e06e = val
|
||||
(PC=4f13) 01
|
||||
(PC=14b3) 01
|
||||
(PC=14ca) 81
|
||||
*/
|
||||
case 1:
|
||||
{
|
||||
switch(mcu_ram_mux[1])
|
||||
@ -228,20 +228,20 @@ static READ8_HANDLER( mermaid_data_r )
|
||||
return res;
|
||||
}
|
||||
/*
|
||||
(PC=4fbe) 03 ? (Is it read?)
|
||||
*/
|
||||
(PC=4fbe) 03 ? (Is it read?)
|
||||
*/
|
||||
case 3: return mame_rand(space->machine);
|
||||
/*
|
||||
(PC=4e4d) 06 complement and put it to e06a
|
||||
(PC=4e59) 06 $e019 = val
|
||||
(PC=4f5c) 06 $e06f = val if NOT > 09
|
||||
(PC=4f82) 06 val<<=1 and check if < 0
|
||||
*/
|
||||
// case 6: return 0;
|
||||
(PC=4e4d) 06 complement and put it to e06a
|
||||
(PC=4e59) 06 $e019 = val
|
||||
(PC=4f5c) 06 $e06f = val if NOT > 09
|
||||
(PC=4f82) 06 val<<=1 and check if < 0
|
||||
*/
|
||||
// case 6: return 0;
|
||||
/*
|
||||
pc=5621 put the value to e003 (and 8)
|
||||
pc=562f put the value to e004 (and 4)
|
||||
*/
|
||||
pc=5621 put the value to e003 (and 8)
|
||||
pc=562f put the value to e004 (and 4)
|
||||
*/
|
||||
/* read back dsw. */
|
||||
case 0xff: return 0;
|
||||
}
|
||||
@ -262,13 +262,13 @@ static READ8_HANDLER( mermaid_data_r )
|
||||
static READ8_HANDLER( mermaid_status_r )
|
||||
{
|
||||
static UINT8 unk_bit,mcu_status = 8;
|
||||
// printf("R St\n");
|
||||
// printf("R St\n");
|
||||
|
||||
unk_bit^=4;
|
||||
mcu_status^=8;
|
||||
|
||||
return mcu_status | unk_bit | 0x10;
|
||||
// return mame_rand(space->machine);
|
||||
// return mame_rand(space->machine);
|
||||
}
|
||||
|
||||
static TILE_GET_INFO( get_bg_tile_info )
|
||||
@ -295,7 +295,7 @@ static VIDEO_UPDATE(hvyunit)
|
||||
tilemap_set_scrollx( bg_tilemap,0, ((port0_data&0x40)<<2)+ hu_scrollx + SX_POS); //TODO
|
||||
tilemap_set_scrolly( bg_tilemap,0, ((port0_data&0x80)<<1)+ hu_scrolly + SY_POS); // TODO
|
||||
|
||||
// popmessage("%02x %02x",hu_scrollx[0],hu_scrolly[0]);
|
||||
// popmessage("%02x %02x",hu_scrollx[0],hu_scrolly[0]);
|
||||
|
||||
bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
|
||||
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
|
||||
@ -400,8 +400,8 @@ static ADDRESS_MAP_START(sub_io, ADDRESS_SPACE_IO, 8 )
|
||||
AM_RANGE(0x0c, 0x0c) AM_READ(mermaid_status_r)
|
||||
AM_RANGE(0x0e, 0x0e) AM_RAM
|
||||
|
||||
// AM_RANGE(0x22, 0x22) AM_READ(hu_scrolly_hi_reset) //22/a2 taken from ram $f065
|
||||
// AM_RANGE(0xa2, 0xa2) AM_READ(hu_scrolly_hi_set)
|
||||
// AM_RANGE(0x22, 0x22) AM_READ(hu_scrolly_hi_reset) //22/a2 taken from ram $f065
|
||||
// AM_RANGE(0xa2, 0xa2) AM_READ(hu_scrolly_hi_set)
|
||||
|
||||
ADDRESS_MAP_END
|
||||
|
||||
|
||||
@ -3117,7 +3117,7 @@ ROM_START( von2 ) /* Step 2.0 */
|
||||
|
||||
ROM_REGION( 0x1000000, "samples", 0 ) /* SCSP samples */
|
||||
/* WARNING: mpr- numbers here are a guess based on how other sets are ordered and may not be right.
|
||||
If restoring a real PCB, go by the IC numbers in the extension! (.22, .24) */
|
||||
If restoring a real PCB, go by the IC numbers in the extension! (.22, .24) */
|
||||
ROM_LOAD( "mpr-20663.22", 0x000000, 0x400000, CRC(977eb6a4) SHA1(9dbba51630cbef2351d79b82ab6ae3af4aed99f0) )
|
||||
ROM_LOAD( "mpr-20665.24", 0x400000, 0x400000, CRC(0efc0ca8) SHA1(1414becad21eb7d03d816a8cba47506f941b3c29) )
|
||||
ROM_LOAD( "mpr-20664.23", 0x800000, 0x400000, CRC(89220782) SHA1(18a3585af960a76eb08f187223e9b69ad16809a1) )
|
||||
@ -3193,7 +3193,7 @@ ROM_START( von254g ) /* Step 2.0 */
|
||||
|
||||
ROM_REGION( 0x1000000, "samples", 0 ) /* SCSP samples */
|
||||
/* WARNING: mpr- numbers here are a guess based on how other sets are ordered and may not be right.
|
||||
If restoring a real PCB, go by the IC numbers in the extension! (.22, .24) */
|
||||
If restoring a real PCB, go by the IC numbers in the extension! (.22, .24) */
|
||||
ROM_LOAD( "mpr-20663.22", 0x000000, 0x400000, CRC(977eb6a4) SHA1(9dbba51630cbef2351d79b82ab6ae3af4aed99f0) )
|
||||
ROM_LOAD( "mpr-20665.24", 0x400000, 0x400000, CRC(0efc0ca8) SHA1(1414becad21eb7d03d816a8cba47506f941b3c29) )
|
||||
ROM_LOAD( "mpr-20664.23", 0x800000, 0x400000, CRC(89220782) SHA1(18a3585af960a76eb08f187223e9b69ad16809a1) )
|
||||
|
||||
@ -377,7 +377,7 @@ static WRITE8_HANDLER ( daisyari_bank_w )
|
||||
dsw_select = (data & 0xc);
|
||||
|
||||
address = 0x10000 + ((data & 0x30)>>4) * 0x10000 + (data & 0x1) * 0x8000;
|
||||
// printf("%08x %02x\n",address,data);
|
||||
// printf("%08x %02x\n",address,data);
|
||||
|
||||
memory_set_bankptr(space->machine, 1,&rom[address]);
|
||||
|
||||
@ -388,7 +388,7 @@ static READ8_HANDLER ( mjclub_dsw_r )
|
||||
{
|
||||
switch (dsw_select)
|
||||
{
|
||||
// case 0x00: return input_port_read(space->machine, "DSW4");
|
||||
// case 0x00: return input_port_read(space->machine, "DSW4");
|
||||
case 0x40: return input_port_read(space->machine, "DSW2");
|
||||
case 0x80: return input_port_read(space->machine, "DSW3");
|
||||
case 0xc0: return input_port_read(space->machine, "DSW4");
|
||||
@ -407,7 +407,7 @@ static WRITE8_HANDLER ( mjclub_bank_w )
|
||||
data &= 0x0f;
|
||||
|
||||
address = 0x10000 + data * 0x8000;
|
||||
// printf("%08x\n",address);
|
||||
// printf("%08x\n",address);
|
||||
|
||||
memory_set_bankptr(space->machine, 1,&rom[address]);
|
||||
|
||||
|
||||
@ -484,11 +484,11 @@ static ADDRESS_MAP_START( rocknms_main_map, ADDRESS_SPACE_PROGRAM, 16 )
|
||||
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
|
||||
AM_RANGE(0x200000, 0x23ffff) AM_RAM_WRITE(rockn_priority_w) AM_BASE(&tetrisp2_priority) // Priority
|
||||
AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_BASE(&paletteram16) // Palette
|
||||
// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
|
||||
// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
|
||||
AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot) // Rotation
|
||||
AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_BASE(&tetrisp2_vram_fg) // Foreground
|
||||
AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_BASE(&tetrisp2_vram_bg) // Background
|
||||
// AM_RANGE(0x808000, 0x809fff) AM_RAM // ???
|
||||
// AM_RANGE(0x808000, 0x809fff) AM_RAM // ???
|
||||
AM_RANGE(0x900000, 0x903fff) AM_READWRITE(rockn_nvram_r, tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size) // NVRAM
|
||||
AM_RANGE(0xa30000, 0xa30001) AM_READWRITE(rockn_soundvolume_r, rockn_soundvolume_w) // Sound Volume
|
||||
AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound
|
||||
@ -519,11 +519,11 @@ static ADDRESS_MAP_START( rocknms_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
|
||||
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
|
||||
AM_RANGE(0x200000, 0x23ffff) AM_RAM_WRITE(rocknms_sub_priority_w) AM_BASE(&rocknms_sub_priority) // Priority
|
||||
AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(rocknms_sub_palette_w) AM_BASE(&paletteram16_2) // Palette
|
||||
// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
|
||||
// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
|
||||
AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(rocknms_sub_vram_rot_w) AM_BASE(&rocknms_sub_vram_rot) // Rotation
|
||||
AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(rocknms_sub_vram_fg_w) AM_BASE(&rocknms_sub_vram_fg) // Foreground
|
||||
AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(rocknms_sub_vram_bg_w) AM_BASE(&rocknms_sub_vram_bg) // Background
|
||||
// AM_RANGE(0x808000, 0x809fff) AM_RAM // ???
|
||||
// AM_RANGE(0x808000, 0x809fff) AM_RAM // ???
|
||||
AM_RANGE(0x900000, 0x907fff) AM_RAM // NVRAM
|
||||
AM_RANGE(0xa30000, 0xa30001) AM_WRITE(rockn_soundvolume_w) // Sound Volume
|
||||
AM_RANGE(0xa40000, 0xa40003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // Sound
|
||||
@ -538,7 +538,7 @@ static ADDRESS_MAP_START( rocknms_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
|
||||
AM_RANGE(0xba0000, 0xba001f) AM_WRITE(rocknms_sub_systemregs_w) // system param
|
||||
AM_RANGE(0xba001a, 0xba001b) AM_WRITENOP // Lev 4 irq ack
|
||||
AM_RANGE(0xba001e, 0xba001f) AM_WRITENOP // Lev 2 irq ack
|
||||
// AM_RANGE(0xbe0000, 0xbe0001) AM_READNOP // INT-level1 dummy read
|
||||
// AM_RANGE(0xbe0000, 0xbe0001) AM_READNOP // INT-level1 dummy read
|
||||
AM_RANGE(0xbe0002, 0xbe0003) AM_READWRITE(rocknms_main2sub_r, rocknms_sub2main_w) // MAIN <-> SUB Communication
|
||||
AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r ) // Watchdog
|
||||
ADDRESS_MAP_END
|
||||
|
||||
@ -519,7 +519,7 @@ VIDEO_START( decocass )
|
||||
gfx_element_set_source(machine->gfx[3], decocass_objectram);
|
||||
|
||||
/* This should ensure that the fake 17th tile is left blank
|
||||
* now that dirty-tile tracking is handled by the core */
|
||||
* now that dirty-tile tracking is handled by the core */
|
||||
gfx_element_decode(machine->gfx[2], 16);
|
||||
}
|
||||
|
||||
|
||||
@ -36,9 +36,9 @@ WRITE8_HANDLER( cm_outport0_w )
|
||||
---- -x-- (girl enable?)
|
||||
---- x--- (reels enable)
|
||||
|
||||
xxxx ---- unused?
|
||||
xxxx ---- unused?
|
||||
|
||||
*/
|
||||
*/
|
||||
//popmessage("%02x",data);
|
||||
}
|
||||
|
||||
|
||||
@ -667,10 +667,10 @@ void sys24_sprite_vh_start(running_machine *machine)
|
||||
Clip?
|
||||
0 01---nnn nnnnnnnn next sprite
|
||||
1 hVH----- -------- hide/vflip/hflip
|
||||
2 -------y yyyyyyyy Clip top
|
||||
2 -------x xxxxxxxx Clip left
|
||||
2 -------y yyyyyyyy Clip bottom
|
||||
2 -------x xxxxxxxx Clip right
|
||||
2 -------y yyyyyyyy Clip top
|
||||
2 -------x xxxxxxxx Clip left
|
||||
2 -------y yyyyyyyy Clip bottom
|
||||
2 -------x xxxxxxxx Clip right
|
||||
|
||||
Skipped entry
|
||||
0 10---nnn nnnnnnnn next sprite
|
||||
|
||||
@ -9,4 +9,4 @@
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
const char build_version[] = "0.129u5 ("__DATE__")";
|
||||
const char build_version[] = "0.129u6 ("__DATE__")";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user