Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 02:33:13 +03:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

More fixes for Ninja Emaki

Browse Source
This commit is contained in:
Angelo Salese 2011-05-04 23:13:02 +00:00
parent cc00bd2177
commit d2fef79817
3 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/drivers/galivan.c
View File

@ -501,7 +501,7 @@ static MACHINE_CONFIG_START( ninjemak, galivan_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE(ninjemak)
MCFG_GFXDECODE(ninjemak)

79
src/mame/machine/nb1414m4.c
View File

@ -7,12 +7,12 @@ Written by Angelo Salese, based on researches by Tomasz Slanina with Legion
This is some fancy MCU / blitter that copies text strings in various Nihon Bussan games;
TODO:
- Device-ify this;
- where is the condition that makes "insert coin" text to properly blink?
- first byte meaning is completely unknown;
- Kozure Ookami "credit X" message during attract mode completely clears the status bar, dunno how it's supposed to
be displayed;
- (after device-ifization) hook this up for Ninja Emaki;
- Ninja Emaki triggers unknown commands 0x8000 & 0xff20;
- Ninja Emaki continue screen is corrupt;
- How to NOT draw the params?
- Device-ify this;
Notes:
- Just before any string in the "MCU" rom, there's a control byte, this meaning is as follows:
@ -67,13 +67,13 @@ static void insert_coin_msg(address_space *space,UINT8 *vram)
if(credit_count == 0)
{
dst = (data[0x01]<<8|data[0x02]) & 0x7fff;
dst = (data[0x01]<<8|data[0x02]) & 0x3ff;
nichibutsu_1414m4_dma(space,0x0003,dst,0x10,fl_cond,vram);
}
else
{
dst = (data[0x49]<<8|data[0x4a]) & 0x7fff;
dst = (data[0x49]<<8|data[0x4a]) & 0x3ff;
nichibutsu_1414m4_dma(space,0x004b,dst,0x18,1,vram);
}
@ -86,22 +86,22 @@ static void credit_msg(address_space *space,UINT8 *vram)
UINT8 fl_cond = space->machine().primary_screen->frame_number() & 0x10; /* for insert coin "flickering" */
UINT16 dst;
dst = ((data[0x023]<<8)|(data[0x024]&0xff)) & 0x3fff;
dst = ((data[0x023]<<8)|(data[0x024]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x0025,dst,0x10,1,vram); /* credit */
dst = ((data[0x045]<<8)|(data[0x046]&0xff)) & 0x3fff;
dst = ((data[0x045]<<8)|(data[0x046]&0xff)) & 0x3ff;
dst++; // data is 0x5e, needs to be 0x5f ...
vram[dst+0x000] = (credit_count + data[0x47]); /* credit num */
vram[dst+0x000] = (credit_count + 0x30); /* credit num */
vram[dst+0x400] = (data[0x48]);
if(credit_count == 1) /* ONE PLAYER ONLY */
{
dst = ((data[0x07b]<<8)|(data[0x07c]&0xff)) & 0x3fff;
dst = ((data[0x07b]<<8)|(data[0x07c]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x007d,dst,0x18,fl_cond,vram);
}
else if(credit_count > 1) /* ONE OR TWO PLAYERS */
{
dst = ((data[0x0ad]<<8)|(data[0x0ae]&0xff)) & 0x3fff;
dst = ((data[0x0ad]<<8)|(data[0x0ae]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x00af,dst,0x18,fl_cond,vram);
}
}
@ -111,6 +111,7 @@ static void kozure_score_msg(address_space *space,UINT16 dst,UINT8 src_base,UINT
int i;
UINT8 first_digit;
UINT8 res;
UINT8 * data = (UINT8 *)space->machine().region("blit_data")->base();
first_digit = 0;
@ -126,13 +127,13 @@ static void kozure_score_msg(address_space *space,UINT16 dst,UINT8 src_base,UINT
else
vram[i+dst+0x0000] = 0x20;
vram[i+dst+0x0400] = 0x10; // hardcoded in ROM
vram[i+dst+0x0400] = data[0x10f+(src_base*0x1c)+i];
}
vram[6+dst+0x0000] = 0x30;
vram[6+dst+0x0400] = 0x10; // hardcoded in ROM
vram[6+dst+0x0400] = data[0x10f+(src_base*0x1c)+6];
vram[7+dst+0x0000] = 0x30;
vram[7+dst+0x0400] = 0x10; // hardcoded in ROM
vram[7+dst+0x0400] = data[0x10f+(src_base*0x1c)+7];
}
@ -145,8 +146,8 @@ static void nichibutsu_1414m4_0200(address_space *space, UINT16 mcu_cmd,UINT8 *v
dst &= 0x3fff;
if(dst & 0x7ff) // fill
nichibutsu_1414m4_fill(space,0x0000,data[dst & 0x3fff],data[dst+1],vram);
if(dst & 0x3ff) // fill
nichibutsu_1414m4_fill(space,0x0000,data[dst & 0x3ff],data[dst+1],vram);
else // src -> dst
nichibutsu_1414m4_dma(space,dst & 0x3fff,0x0000,0x400,1,vram);
}
@ -187,52 +188,52 @@ static void nichibutsu_1414m4_0600(address_space *space, UINT8 is2p,UINT8 *vram)
UINT16 dst;
int i;
dst = ((data[0x1f5]<<8)|(data[0x1f6]&0xff)) & 0x3fff;
dst = ((data[0x1f5]<<8)|(data[0x1f6]&0xff)) & 0x3ff;
vram[dst] = (vram[7] & 0x7) + 0x30;//data[0x1f7];
dst = ((data[0x1f8]<<8)|(data[0x1f9]&0xff)) & 0x3fff;
dst = ((data[0x1f8]<<8)|(data[0x1f9]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x1fa + (((vram[7] & 0x30) >> 4) * 0x18),dst,12,1,vram);
// 0x25a - 0x261 unknown meaning
dst = ((data[0x262]<<8)|(data[0x263]&0xff)) & 0x3fff;
dst = ((data[0x262]<<8)|(data[0x263]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x264 + (((vram[7] & 0x80) >> 7) * 0x18),dst,12,1,vram);
dst = ((data[0x294]<<8)|(data[0x295]&0xff)) & 0x3fff;
dst = ((data[0x294]<<8)|(data[0x295]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x296 + (((vram[7] & 0x40) >> 6) * 0x18),dst,12,1,vram);
dst = ((data[0x2c6]<<8)|(data[0x2c7]&0xff)) & 0x3fff;
dst = ((data[0x2c6]<<8)|(data[0x2c7]&0xff)) & 0x3ff;
vram[dst] = ((vram[0xf] & 0xf0) >> 4) + 0x30;//data[0x2c8];
dst = ((data[0x2c9]<<8)|(data[0x2ca]&0xff)) & 0x3fff;
dst = ((data[0x2c9]<<8)|(data[0x2ca]&0xff)) & 0x3ff;
vram[dst] = ((vram[0xf] & 0x0f) >> 0) + 0x30;//data[0x2cb];
dst = ((data[0x2cc]<<8)|(data[0x2cd]&0xff)) & 0x3fff;
dst = ((data[0x2cc]<<8)|(data[0x2cd]&0xff)) & 0x3ff;
vram[dst] = ((vram[0x10] & 0xf0) >> 4) + 0x30;//data[0x2ce];
dst = ((data[0x2cf]<<8)|(data[0x2d0]&0xff)) & 0x3fff;
dst = ((data[0x2cf]<<8)|(data[0x2d0]&0xff)) & 0x3ff;
vram[dst] = ((vram[0x10] & 0x0f) >> 0) + 0x30;//data[0x2d1];
dst = ((data[0x2d2]<<8)|(data[0x2d3]&0xff)) & 0x3fff;
dst = ((data[0x2d2]<<8)|(data[0x2d3]&0xff)) & 0x3ff;
vram[dst+0] = ((vram[0x11] & 0xf0) >> 4) + 0x30;//data[0x2d4];
vram[dst+1] = (vram[0x11] & 0x0f) + 0x30;//data[0x2d5];
dst = ((data[0x2d6]<<8)|(data[0x2d7]&0xff)) & 0x3fff;
dst = ((data[0x2d6]<<8)|(data[0x2d7]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x2d8 + (is2p * 0x18),dst,12,1,vram); // 1p / 2p string
dst = ((data[0x308]<<8)|(data[0x309]&0xff)) & 0x3fff;
dst = ((data[0x308]<<8)|(data[0x309]&0xff)) & 0x3ff;
for(i=0;i<5;i++) /* system inputs */
nichibutsu_1414m4_dma(space,0x310 + (((vram[0x04] >> (4-i)) & 1) * 6),dst + (i * 0x20),0x3,1,vram);
dst = ((data[0x30a]<<8)|(data[0x30b]&0xff)) & 0x3fff;
dst = ((data[0x30a]<<8)|(data[0x30b]&0xff)) & 0x3ff;
for(i=0;i<7;i++) /* 1p / 2p inputs */
nichibutsu_1414m4_dma(space,0x310 + (((vram[0x02 + is2p] >> (6-i)) & 1) * 6),dst + (i * 0x20),0x3,1,vram);
dst = ((data[0x30c]<<8)|(data[0x30d]&0xff)) & 0x3fff;
dst = ((data[0x30c]<<8)|(data[0x30d]&0xff)) & 0x3ff;
for(i=0;i<8;i++) /* dips */
nichibutsu_1414m4_dma(space,0x310 + (((vram[0x05] >> (7-i)) & 1) * 6),dst + (i * 0x20),0x3,1,vram);
dst = ((data[0x30e]<<8)|(data[0x30f]&0xff)) & 0x3fff;
dst = ((data[0x30e]<<8)|(data[0x30f]&0xff)) & 0x3ff;
for(i=0;i<8;i++) /* dips */
nichibutsu_1414m4_dma(space,0x310 + (((vram[0x06] >> (7-i)) & 1) * 6),dst + (i * 0x20),0x3,1,vram);
}
@ -242,28 +243,29 @@ static void nichibutsu_1414m4_0e00(address_space *space,UINT16 mcu_cmd,UINT8 *vr
UINT8 * data = (UINT8 *)space->machine().region("blit_data")->base();
UINT16 dst;
dst = ((data[0xdf]<<8)|(data[0xe0]&0xff)) & 0x3fff;
dst = ((data[0xdf]<<8)|(data[0xe0]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x00e1,dst,8,1,vram); /* hi-score */
if(mcu_cmd & 0x04)
{
dst = ((data[0xfb]<<8)|(data[0xfc]&0xff)) & 0x3fff;
dst = ((data[0xfb]<<8)|(data[0xfc]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x00fd,dst,8,!(mcu_cmd & 1),vram); /* 1p-msg */
dst = ((data[0x10d]<<8)|(data[0x10e]&0xff)) & 0x3fff;
dst = ((data[0x10d]<<8)|(data[0x10e]&0xff)) & 0x3ff;
kozure_score_msg(space,dst,0,vram); /* 1p score */
if(mcu_cmd & 0x80)
{
dst = ((data[0x117]<<8)|(data[0x118]&0xff)) & 0x3fff;
dst = ((data[0x117]<<8)|(data[0x118]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x0119,dst,8,!(mcu_cmd & 2),vram); /* 2p-msg */
dst = ((data[0x129]<<8)|(data[0x12a]&0xff)) & 0x3fff;
dst = ((data[0x129]<<8)|(data[0x12a]&0xff)) & 0x3ff;
kozure_score_msg(space,dst,1,vram); /* 2p score */
}
}
else
{
dst = ((data[0x133]<<8)|(data[0x134]&0xff)) & 0x3fff;
dst = ((data[0x133]<<8)|(data[0x134]&0xff)) & 0x3ff;
nichibutsu_1414m4_dma(space,0x0135,dst,0x10,!(mcu_cmd & 1),vram); /* game over */
insert_coin_msg(space,vram);
if((mcu_cmd & 0x18) == 0) // TODO: either one of these two disables credit display
credit_msg(space,vram);
}
}
@ -281,13 +283,16 @@ void nb_1414m4_exec(address_space *space,UINT16 mcu_cmd,UINT8 *vram,UINT16 &scro
case 0x0000: insert_coin_msg(space,vram); credit_msg(space,vram); break;
/* direct DMA'ing / fill */
case 0x0200: nichibutsu_1414m4_0200(space,mcu_cmd & 0x7,vram); break;
case 0x0200: nichibutsu_1414m4_0200(space,mcu_cmd & 0x87,vram); break;
/* service mode */
case 0x0600: nichibutsu_1414m4_0600(space,mcu_cmd & 1,vram); break;
/* gameplay */
case 0x0e00: nichibutsu_1414m4_0e00(space,mcu_cmd & 0xff,vram); break;
case 0x8000: break; //Ninja Emaki, attract mode
case 0xff00: break; //Ninja Emaki POST, presumably invalid
default:
popmessage("NB 1414M4 executes %04x command, contact MAMEdev\n",mcu_cmd);
break;

4
src/mame/video/galivan.c
View File

@ -161,6 +161,10 @@ static TILE_GET_INFO( ninjemak_get_tx_tile_info )
galivan_state *state = machine.driver_data<galivan_state>();
int attr = state->m_videoram[tile_index + 0x400];
int code = state->m_videoram[tile_index] | ((attr & 0x03) << 8);
if(tile_index < 0x12) /* don't draw the NB1414M4 params! TODO: could be a better fix */
code = attr = 0x01;
SET_TILE_INFO(
0,
code,