Skip to content

Commit

Permalink
Finish hooking up the M6801 for Kiki Kai Kai and Kick And Run (#159)
Browse files Browse the repository at this point in the history 
And nuke the dodgy and broken MCU sim for Kiki Kai Kai
game can now be considered 100% in the emulation dept
  • Loading branch information
@arcadez2003
arcadez2003 authored Sep 4, 2024
1 parent fa98364 commit a14ca84
Showing 1 changed file with 16 additions and 175 deletions.
191 changes: 16 additions & 175 deletions src/machine/mexico86.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@


unsigned char *mexico86_protection_ram;


static int kikikai_mcu_running, kikikai_mcu_initialised;

unsigned char *kicknrun_sharedram;
READ8_HANDLER( kicknrun_sharedram_r );
WRITE8_HANDLER( kicknrun_sharedram_w );

/*
$f008 - write
Expand All @@ -26,189 +25,31 @@ WRITE8_HANDLER( mexico86_f008_w )
// mexico 86, knight boy
cpunum_set_input_line(2, INPUT_LINE_RESET, (data & 2) ? CLEAR_LINE : ASSERT_LINE);
}
else
{
// simulation for KiKi KaiKai
kikikai_mcu_running = data & 2;
if (!kikikai_mcu_running)
kikikai_mcu_initialised = 0;
}
}


/***************************************************************************

KiKi KaiKai MCU simulation
This is derived from examination of the bootleg 68705 MCU code, with an
addition to fix collision detection which is missing from the bootleg.
***************************************************************************/
}

static void mcu_simulate(void)
WRITE8_HANDLER( kicknrun_f008_w )
{
if (!kikikai_mcu_initialised)
{
if (mexico86_protection_ram[0x01] == 0x00)
{
logerror("initialising MCU\n");
mexico86_protection_ram[0x04] = 0xfc; // coin inputs
mexico86_protection_ram[0x02] = 0xff; // player 1
mexico86_protection_ram[0x03] = 0xff; // player 2
mexico86_protection_ram[0x1b] = 0xff; // active player
mexico86_protection_ram[0x06] = 0xff; // must be FF otherwise PS4 ERROR
mexico86_protection_ram[0x07] = 0x03; // must be 03 otherwise PS4 ERROR
mexico86_protection_ram[0x00] = 0x00;
kikikai_mcu_initialised = 1;
}
}

if (kikikai_mcu_initialised)
{
int i;
static int coin_last;
int coin_curr;


coin_curr = ~readinputport(0) & 1;
if (coin_curr && !coin_last && mexico86_protection_ram[0x01] < 9)
{
mexico86_protection_ram[0x01]++; // increase credits counter
mexico86_protection_ram[0x0a] = 0x01; // set flag (coin inserted sound is not played otherwise)
}
coin_last = coin_curr;

mexico86_protection_ram[0x04] = 0x3c; // coin inputs

mexico86_protection_ram[0x02] = BITSWAP8(readinputport(1), 7,6,5,4,2,3,1,0); // player 1
mexico86_protection_ram[0x03] = BITSWAP8(readinputport(2), 7,6,5,4,2,3,1,0); // player 2

if (mexico86_protection_ram[0x19] == 0xaa) // player 2 active
mexico86_protection_ram[0x1b] = mexico86_protection_ram[0x03];
else
mexico86_protection_ram[0x1b] = mexico86_protection_ram[0x02];


for (i = 0; i < 0x10; i += 2)
mexico86_protection_ram[i + 0xb1] = mexico86_protection_ram[i + 0xb0];

for (i = 0; i < 0x0a; i++)
mexico86_protection_ram[i + 0xc0] = mexico86_protection_ram[i + 0x90] + 1;

if (mexico86_protection_ram[0xd1] == 0xff)
{
if (mexico86_protection_ram[0xd0] > 0 && mexico86_protection_ram[0xd0] < 4)
{
mexico86_protection_ram[0xd2] = 0x81;
mexico86_protection_ram[0xd0] = 0xff;
}
}


if (mexico86_protection_ram[0xe0] > 0 && mexico86_protection_ram[0xe0] < 4)
{
static UINT8 answers[3][16] =
{
{ 0x00,0x40,0x48,0x50,0x58,0x60,0x68,0x70,0x78,0x80,0x88,0x00,0x00,0x00,0x00,0x00 },
{ 0x00,0x04,0x08,0x0C,0x10,0x14,0x18,0x1C,0x20,0x31,0x2B,0x35,0x00,0x00,0x00,0x00 },
{ 0x00,0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x12,0x03,0x0A,0x0B,0x14,0x00,0x00,0x00,0x00 },
};
int table = mexico86_protection_ram[0xe0] - 1;

for (i = 1; i < 0x10; i++)
mexico86_protection_ram[0xe0 + i] = answers[table][i];
mexico86_protection_ram[0xe0] = 0xff;
}

if (mexico86_protection_ram[0xf0] > 0 && mexico86_protection_ram[0xf0] < 4)
{
mexico86_protection_ram[0xf1] = 0xb3;
mexico86_protection_ram[0xf0] = 0xff;
}


// The following is missing from Knight Boy
// this should be equivalent to the obfuscated kiki_clogic() below
{
static int db[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x10,0x18,0x00,0x00,0x00,0x00};
int sy = mexico86_protection_ram[0xa0] + ((0x18)>>1);
int sx = mexico86_protection_ram[0xa1] + ((0x18)>>1);

for (i = 0; i < 0x38; i += 8)
{
int hw = db[mexico86_protection_ram[0x20 + i] & 0xf];

if (hw)
{
if (abs(sx - (mexico86_protection_ram[0x20 + i+6] * 256 + mexico86_protection_ram[0x20 + i+7])) < hw &&
abs(sy - (mexico86_protection_ram[0x20 + i+4] * 256 + mexico86_protection_ram[0x20 + i+5])) < hw)
mexico86_protection_ram[0xa2] = 1; // we have a collision
}
}
}
}
cpunum_set_input_line(1, INPUT_LINE_RESET, (data & 4) ? CLEAR_LINE : ASSERT_LINE);
cpunum_set_input_line(2, INPUT_LINE_RESET, (data & 2) ? CLEAR_LINE : ASSERT_LINE);
}


INTERRUPT_GEN( kikikai_interrupt )
READ8_HANDLER( kicknrun_sharedram_r )
{
if (kikikai_mcu_running)
mcu_simulate();

cpunum_set_input_line_vector(0,0,mexico86_protection_ram[0]);
cpunum_set_input_line(0,0,HOLD_LINE);
return kicknrun_sharedram[offset];
}



#if 0
//AT
/***************************************************************************
Collision logic used by Kiki Kaikai (theoretical)
***************************************************************************/
#define KIKI_CL_OUT 0xa2
#define KIKI_CL_TRIGGER 0xa3
#define DCWIDTH 0
#define DCHEIGHT 0

static void kiki_clogic(int address, int latch)
WRITE8_HANDLER( kicknrun_sharedram_w )
{
static UINT8 db[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x10,0x18,0x00,0x00,0x00,0x00};
static UINT8 queue[64];
static int qfront = 0, state = 0;
int sy, sx, hw, i, qptr, diff1, diff2;

if (address != KIKI_CL_TRIGGER) // queue latched data
{
queue[qfront++] = latch;
qfront &= 0x3f;
}
else if (state ^= 1) // scan queue
{
sy = queue[(qfront-0x3a)&0x3f] + ((0x18-DCHEIGHT)>>1);
sx = queue[(qfront-0x39)&0x3f] + ((0x18-DCWIDTH)>>1);

for (i=0x38; i; i-=8)
{
qptr = qfront - i;
if (!(hw = db[queue[qptr&0x3f]&0xf])) continue;
kicknrun_sharedram[offset] = data;
}

diff1 = sx - (short)(queue[(qptr+6)&0x3f]<<8|queue[(qptr+7)&0x3f]) + DCWIDTH;
diff2 = diff1 - (hw + DCWIDTH);
if ((diff1^diff2)<0)
{
diff1 = sy - (short)(queue[(qptr+4)&0x3f]<<8|queue[(qptr+5)&0x3f]) + DCHEIGHT;
diff2 = diff1 - (hw + DCHEIGHT);
if ((diff1^diff2)<0)
mexico86_protection_ram[KIKI_CL_OUT] = 1; // we have a collision
}
}
}
INTERRUPT_GEN( kicknrun_interrupt )
{
cpunum_set_input_line_vector(0,0,kicknrun_sharedram[0]);
cpunum_set_input_line(0,0,HOLD_LINE);
}
//ZT
#endif


/***************************************************************************
Expand Down

0 comments on commit a14ca84

Please sign in to comment.