diff --git a/Arcade_MiST/Konami Green Beret Hardware/README.txt b/Arcade_MiST/Konami Green Beret Hardware/README.txt index 9ca4a4d0..848ece36 100644 --- a/Arcade_MiST/Konami Green Beret Hardware/README.txt +++ b/Arcade_MiST/Konami Green Beret Hardware/README.txt @@ -3,7 +3,7 @@ -- Usage: -- - Create ROM and ARC files from the MRA files in the meta directory -- using the MRA utility. --- Example: mra -A -z /path/to/mame/roms gberet.mra +-- Example: mra -A -z /path/to/mame/roms "Green Beret.mra" -- - Copy the ROM files to the root of the SD Card -- - Copy the RBF and ARC files to the same folder on the SD Card -- diff --git a/Arcade_MiST/Konami Green Beret Hardware/meta/gberet.mra b/Arcade_MiST/Konami Green Beret Hardware/meta/Green Beret.mra similarity index 100% rename from Arcade_MiST/Konami Green Beret Hardware/meta/gberet.mra rename to Arcade_MiST/Konami Green Beret Hardware/meta/Green Beret.mra diff --git a/Arcade_MiST/Konami Green Beret Hardware/meta/mrgoemon.mra b/Arcade_MiST/Konami Green Beret Hardware/meta/Mr. Goemon.mra similarity index 100% rename from Arcade_MiST/Konami Green Beret Hardware/meta/mrgoemon.mra rename to Arcade_MiST/Konami Green Beret Hardware/meta/Mr. Goemon.mra diff --git a/Arcade_MiST/Konami Green Beret Hardware/meta/rushatck.mra b/Arcade_MiST/Konami Green Beret Hardware/meta/Rush'n Attack (US).mra similarity index 100% rename from Arcade_MiST/Konami Green Beret Hardware/meta/rushatck.mra rename to Arcade_MiST/Konami Green Beret Hardware/meta/Rush'n Attack (US).mra diff --git a/Arcade_MiST/Konami Scramble Hardware/Scramble_MiST/README.txt b/Arcade_MiST/Konami Scramble Hardware/Scramble_MiST/README.txt index 6329e838..61b69fac 100644 --- a/Arcade_MiST/Konami Scramble Hardware/Scramble_MiST/README.txt +++ b/Arcade_MiST/Konami Scramble Hardware/Scramble_MiST/README.txt @@ -6,7 +6,7 @@ -- Usage: -- Create ROM and ARC files from MAME ROM zip files using the mra utility and the MRA files. -- Copy the RBF and the ARC files to the same folder. --- Example: mra -z /path/to/mame/roms scramble.mra +-- Example: mra -A -z /path/to/mame/roms scramble.mra -- Copy the ROM files to the root of the SD Card. -- -- MRA utilty: https://github.com/sebdel/mra-tools-c diff --git a/Arcade_MiST/Midway MCR 2/Journey_MiST/README.txt b/Arcade_MiST/Midway MCR 2/Journey_MiST/README.txt index a3d4e32e..b7d5620b 100644 --- a/Arcade_MiST/Midway MCR 2/Journey_MiST/README.txt +++ b/Arcade_MiST/Midway MCR 2/Journey_MiST/README.txt @@ -4,8 +4,13 @@ -- 03 January 2020 -- -- TV 15kHz interlaced / VGA --- JOURNEY.ROM required --- cat d2 d3 d4 d5 d6 a b c d g3 g4 a7 a8 a5 a6 a3 a4 a1 a2 > JOURNEY.ROM +-- +-- Create JOURNEY.ROM from MAME ROM zip files using the mra utility and the MRA file. +-- Example: mra -z /path/to/mame/roms Journey.mra +-- Copy the RBF to the SD Card. +-- Copy the ROM files to the root of the SD Card. +-- +-- MRA utilty: https://github.com/sebdel/mra-tools-c -- -- Based on Kickman/Timber by Dar --------------------------------------------------------------------------------- diff --git a/Arcade_MiST/Midway MCR 2/Journey_MiST/meta/Journey.mra b/Arcade_MiST/Midway MCR 2/Journey_MiST/meta/Journey.mra new file mode 100644 index 00000000..c508429d --- /dev/null +++ b/Arcade_MiST/Midway MCR 2/Journey_MiST/meta/Journey.mra @@ -0,0 +1,34 @@ + + Journey + 0216 + 201912310000 + 1984 + Bally Midway + Action + MCR3 + journey + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Arcade_MiST/Midway MCR 2/Journey_MiST/rtl/Journey_MiST.sv b/Arcade_MiST/Midway MCR 2/Journey_MiST/rtl/Journey_MiST.sv index a5d5c542..1762f856 100644 --- a/Arcade_MiST/Midway MCR 2/Journey_MiST/rtl/Journey_MiST.sv +++ b/Arcade_MiST/Midway MCR 2/Journey_MiST/rtl/Journey_MiST.sv @@ -89,14 +89,33 @@ wire [7:0] joystick_0; wire [7:0] joystick_1; wire scandoublerD; wire ypbpr; -wire [15:0] audio_l, audio_r; -wire hs, vs, cs; -wire blankn; -wire [2:0] g, r, b; +wire no_csync; wire key_pressed; wire [7:0] key_code; wire key_strobe; +user_io #( + .STRLEN(($size(CONF_STR)>>3))) +user_io( + .clk_sys (clk_sys ), + .conf_str (CONF_STR ), + .SPI_CLK (SPI_SCK ), + .SPI_SS_IO (CONF_DATA0 ), + .SPI_MISO (SPI_DO ), + .SPI_MOSI (SPI_DI ), + .buttons (buttons ), + .switches (switches ), + .scandoubler_disable (scandoublerD ), + .ypbpr (ypbpr ), + .no_csync (no_csync ), + .key_strobe (key_strobe ), + .key_pressed (key_pressed ), + .key_code (key_code ), + .joystick_0 (joystick_0 ), + .joystick_1 (joystick_1 ), + .status (status ) + ); + wire [15:0] rom_addr; wire [15:0] rom_do; wire [13:0] snd_addr; @@ -193,6 +212,11 @@ always @(posedge clk_sys) begin end +wire [15:0] audio_l, audio_r; +wire hs, vs, cs; +wire blankn; +wire [2:0] g, r, b; + journey journey( .clock_40(clk_sys), .reset(reset), @@ -227,8 +251,8 @@ journey journey( wire vs_out; wire hs_out; -assign VGA_VS = scandoublerD | vs_out; -assign VGA_HS = scandoublerD ? cs : hs_out; +assign VGA_HS = (~no_csync & scandoublerD & ~ypbpr)? cs : hs_out; +assign VGA_VS = (~no_csync & scandoublerD & ~ypbpr)? 1'b1 : vs_out; mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .clk_sys ( clk_sys ), @@ -254,27 +278,6 @@ mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .ypbpr ( ypbpr ) ); -user_io #( - .STRLEN(($size(CONF_STR)>>3))) -user_io( - .clk_sys (clk_sys ), - .conf_str (CONF_STR ), - .SPI_CLK (SPI_SCK ), - .SPI_SS_IO (CONF_DATA0 ), - .SPI_MISO (SPI_DO ), - .SPI_MOSI (SPI_DI ), - .buttons (buttons ), - .switches (switches ), - .scandoubler_disable (scandoublerD ), - .ypbpr (ypbpr ), - .key_strobe (key_strobe ), - .key_pressed (key_pressed ), - .key_code (key_code ), - .joystick_0 (joystick_0 ), - .joystick_1 (joystick_1 ), - .status (status ) - ); - dac #( .C_bits(16)) dac_l( diff --git a/Arcade_MiST/Midway MCR 2/MCR2/README.txt b/Arcade_MiST/Midway MCR 2/MCR2/README.txt index f88027f5..2afe03e4 100644 --- a/Arcade_MiST/Midway MCR 2/MCR2/README.txt +++ b/Arcade_MiST/Midway MCR 2/MCR2/README.txt @@ -12,7 +12,7 @@ -- Create ROM and ARC files from MAME ROM zip files using the mra utility and the MRA files. -- Copy the RBF and the ARC files to the same folder. --- Example: mra -z /path/to/mame/roms Tron.mra +-- Example: mra -A -z /path/to/mame/roms Tron.mra -- Copy the ROM files to the root of the SD Card. -- -- MRA utilty: https://github.com/sebdel/mra-tools-c diff --git a/Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv b/Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv index 6015e8f8..11173d70 100644 --- a/Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv +++ b/Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv @@ -316,8 +316,8 @@ satans_hollow satans_hollow( wire vs_out; wire hs_out; -assign VGA_HS = ((~no_csync & scandoublerD) || ypbpr)? cs : hs_out; -assign VGA_VS = ((~no_csync & scandoublerD) || ypbpr)? 1'b1 : vs_out; +assign VGA_HS = (~no_csync & scandoublerD & ~ypbpr)? cs : hs_out; +assign VGA_VS = (~no_csync & scandoublerD & ~ypbpr)? 1'b1 : vs_out; mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .clk_sys ( clk_sys ), diff --git a/Arcade_MiST/Midway MCR 3 Monoboard/README.txt b/Arcade_MiST/Midway MCR 3 Monoboard/README.txt index 25e26804..52ab08a0 100644 --- a/Arcade_MiST/Midway MCR 3 Monoboard/README.txt +++ b/Arcade_MiST/Midway MCR 3 Monoboard/README.txt @@ -37,7 +37,7 @@ Usage: Create ROM and ARC files from MAME ROM zip files using the mra utility and the MRA files. Copy the RBF and the ARC files to the same folder. -Example: mra -z /path/to/mame/roms Tron.mra +Example: mra -A -z /path/to/mame/roms Rampage.mra Copy the ROM files to the root of the SD Card. MRA utilty: https://github.com/sebdel/mra-tools-c diff --git a/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/CraterRaider_MiST.sv b/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/CraterRaider_MiST.sv index d9a2628c..45aa9c98 100644 --- a/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/CraterRaider_MiST.sv +++ b/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/CraterRaider_MiST.sv @@ -256,8 +256,8 @@ Crater_Raider Crater_Raider( wire vs_out; wire hs_out; -assign VGA_HS = ((~no_csync & scandoublerD) || ypbpr)? cs : hs_out; -assign VGA_VS = ((~no_csync & scandoublerD) || ypbpr)? 1'b1 : vs_out; +assign VGA_HS = (~no_csync & scandoublerD & ~ypbpr)? cs : hs_out; +assign VGA_VS = (~no_csync & scandoublerD & ~ypbpr)? 1'b1 : vs_out; mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .clk_sys ( clk_sys ), diff --git a/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd b/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd index fd875700..e5389228 100644 --- a/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd +++ b/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd @@ -417,7 +417,7 @@ begin vcnt >= 1 and vcnt < 241 then video_blankn <= '1';end if; if hs_cnt = 0 then hsync0 <= '0'; video_hs <= '0'; - elsif hs_cnt = 47 then hsync0 <= '1'; video_vs <= '0'; + elsif hs_cnt = 47 then hsync0 <= '1'; video_hs <= '1'; end if; if hs_cnt = 0 then hsync1 <= '0'; diff --git a/Arcade_MiST/Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv b/Arcade_MiST/Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv index 4bf7a2ed..dda40f9f 100644 --- a/Arcade_MiST/Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv +++ b/Arcade_MiST/Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv @@ -286,8 +286,8 @@ spy_hunter spy_hunter( wire vs_out; wire hs_out; -assign VGA_HS = ((~no_csync & scandoublerD) || ypbpr)? cs : hs_out; -assign VGA_VS = ((~no_csync & scandoublerD) || ypbpr)? 1'b1 : vs_out; +assign VGA_HS = (~no_csync & scandoublerD & ~ypbpr)? cs : hs_out; +assign VGA_VS = (~no_csync & scandoublerD & ~ypbpr)? 1'b1 : vs_out; mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .clk_sys ( clk_sys ), diff --git a/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/meta/Turbo Tag.mra b/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/meta/Turbo Tag.mra index 1a458947..9af02088 100644 --- a/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/meta/Turbo Tag.mra +++ b/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/meta/Turbo Tag.mra @@ -6,7 +6,7 @@ Bally Midway Action turbotag - + diff --git a/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv b/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv index c50928b2..6bd49920 100644 --- a/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv +++ b/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv @@ -253,8 +253,8 @@ turbo_tag turbo_tag( wire vs_out; wire hs_out; -assign VGA_HS = ((~no_csync & scandoublerD) || ypbpr)? cs : hs_out; -assign VGA_VS = ((~no_csync & scandoublerD) || ypbpr)? 1'b1 : vs_out; +assign VGA_HS = (~no_csync & scandoublerD & ~ypbpr)? cs : hs_out; +assign VGA_VS = (~no_csync & scandoublerD & ~ypbpr)? 1'b1 : vs_out; mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .clk_sys ( clk_sys ), diff --git a/Arcade_MiST/Namco Mappy Hardware/README.txt b/Arcade_MiST/Namco Mappy Hardware/README.txt index e92d6333..d9ee91e2 100644 --- a/Arcade_MiST/Namco Mappy Hardware/README.txt +++ b/Arcade_MiST/Namco Mappy Hardware/README.txt @@ -3,7 +3,7 @@ The Tower of Druaga/Mappy/Motos/DigDug II to Mist FPGA by Slingshot -- Usage: -- - Create ROM and ARC files from the MRA files in the meta directory -- using the MRA utility. --- Example: mra -A -z /path/to/mame/roms motos.mra +-- Example: mra -A -z /path/to/mame/roms Motos.mra -- - Copy the ROM files to the root of the SD Card -- - Copy the RBF and ARC files to the same folder on the SD Card -- diff --git a/Arcade_MiST/Namco Mappy Hardware/meta/digdug2.mra b/Arcade_MiST/Namco Mappy Hardware/meta/Dig Dug 2.mra similarity index 100% rename from Arcade_MiST/Namco Mappy Hardware/meta/digdug2.mra rename to Arcade_MiST/Namco Mappy Hardware/meta/Dig Dug 2.mra diff --git a/Arcade_MiST/Namco Mappy Hardware/meta/mappy.mra b/Arcade_MiST/Namco Mappy Hardware/meta/Mappy.mra similarity index 100% rename from Arcade_MiST/Namco Mappy Hardware/meta/mappy.mra rename to Arcade_MiST/Namco Mappy Hardware/meta/Mappy.mra diff --git a/Arcade_MiST/Namco Mappy Hardware/meta/motos.mra b/Arcade_MiST/Namco Mappy Hardware/meta/Motos.mra similarity index 100% rename from Arcade_MiST/Namco Mappy Hardware/meta/motos.mra rename to Arcade_MiST/Namco Mappy Hardware/meta/Motos.mra diff --git a/Arcade_MiST/Namco Mappy Hardware/meta/druaga.mra b/Arcade_MiST/Namco Mappy Hardware/meta/The Tower of Druaga.mra similarity index 100% rename from Arcade_MiST/Namco Mappy Hardware/meta/druaga.mra rename to Arcade_MiST/Namco Mappy Hardware/meta/The Tower of Druaga.mra diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/README.md b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/README.md index 8fdf1d1c..c5fdc1fb 100644 --- a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/README.md +++ b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/README.md @@ -3,16 +3,17 @@ robotron-fpga MiST port Supported games: Robotron 2048, Joust, Sinistar, Bubbles, Splat, Stargate, Alien Arena -After loading the RBF, a CMOS clearing will happen. Reset the core to start -the game. +After loading the RBF (Core), a CMOS clearing happens. When the message +"Factory Settings Restored" appears, press the MiST soft RESET button (right). Sinistar has some graphics issues, and the speech chip is not implemented. Usage: ------ +- Make sure you use firmware 200215 or later. - Create ROM and ARC files from MAME ROM zip files using the mra utility and the MRA files. +- Example: mra -A -z /path/to/mame/roms Stargate.mra - Copy the RBF and the ARC files to the same folder. -- Example: mra -z /path/to/mame/roms scramble.mra - Copy the ROM files to the root of the SD Card. - MRA utilty: https://github.com/sebdel/mra-tools-c @@ -22,7 +23,18 @@ Change it for permanent settings (search for the format online). It's possible t inside the core, with turning on "Auto-up" switch, and activate the "Advance" trigger in the OSD. Refer to the arcade's user manual for further info. -robotron-fpga + +Joystick Remaps +--------------- + +Some of the Williams cores use more buttons than usual and require remaps to be useful. + +The file [README-joystick-remaps.txt](https://github.com/Gehstock/Mist_FPGA_Cores/blob/master/Arcade_MiST/Williams%206809%20rev.1%20Hardware/README-joystick-remaps.txt) contains joystick remaps for the Williams cores. + + +--- + +robotron-fpga (Original Documentation) ============= An implementation of the classic Robotron: 2084 video arcade game from 1982. diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/alienar.mra b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Alien Arena.mra similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/alienar.mra rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Alien Arena.mra diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/bubbles.mra b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Bubbles.mra similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/bubbles.mra rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Bubbles.mra diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/joust.mra b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Joust.mra similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/joust.mra rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Joust.mra diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/robotron.mra b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Robotron 2084.mra similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/robotron.mra rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Robotron 2084.mra diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/sinistar.mra b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Sinistar.mra similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/sinistar.mra rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Sinistar.mra diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/splat.mra b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Splat.mra similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/splat.mra rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Splat.mra diff --git a/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/stargate.mra b/Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Stargate.mra similarity index 100% rename from Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/stargate.mra rename to Arcade_MiST/Williams 6809 rev.1 Hardware/Robotron Hardware/meta/Stargate.mra