J to J1 for joystick

This commit is contained in:
Alan Steremberg
2019-03-15 11:59:01 -07:00
2 changed files with 8 additions and 2 deletions

View File

@@ -98,7 +98,7 @@ localparam CONF_STR = {
"OC,Cabinet,Upright,Cocktail;",
"-;",
"R0,Reset;",
"J1,Skip,Start 1P,Start 2P;",
"J1,Skip,Start 1P,Start 2P,Coin;",
"V,v",`BUILD_DATE
};
@@ -245,9 +245,15 @@ joyonedir jod_2
wire m_fire = btn_fire | joy[4];
<<<<<<< HEAD
wire m_start1 = btn_one_player | joy[5];
wire m_start2 = btn_two_players | joy[6];
wire m_coin = btn_coin;
=======
wire m_start1 = btn_one_player | joy[5] | btn_start_1;
wire m_start2 = btn_two_players | joy[6] | btn_start_2;
wire m_coin = btn_coin | joy[7];
>>>>>>> db1bb2592006bbe0c53dd052c15e1b39e060e720
wire hblank, vblank;
wire ce_vid = ce_6m;

View File

@@ -1,7 +1,7 @@
@echo off
set zip=puckmanb.zip
set ifiles=namcopac.6e+namcopac.6f+namcopac.6h+namcopac.6j+namcopac.6e+namcopac.6f+namcopac.6h+namcopac.6j+pacman.5e+pacman.5f+pacman.5f+pacman.5f+82s126.1m+82s126.4a+82s126.3m+82s123.7f)
set ifiles=namcopac.6e+namcopac.6f+namcopac.6h+namcopac.6j+namcopac.6e+namcopac.6f+namcopac.6h+namcopac.6j+pacman.5e+pacman.5f+pacman.5f+pacman.5f+82s126.1m+82s126.4a+82s126.3m+82s123.7f
set ofile=a.pacman.rom