Skip to content

Commit 6fb4da4

Browse files
sergiopologsergiopolog
committed
Fix offset in the additional bg layer of strahl and bioship, and fix flipscreen on 'bioship and vandyke`
1 parent 8f3aff7 commit 6fb4da4

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

‎src/mame/nmk/nmk16.cpp

+9-7
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ void nmk16_state::vandyke_map(address_map &map)
403403
map(0x080008, 0x080009).portr("DSW1");
404404
map(0x08000a, 0x08000b).portr("DSW2");
405405
map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read));
406+
map(0x080015, 0x080015).w(FUNC(nmk16_state::vandyke_flipscreen_w));
406407
map(0x080016, 0x080017).w(FUNC(nmk16_state::nmk004_x0016_w));
407408
map(0x080019, 0x080019).w(FUNC(nmk16_state::tilebank_w));
408409
map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write));
@@ -423,6 +424,7 @@ void nmk16_state::vandykeb_map(address_map &map)
423424
map(0x08000a, 0x08000b).portr("DSW2");
424425
// map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read));
425426
map(0x080010, 0x08001d).w(FUNC(nmk16_state::vandykeb_scroll_w)); // 10, 12, 1a, 1c
427+
map(0x080015, 0x080015).w(FUNC(nmk16_state::vandyke_flipscreen_w));
426428
map(0x080016, 0x080017).nopw(); // IRQ enable?
427429
map(0x080019, 0x080019).w(FUNC(nmk16_state::tilebank_w));
428430
// map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write));
@@ -656,7 +658,7 @@ void nmk16_state::bioship_map(address_map &map)
656658
map(0x080008, 0x080009).portr("DSW1");
657659
map(0x08000a, 0x08000b).portr("DSW2");
658660
map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read));
659-
// map(0xc0015, 0xc0015).w(FUNC(nmk16_state::flipscreen_w));
661+
map(0x080015, 0x080015).w(FUNC(nmk16_state::flipscreen_w));
660662
map(0x080016, 0x080017).w(FUNC(nmk16_state::nmk004_bioship_x0016_w));
661663
map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write));
662664
map(0x084001, 0x084001).w(FUNC(nmk16_state::bioship_bank_w));
@@ -9122,13 +9124,13 @@ GAME( 1989, tharrieru, tharrier, tharrier, tharrier, nmk16_state,
91229124
GAME( 1990, mustang, 0, mustang, mustang, nmk16_state, empty_init, ROT0, "UPL", "US AAF Mustang (25th May. 1990)", 0 )
91239125
GAME( 1990, mustangs, mustang, mustang, mustang, nmk16_state, empty_init, ROT0, "UPL (Seoul Trading license)", "US AAF Mustang (25th May. 1990 / Seoul Trading)", 0 )
91249126

9125-
GAME( 1990, bioship, 0, bioship, bioship, nmk16_state, empty_init, ROT0, "UPL (American Sammy license)", "Bio-ship Paladin", MACHINE_NO_COCKTAIL ) // US version but no regional notice
9126-
GAME( 1990, sbsgomo, bioship, bioship, bioship, nmk16_state, empty_init, ROT0, "UPL", "Space Battle Ship Gomorrah", MACHINE_NO_COCKTAIL )
9127+
GAME( 1990, bioship, 0, bioship, bioship, nmk16_state, empty_init, ROT0, "UPL (American Sammy license)", "Bio-ship Paladin", 0 ) // US version but no regional notice
9128+
GAME( 1990, sbsgomo, bioship, bioship, bioship, nmk16_state, empty_init, ROT0, "UPL", "Space Battle Ship Gomorrah", 0 )
91279129

9128-
GAME( 1990, vandyke, 0, vandyke, vandyke, nmk16_state, empty_init, ROT270, "UPL", "Vandyke (Japan)", MACHINE_NO_COCKTAIL )
9129-
GAME( 1990, vandykejal, vandyke, vandyke, vandyke, nmk16_state, empty_init, ROT270, "UPL (Jaleco license)", "Vandyke (Jaleco, set 1)", MACHINE_NO_COCKTAIL )
9130-
GAME( 1990, vandykejal2,vandyke, vandyke, vandyke, nmk16_state, empty_init, ROT270, "UPL (Jaleco license)", "Vandyke (Jaleco, set 2)", MACHINE_NO_COCKTAIL )
9131-
GAME( 1990, vandykeb, vandyke, vandykeb, vandykeb, nmk16_state, init_vandykeb, ROT270, "bootleg", "Vandyke (bootleg with PIC16c57)", MACHINE_NO_COCKTAIL | MACHINE_NO_SOUND )
9130+
GAME( 1990, vandyke, 0, vandyke, vandyke, nmk16_state, empty_init, ROT270, "UPL", "Vandyke (Japan)", 0 )
9131+
GAME( 1990, vandykejal, vandyke, vandyke, vandyke, nmk16_state, empty_init, ROT270, "UPL (Jaleco license)", "Vandyke (Jaleco, set 1)", 0 )
9132+
GAME( 1990, vandykejal2,vandyke, vandyke, vandyke, nmk16_state, empty_init, ROT270, "UPL (Jaleco license)", "Vandyke (Jaleco, set 2)", 0 )
9133+
GAME( 1990, vandykeb, vandyke, vandykeb, vandykeb, nmk16_state, init_vandykeb, ROT270, "bootleg", "Vandyke (bootleg with PIC16c57)", MACHINE_NO_SOUND )
91329134

91339135
GAME( 1991, blkheart, 0, blkheart, blkheart, nmk16_state, empty_init, ROT0, "UPL", "Black Heart", 0 )
91349136
GAME( 1991, blkheartj, blkheart, blkheart, blkheart, nmk16_state, empty_init, ROT0, "UPL", "Black Heart (Japan)", 0 )

‎src/mame/nmk/nmk16.h

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ class nmk16_state : public driver_device, public seibu_sound_common
9595

9696
void txvideoram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
9797
void flipscreen_w(u8 data);
98+
void vandyke_flipscreen_w(u8 data);
9899
void tilebank_w(u8 data);
99100

100101
void macross2_sound_bank_w(u8 data);

‎src/mame/nmk/nmk16_v.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ VIDEO_START_MEMBER(nmk16_state, bioship)
107107
m_bioship_background_bank=0;
108108
save_item(NAME(m_bioship_background_bank));
109109
m_bg_tilemap[0]->set_scrolldx(92, 92);
110+
m_bg_tilemap[1]->set_scrolldx(92, 92);
110111
m_tx_tilemap->set_scrolldx(92, 92);
111112
}
112113

@@ -130,6 +131,7 @@ VIDEO_START_MEMBER(nmk16_state,strahl)
130131
m_bg_tilemap[1]->set_transparent_pen(15);
131132

132133
m_sprdma_base = 0xf000;
134+
m_bg_tilemap[1]->set_scrolldx(92, 92);
133135
}
134136

135137
VIDEO_START_MEMBER(nmk16_state,macross2)
@@ -230,6 +232,12 @@ void nmk16_state::flipscreen_w(u8 data)
230232
m_spritegen->set_flip_screen(flip_screen());
231233
}
232234

235+
// vandyke writes a 0 value when flip screen is enabled, contrary to rest of games that write 1
236+
void nmk16_state::vandyke_flipscreen_w(u8 data)
237+
{
238+
flipscreen_w(~data);
239+
}
240+
233241
void nmk16_state::tilebank_w(u8 data)
234242
{
235243
if (m_bgbank != data)

0 commit comments

Comments
 (0)