Skip to content

Commit

Permalink
galaxold: remove no_cocktail flag for most games [Robbbert]
Browse files Browse the repository at this point in the history
  • Loading branch information
@happppp
happppp committed Jan 18, 2025
1 parent e086658 commit 7140d7d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
26 changes: 13 additions & 13 deletions src/mame/galaxian/galaxold.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ void galaxold_state::dkongjrmc_map(address_map &map)
{
map(0x0000, 0x5fff).rom();
map(0x6000, 0x6fff).ram();
map(0x7000, 0x70ff).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram");
map(0x7100, 0x71ff).ram().share("spriteram");
map(0x7000, 0x70ff).w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram");
map(0x7100, 0x71ff).writeonly().share("spriteram");
map(0x7400, 0x77ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram");
map(0x7800, 0x7800).portr("DSW");
map(0x7801, 0x7801).w(FUNC(galaxold_state::galaxold_nmi_enable_w));
Expand Down Expand Up @@ -965,7 +965,7 @@ int galaxold_state::_4in1_fake_port_r()
{
static const char *const portnames[] = { "FAKE1", "FAKE2", "FAKE3", "FAKE4" };

return (ioport(portnames[m__4in1_bank])->read() & Mask) ? 1 : 0;
return (ioport(portnames[m_4in1_bank])->read() & Mask) ? 1 : 0;
}

static INPUT_PORTS_START( 4in1 )
Expand Down Expand Up @@ -2625,18 +2625,18 @@ ROM_END

// Z80 games
// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY, FULLNAME, FLAGS
GAME( 1981, vpool, hustler, mooncrst, vpool, galaxold_state, empty_init, ROT90, "bootleg", "Video Pool (bootleg on Moon Cresta hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1981, scramblb, scramble, scramblb, scramblb, galaxold_state, empty_init, ROT90, "bootleg", "Scramble (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1981, scramb2, scramble, scramb2, scramb2, galaxold_state, empty_init, ROT90, "bootleg", "Scramble (bootleg, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1981, scramb3, scramble, scramb3, scramb2, galaxold_state, empty_init, ROT90, "bootleg", "Scramble (bootleg, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1981, scrambler, scramble, scrambler, scrambler, galaxold_state, empty_init, ROT90, "bootleg (Reben S.A.)", "Scramble (Reben S.A. Spanish bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1981, scrambleo, scramble, scrambleo, scrambleo, galaxold_state, empty_init, ROT90, "bootleg (Okapi)", "Scramble (Okapi bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1981, scrabbleo, scramble, scrambler, scrambler, galaxold_state, empty_init, ROT90, "bootleg (Okapi?)", "Scrabble (Spanish bootleg of Scramble)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1981, vpool, hustler, mooncrst, vpool, galaxold_state, empty_init, ROT90, "bootleg", "Video Pool (bootleg on Moon Cresta hardware)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, scramblb, scramble, scramblb, scramblb, galaxold_state, empty_init, ROT90, "bootleg", "Scramble (bootleg on Galaxian hardware)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, scramb2, scramble, scramb2, scramb2, galaxold_state, empty_init, ROT90, "bootleg", "Scramble (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, scramb3, scramble, scramb3, scramb2, galaxold_state, empty_init, ROT90, "bootleg", "Scramble (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, scrambler, scramble, scrambler, scrambler, galaxold_state, empty_init, ROT90, "bootleg (Reben S.A.)", "Scramble (Reben S.A. Spanish bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, scrambleo, scramble, scrambleo, scrambleo, galaxold_state, empty_init, ROT90, "bootleg (Okapi)", "Scramble (Okapi bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, scrabbleo, scramble, scrambler, scrambler, galaxold_state, empty_init, ROT90, "bootleg (Okapi?)", "Scrabble (Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, 4in1, 0, _4in1, 4in1, galaxold_state, init_4in1, ROT90, "Armenia / Food and Fun", "4 Fun in 1", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1982, dkongjrm, dkongjr, dkongjrm, dkongjrm, galaxold_state, empty_init, ROT90, "bootleg", "Donkey Kong Jr. (bootleg on Moon Cresta hardware, set 1)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1982, dkongjrm, dkongjr, dkongjrm, dkongjrm, galaxold_state, empty_init, ROT90, "bootleg", "Donkey Kong Jr. (bootleg on Moon Cresta hardware, set 1)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1982, dkongjrmc, dkongjr, dkongjrmc, dkongjrmc, galaxold_state, empty_init, ROT90, "bootleg (Centromatic)", "Donkey Kong Jr. (bootleg on Moon Cresta hardware, set 2)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // sprites leave artifacts
GAME( 1982, tazzmang, tazmania, tazzmang, tazzmang, galaxold_state, empty_init, ROT90, "bootleg", "Tazz-Mania (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1982, tazzmang2, tazmania, tazzmang, tazzmang, galaxold_state, empty_init, ROT90, "bootleg", "Tazz-Mania (bootleg on Galaxian hardware with Starfield)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1982, tazzmang, tazmania, tazzmang, tazzmang, galaxold_state, empty_init, ROT90, "bootleg", "Tazz-Mania (bootleg on Galaxian hardware)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, tazzmang2, tazmania, tazzmang, tazzmang, galaxold_state, empty_init, ROT90, "bootleg", "Tazz-Mania (bootleg on Galaxian hardware with Starfield)", MACHINE_SUPPORTS_SAVE )

// Videotron cartridge system
GAME( 1981, hustlerb3, hustler, videotron, hustlerb3, galaxold_state, empty_init, ROT90, "bootleg (Videotron)", "Video Pool (bootleg of Video Hustler)", MACHINE_SUPPORTS_SAVE )
Expand Down
2 changes: 1 addition & 1 deletion src/mame/galaxian/galaxold.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class galaxold_state : public driver_device
output_finder<2> m_leds;

int m_irq_line = 0;
uint8_t m__4in1_bank = 0U;
uint8_t m_4in1_bank = 0U;
tilemap_t *m_bg_tilemap = nullptr;
int m_spriteram2_present = 0;
uint8_t m_gfxbank[5]{};
Expand Down
8 changes: 4 additions & 4 deletions src/mame/galaxian/galaxold_m.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ uint8_t galaxold_state::scramblb_protection_2_r()

void galaxold_state::_4in1_bank_w(uint8_t data)
{
m__4in1_bank = data & 0x03;
galaxold_gfxbank_w(0, m__4in1_bank);
membank("bank1")->set_entry(m__4in1_bank);
m_4in1_bank = data & 0x03;
galaxold_gfxbank_w(0, m_4in1_bank);
membank("bank1")->set_entry(m_4in1_bank);
}

void galaxold_state::init_4in1()
Expand All @@ -153,7 +153,7 @@ void galaxold_state::init_4in1()

_4in1_bank_w(0); /* set the initial CPU bank */

save_item(NAME(m__4in1_bank));
save_item(NAME(m_4in1_bank));
}

void galaxold_state::init_bullsdrtg()
Expand Down

0 comments on commit 7140d7d

Please sign in to comment.