diff options
author | Vas Crabb <cuavas@users.noreply.github.com> | 2016-06-26 11:58:40 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-26 11:58:40 +1000 |
commit | 01f5ef7bc29ec69f73a0a114efae14c36f4272b8 (patch) | |
tree | dfcb075951eddc39b0163257c40f72bd8e52d75f | |
parent | e2a9d23ae78ee25beb6ca66eed790db7f6ed502f (diff) | |
parent | 7b3096680da60d1333b3c7502180b3adacc3a24a (diff) |
Merge pull request #997 from system11b/S11mjjoship_fix
S11mjjoship fix
-rw-r--r-- | src/mame/drivers/homedata.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/homedata.cpp | 24 |
2 files changed, 22 insertions, 4 deletions
diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index 1259afcd209..e5153d72ca9 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -2118,7 +2118,7 @@ GAME( 1988, mrokumei, 0, mrokumei, mjhokite, driver_device, 0, ROT0, " GAME( 1988, reikaids, 0, reikaids, reikaids, homedata_state, reikaids, ROT0, "Home Data", "Reikai Doushi (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, battlcry, 0, reikaids, battlcry, homedata_state, battlcry, ROT0, "Home Data", "Battlecry", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1989, mjkojink, 0, pteacher, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong Kojinkyouju (Private Teacher) (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, mjjoship, 0, pteacher, mjjoship, driver_device, 0, ROT0, "Home Data", "Mahjong Joshi Pro-wres -Give up 5 byou mae- (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) +GAME( 1988, mjjoship, 0, pteacher, mjjoship, driver_device, 0, ROT0, "Home Data", "Mahjong Joshi Pro-wres -Give up 5 byou mae- (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, vitaminc, 0, pteacher, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong Vitamin C (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, mjyougo, 0, pteacher, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong-yougo no Kisotairyoku (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, mjkinjas, 0, mjkinjas, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong Kinjirareta Asobi (Japan)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/video/homedata.cpp b/src/mame/video/homedata.cpp index 4ca9e496cf2..355cf3411c7 100644 --- a/src/mame/video/homedata.cpp +++ b/src/mame/video/homedata.cpp @@ -946,8 +946,10 @@ UINT32 homedata_state::screen_update_pteacher(screen_device &screen, bitmap_ind1 width 3 4 5 6 33*8 = a6 00 ef db (mjikaga) + 246 = 96 17 ef db (mjjoship) 35*8 = bc 0b ef f0 51*8 = a6 07 ef db (mjikaga) + 414 = b7 10 ef db (mjjoship, db becomes e8 after first loss) 54*8 = bc 07 ef e8 but in mjkinjas it's @@ -968,6 +970,12 @@ UINT32 homedata_state::screen_update_pteacher(screen_device &screen, bitmap_ind1 screen.set_visible_area(0*8, 42*8-1, 2*8, 30*8-1); scroll_low = 0; } + else if (m_vreg[0x4] == 0x17) + { + /* kludge for mjjoship */ + screen.set_visible_area(0*8, 61*4+1, 2*8, 30*8-1); + scroll_low = 0; + } else { if (m_vreg[0x3] == 0xa6) @@ -979,11 +987,21 @@ UINT32 homedata_state::screen_update_pteacher(screen_device &screen, bitmap_ind1 } else { - if (m_vreg[0x3] == 0xa6) + if (m_vreg[0x3] == 0xa6) + { screen.set_visible_area(0*8, 51*8-1, 2*8, 30*8-1); - else + scroll_low = 7 - (m_vreg[0x4] & 0x0f); + } + else if (m_vreg[0x3] == 0xb7) + { + screen.set_visible_area(0*8, 52*8-3, 2*8, 30*8-1); + scroll_low = 0; + } + else + { screen.set_visible_area(0*8, 54*8-1, 2*8, 30*8-1); - scroll_low = 7 - (m_vreg[0x4] & 0x0f); + scroll_low = 7 - (m_vreg[0x4] & 0x0f); + } } scroll_high = m_vreg[0xb] >> 2; |