(There are a bunch of things that I want to check on it, I'll do them after a clean compile...)

-----Messaggio originale-----
Da: David Haywood [mailto:neohaze@nildram.co.uk]
Inviato: mercoledì 11 novembre 2009 13.38
Cc: Angelo Salese
Oggetto: Re: Slam Dunk 2

Improved video offsets for these games (they're not perfect, I think in reality they depend on layers enabled etc. but they're much improved)

apply after previous.

David Haywood wrote:
> with this I think you can mark it as working
>
> - added a workaround for it not enabling the display (tied to the 
> type4/rushing heroes hack we already have)
> - fixed rom loading for other sets (also swapped the data roms on 
> vsnet around so that the load positions match up with the working 
> games)
> - moved most of machine/konamigx.c to video/konamigx.c (mixer code
> etc.) left the protection related code in machine/konamigx.c
>
> note, you'll need to DELETE machine/konamigx.h from svn and ADD 
> includes/konamigx.h to it.
>
This commit is contained in:
Angelo Salese 2009-11-11 17:45:53 +00:00
parent 1b41e6ab71
commit d1b0f47a48
9 changed files with 1800 additions and 1765 deletions

2
.gitattributes vendored
View File

@ -2432,6 +2432,7 @@ src/mame/includes/jpmimpct.h svneol=native#text/plain
src/mame/includes/kaneko16.h svneol=native#text/plain
src/mame/includes/kangaroo.h svneol=native#text/plain
src/mame/includes/klax.h svneol=native#text/plain
src/mame/includes/konamigx.h svneol=native#text/plain
src/mame/includes/konamipt.h svneol=native#text/plain
src/mame/includes/kyugo.h svneol=native#text/plain
src/mame/includes/lasso.h svneol=native#text/plain
@ -2805,7 +2806,6 @@ src/mame/machine/kanekotb.h svneol=native#text/plain
src/mame/machine/konami1.c svneol=native#text/plain
src/mame/machine/konami1.h svneol=native#text/plain
src/mame/machine/konamigx.c svneol=native#text/plain
src/mame/machine/konamigx.h svneol=native#text/plain
src/mame/machine/konamiic.c svneol=native#text/plain
src/mame/machine/konamiic.h svneol=native#text/plain
src/mame/machine/konppc.c svneol=native#text/plain

View File

@ -49,7 +49,7 @@
#include "cpu/m68000/m68000.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
#include "machine/konamigx.h"
#include "konamigx.h"
#include "machine/eeprom.h"
#include "machine/am53cf96.h"
#include "harddisk.h"

View File

@ -103,7 +103,7 @@
#include "cpu/tms57002/tms57002.h"
#include "machine/eeprom.h"
#include "sound/k054539.h"
#include "machine/konamigx.h"
#include "konamigx.h"
#include "machine/adc083x.h"
#define GX_DEBUG 0
@ -113,6 +113,7 @@ VIDEO_START(konamigx_6bpp);
VIDEO_START(konamigx_6bpp_2);
VIDEO_START(konamigx_type3);
VIDEO_START(konamigx_type4);
VIDEO_START(konamigx_type4_sd2);
VIDEO_START(le2);
VIDEO_START(dragoonj);
VIDEO_START(winspike);
@ -1600,6 +1601,13 @@ static MACHINE_DRIVER_START( gxtype4vsnet )
MDRV_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gxtype4sd2 )
MDRV_IMPORT_FROM(gxtype4)
MDRV_VIDEO_START(konamigx_type4_sd2)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( winspike )
MDRV_IMPORT_FROM(konamigx)
@ -2196,8 +2204,8 @@ ROM_START( rungun2 )
/* main program */
ROM_REGION( 0x800000, "maincpu", 0 )
GX_BIOS
ROM_LOAD32_WORD_SWAP( "505uaa02.31b", 0x200002, 512*1024, CRC(cfca23f7) SHA1(dfea871f0aaf6b2db6d924ddfd4174e7a14333e8))
ROM_LOAD32_WORD_SWAP( "505uaa03.27b", 0x200000, 512*1024, CRC(ad7f9ded) SHA1(824448daeb6109b822667e54baa1c73484642ac9))
ROM_LOAD32_WORD_SWAP( "505uaa02.31b", 0x200002, 512*1024, CRC(cfca23f7) SHA1(dfea871f0aaf6b2db6d924ddfd4174e7a14333e8))
/* data roms */
ROM_LOAD32_WORD_SWAP( "505a05.29r", 0x400000, 1024*1024, CRC(5da5d695) SHA1(02bfbfa4ba0213a23819828a9be02923740dccd6) )
@ -2218,12 +2226,12 @@ ROM_START( rungun2 )
_48_WORD_ROM_LOAD( "505a19.14r", 0x0000000, 2*1024*1024, CRC(ffde4f17) SHA1(df93853f7bd3c775a15836b0ca9042f75eb65630) )
_48_WORD_ROM_LOAD( "505a15.18r", 0x0000002, 2*1024*1024, CRC(d9ab1e6c) SHA1(748a61d939bd335c1b50f440e819303552b3d5a1) )
_48_WORD_ROM_LOAD( "505a11.23r", 0x0000004, 2*1024*1024, CRC(75c13df0) SHA1(6680f75a67ca510fac29b65bce32fef64e844695) )
_48_WORD_ROM_LOAD( "505a18.18m", 0x0600000, 2*1024*1024, CRC(c12bacfe) SHA1(5b5f4dd9a51c7a305dd4de1354cd1df2ce75c932) )
_48_WORD_ROM_LOAD( "505a14.14m", 0x0600002, 2*1024*1024, CRC(356a75b0) SHA1(5f8b7a9d06d4207f19ed0f7c89513226488afde1) )
_48_WORD_ROM_LOAD( "505a10.23m", 0x0600004, 2*1024*1024, CRC(fc315ee0) SHA1(4dab661e0bd8e5386e52d514a1511ceba6e5b7bd) )
_48_WORD_ROM_LOAD( "505a17.16r", 0x0c00000, 2*1024*1024, CRC(8176f2f5) SHA1(d7944314b35bcd5301bbfba8a5b1ed6b35b9b888) )
_48_WORD_ROM_LOAD( "505a13.21r", 0x0c00002, 2*1024*1024, CRC(e60c5191) SHA1(02a8af81682838800489aa1123a453045d70acd8) )
_48_WORD_ROM_LOAD( "505a09.25r", 0x0c00004, 2*1024*1024, CRC(3e1d5a15) SHA1(ec4d46c2f2cc57e6193865357ffb3d62a9eecd4f) )
_48_WORD_ROM_LOAD( "505a17.16r", 0x0600000, 2*1024*1024, CRC(8176f2f5) SHA1(d7944314b35bcd5301bbfba8a5b1ed6b35b9b888) )
_48_WORD_ROM_LOAD( "505a13.21r", 0x0600002, 2*1024*1024, CRC(e60c5191) SHA1(02a8af81682838800489aa1123a453045d70acd8) )
_48_WORD_ROM_LOAD( "505a09.25r", 0x0600004, 2*1024*1024, CRC(3e1d5a15) SHA1(ec4d46c2f2cc57e6193865357ffb3d62a9eecd4f) )
_48_WORD_ROM_LOAD( "505a18.18m", 0x0c00000, 2*1024*1024, CRC(c12bacfe) SHA1(5b5f4dd9a51c7a305dd4de1354cd1df2ce75c932) )
_48_WORD_ROM_LOAD( "505a14.14m", 0x0c00002, 2*1024*1024, CRC(356a75b0) SHA1(5f8b7a9d06d4207f19ed0f7c89513226488afde1) )
_48_WORD_ROM_LOAD( "505a10.23m", 0x0c00004, 2*1024*1024, CRC(fc315ee0) SHA1(4dab661e0bd8e5386e52d514a1511ceba6e5b7bd) )
_48_WORD_ROM_LOAD( "505a16.16m", 0x1200000, 2*1024*1024, CRC(ca9c2193) SHA1(cc3fb558b834e0b7914879ab47c3750170d257f4) )
_48_WORD_ROM_LOAD( "505a12.21m", 0x1200002, 2*1024*1024, CRC(421d5034) SHA1(f7a85b7e41f3ddf9ddbdc6f8b6d3dbf8ba40d61b) )
_48_WORD_ROM_LOAD( "505a08.25m", 0x1200004, 2*1024*1024, CRC(442ed3ec) SHA1(d44e1c4e9f8c63a8f754f8d20064cec15ae0b6d6) )
@ -2243,8 +2251,8 @@ ROM_START( slamdnk2 )
/* main program */
ROM_REGION( 0x800000, "maincpu", 0 )
GX_BIOS
ROM_LOAD32_WORD_SWAP( "505jaa02.31m", 0x200002, 512*1024, CRC(9f72d48e) SHA1(6dd0520d0f0312e46f21ad4f6c41e47f3b5cb16b) )
ROM_LOAD32_WORD_SWAP( "505jaa03.29m", 0x200000, 512*1024, CRC(52513794) SHA1(8a8fadb0eb582db53163620982dd53d1e5f8ca4c) )
ROM_LOAD32_WORD_SWAP( "505jaa02.31m", 0x200002, 512*1024, CRC(9f72d48e) SHA1(6dd0520d0f0312e46f21ad4f6c41e47f3b5cb16b) )
/* data roms */
ROM_LOAD32_WORD_SWAP( "505a05.29r", 0x400000, 1024*1024, CRC(5da5d695) SHA1(02bfbfa4ba0213a23819828a9be02923740dccd6) )
@ -2291,8 +2299,8 @@ ROM_START( rushhero )
/* main program */
ROM_REGION( 0x800000, "maincpu", 0 )
GX_BIOS
ROM_LOAD32_WORD_SWAP( "605b02.31m", 0x200002, 512*1024, CRC(94c3d835) SHA1(f48d34987fa6575a2c41d3ca3359e9e2cbc817e0) )
ROM_LOAD32_WORD_SWAP( "605b03.29m", 0x200000, 512*1024, CRC(c5b8d31d) SHA1(6c5b359e1fcf511c50d6a876946631fc38a6dade) )
ROM_LOAD32_WORD_SWAP( "605b02.31m", 0x200002, 512*1024, CRC(94c3d835) SHA1(f48d34987fa6575a2c41d3ca3359e9e2cbc817e0) )
/* data roms */
ROM_LOAD32_WORD_SWAP( "605a05.29r", 0x400000, 1024*1024, CRC(9bca4297) SHA1(c20be1ffcee8bd56f69d4fcc19d0035b3f74b8f2))
@ -2789,8 +2797,8 @@ ROM_START( vsnetscr )
ROM_LOAD32_WORD_SWAP( "627ead02.31m", 0x200002, 0x080000, CRC(01ab336a) SHA1(6e7ab03a82548cc5bd17938df0baf47381dd86aa) )
/* data roms */
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400000, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400002, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400000, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400002, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
/* sound program */
ROM_REGION( 0x40000, "soundcpu", 0 )
@ -2829,8 +2837,8 @@ ROM_START( vsnetscreb )
ROM_LOAD32_WORD_SWAP( "627eab02.31m", 0x200002, 0x080000, CRC(cc76bce8) SHA1(54a4047412a98a5c4f64a8bc2fd3cda9c07e58b3) )
/* data roms */
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400000, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400002, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400000, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400002, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
/* sound program */
ROM_REGION( 0x40000, "soundcpu", 0 )
@ -2869,8 +2877,8 @@ ROM_START( vsnetscru )
ROM_LOAD32_WORD_SWAP( "627uab02.31m", 0x200002, 512*1024, CRC(c352cc6f) SHA1(d8d0d802eb6bd0910e35dcc6b81b7ac9036e32ea) )
/* data roms */
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400000, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400002, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400000, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400002, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
/* sound program */
ROM_REGION( 0x40000, "soundcpu", 0 )
@ -3035,8 +3043,8 @@ ROM_START( vsnetscrj )
ROM_LOAD32_WORD_SWAP( "627jab02.31m", 0x200002, 512*1024, CRC(f10929d7) SHA1(304001d44ed762682a4606a849305a9352e9bec3) )
/* data roms */
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400000, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400002, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400000, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400002, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
/* sound program */
ROM_REGION( 0x40000, "soundcpu", 0 )
@ -3075,8 +3083,8 @@ ROM_START( vsnetscra )
ROM_LOAD32_WORD_SWAP( "627aaa02.31m", 0x200002, 0x080000, CRC(e3d21afe) SHA1(28c213106087da425f85bb7f3398aca98964ea38) )
/* data roms */
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400000, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400002, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a04.29r", 0x400000, 1024*1024, CRC(17334e9a) SHA1(82cdba016c29160550c43feee7a4feff6e1184aa) )
ROM_LOAD32_WORD_SWAP( "627a05.31r", 0x400002, 1024*1024, CRC(be4e7b3c) SHA1(f44e7b1913aa54f759bd31bb86fdedbb9747b2d5) )
/* sound program */
ROM_REGION( 0x40000, "soundcpu", 0 )
@ -3746,6 +3754,6 @@ GAME( 1996, vsnetscreb,vsnetscr, gxtype4vsnet, type3, konamigx, ROT0, "Konami",
GAME( 1996, vsnetscru, vsnetscr, gxtype4vsnet, type3, konamigx, ROT0, "Konami", "Versus Net Soccer (ver UAB)", GAME_NOT_WORKING|GAME_UNEMULATED_PROTECTION )
GAME( 1996, vsnetscra, vsnetscr, gxtype4vsnet, type3, konamigx, ROT0, "Konami", "Versus Net Soccer (ver AAA)", GAME_NOT_WORKING|GAME_UNEMULATED_PROTECTION )
GAME( 1996, vsnetscrj, vsnetscr, gxtype4vsnet, type3, konamigx, ROT0, "Konami", "Versus Net Soccer (ver JAB)", GAME_NOT_WORKING|GAME_UNEMULATED_PROTECTION )
GAME( 1996, rungun2, konamigx, gxtype4, type3, konamigx, ROT0, "Konami", "Run and Gun 2 (ver UAA)", GAME_NOT_WORKING|GAME_UNEMULATED_PROTECTION )
GAME( 1996, slamdnk2, rungun2, gxtype4, type3, konamigx, ROT0, "Konami", "Slam Dunk 2 (ver JAA)", GAME_NOT_WORKING|GAME_UNEMULATED_PROTECTION )
GAME( 1996, rungun2, konamigx, gxtype4sd2, type3, konamigx, ROT0, "Konami", "Run and Gun 2 (ver UAA)", GAME_NOT_WORKING|GAME_UNEMULATED_PROTECTION )
GAME( 1996, slamdnk2, rungun2, gxtype4sd2, type3, konamigx, ROT0, "Konami", "Slam Dunk 2 (ver JAA)", GAME_IMPERFECT_GRAPHICS )
GAME( 1996, rushhero, konamigx, gxtype4, type3, konamigx, ROT0, "Konami", "Rushing Heroes (ver UAB)", GAME_IMPERFECT_GRAPHICS )

View File

@ -25,7 +25,7 @@
#include "deprecat.h"
#include "video/konamiic.h"
#include "machine/konamigx.h"
#include "konamigx.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eeprom.h"

View File

@ -1,5 +1,3 @@
#ifndef __MACH_KONAMIGX_H
#define __MACH_KONAMIGX_H
// 2nd-Tier GX/MW Hardware Functions
void K053247GP_set_SpriteOffset(int offsx, int offsy);
@ -80,7 +78,6 @@ void konamigx_mixer_primode(int mode);
void konamigx_objdma(void);
// K055550/K053990/ESC protection devices handlers
READ16_HANDLER ( K055550_word_r );
WRITE16_HANDLER( K055550_word_w );
@ -90,4 +87,5 @@ void konamigx_esc_alert(UINT32 *srcbase, int srcoffs, int count, int mode);
void fantjour_dma_install(running_machine *machine);
WRITE32_HANDLER(fantjour_dma_w);
#endif
extern UINT16 *K053247_ram;

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@
#include "driver.h"
#include "video/konamiic.h"
#include "machine/konamigx.h"
#include "konamigx.h"
static int layer_colorbase[4], layerpri[4];

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@
#include "driver.h"
#include "video/konamiic.h"
#include "machine/konamigx.h"
#include "konamigx.h"
static int layer_colorbase[6];
static int oinprion, cbparam;