diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/Bullfight.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Bullfight.mra
index 39cf29ea..5ff2da74 100644
--- a/Arcade_MiST/Sega System 1 Hardware/meta/Bullfight.mra
+++ b/Arcade_MiST/Sega System 1 Hardware/meta/Bullfight.mra
@@ -7,13 +7,13 @@
Coreland / Sega
Sport
segasys1
-
+
- 06
+ 00
diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Pitfall II.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Pitfall II.mra
similarity index 100%
rename from Arcade_MiST/Sega System 1 Hardware/meta/buggy/Pitfall II.mra
rename to Arcade_MiST/Sega System 1 Hardware/meta/Pitfall II.mra
diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Starjacker.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Starjacker.mra
similarity index 100%
rename from Arcade_MiST/Sega System 1 Hardware/meta/buggy/Starjacker.mra
rename to Arcade_MiST/Sega System 1 Hardware/meta/Starjacker.mra
diff --git a/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Water Match.mra b/Arcade_MiST/Sega System 1 Hardware/meta/Water Match.mra
similarity index 78%
rename from Arcade_MiST/Sega System 1 Hardware/meta/buggy/Water Match.mra
rename to Arcade_MiST/Sega System 1 Hardware/meta/Water Match.mra
index fe47e902..defd43fc 100644
--- a/Arcade_MiST/Sega System 1 Hardware/meta/buggy/Water Match.mra
+++ b/Arcade_MiST/Sega System 1 Hardware/meta/Water Match.mra
@@ -7,14 +7,16 @@
Sega
Sport
segasys1
-
-
-
+
+
+
+
+
- 06
+ 0E
-
+
diff --git a/Arcade_MiST/Sega System 1 Hardware/rtl/SEGASYS1_MAIN.v b/Arcade_MiST/Sega System 1 Hardware/rtl/SEGASYS1_MAIN.v
index b131cd59..40c02cea 100644
--- a/Arcade_MiST/Sega System 1 Hardware/rtl/SEGASYS1_MAIN.v
+++ b/Arcade_MiST/Sega System 1 Hardware/rtl/SEGASYS1_MAIN.v
@@ -127,7 +127,7 @@ end
// CPU data selector
dataselector6 mcpudisel(
CPUDI,
- VIDCS, VIDDO,
+ VIDCS & cpu_mreq, VIDDO,
cpu_cs_vidm, VIDMD,
cpu_cs_port, cpu_rd_port,
cpu_cs_mram, cpu_rd_mram,
diff --git a/Arcade_MiST/Sega System 1 Hardware/rtl/SEGASYS1_SPRITE.v b/Arcade_MiST/Sega System 1 Hardware/rtl/SEGASYS1_SPRITE.v
index c14dc4b2..e4c2efe5 100644
--- a/Arcade_MiST/Sega System 1 Hardware/rtl/SEGASYS1_SPRITE.v
+++ b/Arcade_MiST/Sega System 1 Hardware/rtl/SEGASYS1_SPRITE.v
@@ -147,7 +147,7 @@ always @ ( posedge VCLKx8 ) if (VCLKx4_EN) begin
// get yofs/xpos/bank
2: begin
yofs <= hitsprvps[hitr];
- xpos <= ((sprdt[9:0]+1)/2)+14;
+ xpos <= sprdt[8:1]+14;
bank <= { sprdt[13], sprdt[14], sprdt[15] };
spr_ofs <= 2;
phaseHD <= 3;
diff --git a/Arcade_MiST/Sega System 1 Hardware/rtl/Segasys1_MiST.sv b/Arcade_MiST/Sega System 1 Hardware/rtl/Segasys1_MiST.sv
index 24d784d0..9c1b3bd3 100644
--- a/Arcade_MiST/Sega System 1 Hardware/rtl/Segasys1_MiST.sv
+++ b/Arcade_MiST/Sega System 1 Hardware/rtl/Segasys1_MiST.sv
@@ -46,17 +46,23 @@ wire rotate = status[2];
wire [1:0] scanlines = status[4:3];
wire blend = status[5];
-wire [7:0] INP0 = ~{m_left, m_right,m_up, m_down,1'b0,m_fireB,m_fireA,m_fireC};
-wire [7:0] INP1 = ~{m_left2,m_right2,m_up2, m_down2,1'b0,m_fire2B,m_fire2A,m_fire2C};
-wire [7:0] INP2 = ~{2'b00,m_two_players, m_one_player,3'b000, m_coin1};
-//WaterMatch
-//wire [7:0] INP0 = ~{m_left, m_right,m_up, m_down,m_left2, m_right2,m_up2, m_down2};
-//wire [7:0] INP1 = ~{m_left3, m_right3,m_up3, m_down3,m_left4, m_right4,m_up4, m_down4};
-//wire [7:0] INP2 = ~{m_fire2C,m_fireC,m_two_players, m_one_player,3'b000, m_coin1};
+reg [7:0] INP0, INP1, INP2;
+always @(*) begin
+ INP0 = ~{m_left, m_right,m_up, m_down,1'b0,m_fireB,m_fireA,m_fireC};
+ INP1 = ~{m_left2,m_right2,m_up2, m_down2,1'b0,m_fire2B,m_fire2A,m_fire2C};
+ INP2 = ~{2'b00,m_two_players, m_one_player,3'b000, m_coin1};
+ if (core_mod[3]) begin
+ //WaterMatch
+ INP0 = ~{m_left, m_right, m_up, m_down, m_left2,m_right2,m_up2,m_down2};
+ INP1 = ~{m_left3,m_right3,m_up3,m_down3,m_left4,m_right4,m_up4,m_down4};
+ INP2 = ~{m_fire3A | m_fire4A,m_fireA | m_fire2A,m_two_players, m_one_player,3'b000, m_coin1};
+ end
+end
+
wire [7:0] DSW0 = status[15: 8];
wire [7:0] DSW1 = status[23:16];
-wire [6:0] core_mod; // [0]=SYS1/SYS2,[1]=H/V,[2]=H256/H240
+wire [6:0] core_mod; // [0]=SYS1/SYS2,[1]=H/V,[2]=H256/H240,[3]=4controllers
wire [1:0] orientation = { 1'b0, core_mod[1] };
assign LED = ~ioctl_downl;
@@ -78,6 +84,8 @@ wire [1:0] buttons;
wire [1:0] switches;
wire [7:0] joystick_0;
wire [7:0] joystick_1;
+wire [7:0] joystick_2;
+wire [7:0] joystick_3;
wire key_pressed;
wire key_strobe;
wire [7:0] key_code;
@@ -295,7 +303,7 @@ arcade_inputs inputs (
.rotate ( rotate ),
.orientation ( orientation ),
.joyswap ( 1'b0 ),
- .oneplayer ( 1'b1 ),
+ .oneplayer ( ~core_mod[3]),
.controls ( {m_tilt, m_coin4, m_coin3, m_coin2, m_coin1, m_four_players, m_three_players, m_two_players, m_one_player} ),
.player1 ( {m_fireF, m_fireE, m_fireD, m_fireC, m_fireB, m_fireA, m_up, m_down, m_left, m_right} ),
.player2 ( {m_fire2F, m_fire2E, m_fire2D, m_fire2C, m_fire2B, m_fire2A, m_up2, m_down2, m_left2, m_right2} ),