From da990de0226113ecafad95b487018aa267c03767 Mon Sep 17 00:00:00 2001 From: Gyorgy Szombathelyi Date: Sat, 24 Apr 2021 21:46:48 +0200 Subject: [PATCH] Druaga: update MRAs, simplify DIP switch code --- .../meta/Dig Dug 2.mra | 62 ++++++++------- .../meta/Mappy.mra | 79 +++++++++++-------- .../meta/Motos.mra | 61 +++++++------- .../meta/Pac n Pal.mra | 60 +++++++++----- .../meta/Pac-Man & Chomp Chomp.mra | 51 ++++++++++++ .../meta/Super Pacman.mra | 51 ++++++++---- .../meta/The Tower of Druaga.mra | 57 +++++++------ .../rtl/TheTowerofDruaga_mist.sv | 35 +++----- 8 files changed, 289 insertions(+), 167 deletions(-) create mode 100644 Arcade_MiST/Namco Super Pacman Hardware/meta/Pac-Man & Chomp Chomp.mra mode change 100755 => 100644 Arcade_MiST/Namco Super Pacman Hardware/meta/Super Pacman.mra diff --git a/Arcade_MiST/Namco Super Pacman Hardware/meta/Dig Dug 2.mra b/Arcade_MiST/Namco Super Pacman Hardware/meta/Dig Dug 2.mra index f8cd8ec4..e7d6d17b 100644 --- a/Arcade_MiST/Namco Super Pacman Hardware/meta/Dig Dug 2.mra +++ b/Arcade_MiST/Namco Super Pacman Hardware/meta/Dig Dug 2.mra @@ -1,28 +1,36 @@ - Dig Dug 2 - digdug2 - Druaga - - - - - - - 03 - - - - - - - - - - - - - - - - - \ No newline at end of file + Dig Dug II (New Ver.) + 0220 + digdug2 + 20200427161917 + 1985 + Namco + Maze, Digging + druaga + + 03 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Arcade_MiST/Namco Super Pacman Hardware/meta/Mappy.mra b/Arcade_MiST/Namco Super Pacman Hardware/meta/Mappy.mra index ad479a11..8704e197 100644 --- a/Arcade_MiST/Namco Super Pacman Hardware/meta/Mappy.mra +++ b/Arcade_MiST/Namco Super Pacman Hardware/meta/Mappy.mra @@ -1,34 +1,49 @@ - Mappy - mappy - - - - - - - - Druaga - - 02 - - - - - - - - - - - - - - - - - - - - + Mappy (US) + 0220 + mappy + 20200427161917 + 1983 + Namco + Maze, Cat and Mouse + Platform + druaga + + 02 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Arcade_MiST/Namco Super Pacman Hardware/meta/Motos.mra b/Arcade_MiST/Namco Super Pacman Hardware/meta/Motos.mra index 47ac6e24..90cb95b6 100644 --- a/Arcade_MiST/Namco Super Pacman Hardware/meta/Motos.mra +++ b/Arcade_MiST/Namco Super Pacman Hardware/meta/Motos.mra @@ -1,29 +1,36 @@ - Motos - motos - Druaga - - - - - - - - 04 - - - - - - - - - - - - - - - - + Motos + 0220 + motos + 20200427161917 + 1985 + Namco + Maze + druaga + + 04 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Arcade_MiST/Namco Super Pacman Hardware/meta/Pac n Pal.mra b/Arcade_MiST/Namco Super Pacman Hardware/meta/Pac n Pal.mra index 82240b25..ed332900 100644 --- a/Arcade_MiST/Namco Super Pacman Hardware/meta/Pac n Pal.mra +++ b/Arcade_MiST/Namco Super Pacman Hardware/meta/Pac n Pal.mra @@ -1,39 +1,63 @@ - Pac & Pal + Pac & Pal 0220 pacnpal - 20210307 + Namco + 1983 + Maze druaga + 20210326 05 + + FF - - - + + + - - - - + + + + FF - + - + - - - - + + + + - - - + + + + + + + + + + + + diff --git a/Arcade_MiST/Namco Super Pacman Hardware/meta/Pac-Man & Chomp Chomp.mra b/Arcade_MiST/Namco Super Pacman Hardware/meta/Pac-Man & Chomp Chomp.mra new file mode 100644 index 00000000..ea9cf5c9 --- /dev/null +++ b/Arcade_MiST/Namco Super Pacman Hardware/meta/Pac-Man & Chomp Chomp.mra @@ -0,0 +1,51 @@ + + Pac-Man & Chomp Chomp + 0220 + pacnchmp + 1983 + Namco + Maze + druaga + 20210326 + + 05 + + + + FF + + + + + + + + + + + + FF + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Arcade_MiST/Namco Super Pacman Hardware/meta/Super Pacman.mra b/Arcade_MiST/Namco Super Pacman Hardware/meta/Super Pacman.mra old mode 100755 new mode 100644 index b808ea48..7590a27a --- a/Arcade_MiST/Namco Super Pacman Hardware/meta/Super Pacman.mra +++ b/Arcade_MiST/Namco Super Pacman Hardware/meta/Super Pacman.mra @@ -2,37 +2,56 @@ Super Pacman 0220 superpac - 20210307 + Namco + 1982 + Maze druaga + 20210325 05 FF - - + + - - - - + + + + FF - + - + - - - - + + + + - - - + + + + + + 12 12 + + 7e e1 5c + + + + + + + + + + + diff --git a/Arcade_MiST/Namco Super Pacman Hardware/meta/The Tower of Druaga.mra b/Arcade_MiST/Namco Super Pacman Hardware/meta/The Tower of Druaga.mra index 7ba9842b..07c5106c 100644 --- a/Arcade_MiST/Namco Super Pacman Hardware/meta/The Tower of Druaga.mra +++ b/Arcade_MiST/Namco Super Pacman Hardware/meta/The Tower of Druaga.mra @@ -1,25 +1,34 @@ - The Tower of Druaga - druaga - Druaga - - - - - 01 - - - - - - - - - - - - - - - - \ No newline at end of file + The Tower of Druaga (New Ver.) + 0220 + todruaga + 20200427161917 + 1984 + Namco + Adventure, Knights + Maze, Extra + druaga + + 01 + + + + + + + + + + + + + + + + + + + + + + diff --git a/Arcade_MiST/Namco Super Pacman Hardware/rtl/TheTowerofDruaga_mist.sv b/Arcade_MiST/Namco Super Pacman Hardware/rtl/TheTowerofDruaga_mist.sv index 3a23a73a..9b22b118 100644 --- a/Arcade_MiST/Namco Super Pacman Hardware/rtl/TheTowerofDruaga_mist.sv +++ b/Arcade_MiST/Namco Super Pacman Hardware/rtl/TheTowerofDruaga_mist.sv @@ -40,8 +40,6 @@ localparam CONF_STR = { "O5,Blend,Off,On;", "O7,Flip Screen,Off,On;", "DIP;", - "OU,Service Mode,Off,On;", - "OT,Freeze,Off,On;", "T0,Reset;", "V,v1.00.",`BUILD_DATE }; @@ -93,34 +91,25 @@ always @(*) begin DSW2 = 0; case (core_mod) - 7'h0, 7'h1: // DRUAGA + 7'h0, 7'h1, 7'h3: // DRUAGA, DIGDUG2 begin - DSW0 = {2'd0,dtLives,4'd0}; - DSW1 = {dcCabinet,6'd0,dcFreeze}; - DSW2 = {DSW1[3:0],dcService,3'd0}; + DSW0 = status[15:8]; + DSW1 = status[23:16]; + DSW2 = { status[19:16], status[27:24] }; end 7'h2: // MAPPY begin - DSW0 = {dcFreeze,dmRoundP,dmDemoSnd,2'd0,dmRank}; - DSW1 = {dmLives,dmExtend,3'd0}; - DSW2 = {{2{dcService,dcCabinet,2'd0}}}; + DSW0 = status[15:8]; + DSW1 = status[23:16]; + DSW2 = { {2{status[27:24]}} }; end - 7'h3: // DIGDUG2 + default: begin - DSW0 = {2'd0,ddLives,5'd0}; - DSW1 = {dcCabinet,3'd0,dcFreeze,ddLevelSel,ddExtend}; - DSW2 = {DSW1[3:0],dcService,3'd0}; + DSW0 = status[15:8]; + DSW1 = status[23:16]; + DSW2 = status[31:24]; end - 7'h4: // MOTOS - begin - DSW0 = {doDemoSnd,doExtend,doRank,doLives,3'd0}; - DSW1 = {dcService,dcCabinet,6'd0}; - DSW2 = {8'd0}; - end - 7'h5: ;// Super Pacman - 7'h6: ;// GROBDA - 7'h7: ;// PHOZON - default: ; + endcase end