diff --git a/Arcade_MiST/Berzerk Hardware/MoonWar_MiST/rtl/moonwar_dail.vhd b/Arcade_MiST/Berzerk Hardware/MoonWar_MiST/rtl/moonwar_dail.vhd index 20327e3b..f01efccf 100644 --- a/Arcade_MiST/Berzerk Hardware/MoonWar_MiST/rtl/moonwar_dail.vhd +++ b/Arcade_MiST/Berzerk Hardware/MoonWar_MiST/rtl/moonwar_dail.vhd @@ -65,6 +65,6 @@ port map ( Q => count ); -count2 <= count + -dailout <= direction or count or btn; +--count2 <= count + +dailout <= direction or '0' & count or "00" & btn; end struct; \ No newline at end of file diff --git a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/README.txt b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/README.txt index 47fe2077..09e6fc18 100644 --- a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/README.txt +++ b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/README.txt @@ -2,6 +2,7 @@ Silver Land Port to Mist FPGA by Gehstock Colors are wrong, missing Schematics +using Patched Palette now!!! SPACE / FIRE = Accelerate diff --git a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/Release/SilverLand.rbf b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/Release/SilverLand.rbf index 179bacfe..e7c37d34 100644 Binary files a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/Release/SilverLand.rbf and b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/Release/SilverLand.rbf differ diff --git a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/build_id.sv b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/build_id.sv index 9024b687..0887fa5a 100644 --- a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/build_id.sv +++ b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/build_id.sv @@ -1,2 +1,2 @@ -`define BUILD_DATE "190827" -`define BUILD_TIME "181730" +`define BUILD_DATE "190831" +`define BUILD_TIME "162534" diff --git a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/crazy_climber.vhd b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/crazy_climber.vhd index 9345a4cf..c3868aa0 100644 --- a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/crazy_climber.vhd +++ b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/crazy_climber.vhd @@ -185,35 +185,21 @@ end process; ------------------ -- video output ------------------ -video_mux <= do_palette when is_big_sprite_on = '0' else do_big_sprite_palette; - -process(clock_12) -begin - if rising_edge(clock_12) then - if ena_pixel = '1' then - if hblank = '0' then - video_i <= video_mux; - else - video_i <= (others => '0'); - end if; - end if; - end if; -end process; - -video_r <= video_i(2 downto 0); -video_g <= video_i(5 downto 3); -video_b <= video_i(7 downto 6); -video_hb <= hblank; -video_vb <= vblank; +video_mux <= do_palette when is_big_sprite_on = '0' else do_big_sprite_palette; +video_r <= video_mux(2 downto 0); +video_g <= video_mux(5 downto 3); +video_b <= video_mux(7 downto 6); +video_hb <= hblank; +video_vb <= vblank; video_hs <= hsync; video_vs <= vsync; ------------------ -- player controls ------------------ -player1 <= right1 & left1 & "00000" & fire1; -player2 <= right2 & left2 & "00000" & fire2; -coins <= ("0001" & start2 & start1 & '0' & coin1); -- upright cabinet +player1 <= right1 & left1 & "00000" & fire1; +player2 <= right2 & left2 & "00000" & fire2; +coins <= ("0001" & start2 & start1 & '0' & coin1); -- upright cabinet ----------------------- -- cpu write addressing @@ -626,7 +612,7 @@ port map ( -- sprite palette rom -palette : entity work.silverland_palette +palette : entity work.silverland_palette--PATCHED!!! port map ( addr => pixel_color_r, clk => clock_12, diff --git a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/rom/silverland_palette.vhd b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/rom/silverland_palette.vhd index fbef1158..fed347ae 100644 --- a/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/rom/silverland_palette.vhd +++ b/Arcade_MiST/Crazy Climber Hardware/Silver Land_MiST/rtl/rom/silverland_palette.vhd @@ -12,10 +12,11 @@ end entity; architecture prom of silverland_palette is type rom is array(0 to 63) of std_logic_vector(7 downto 0); signal rom_data: rom := ( - X"F6",X"E0",X"07",X"07",X"00",X"F4",X"01",X"01",X"00",X"C7",X"00",X"00",X"00",X"6F",X"00",X"6F", - X"00",X"3F",X"00",X"3F",X"00",X"A7",X"00",X"A7",X"00",X"E0",X"FF",X"E0",X"00",X"FF",X"00",X"FF", - X"00",X"00",X"9C",X"7E",X"00",X"00",X"9C",X"07",X"00",X"00",X"00",X"00",X"00",X"FF",X"BE",X"00", - X"00",X"00",X"FF",X"07",X"00",X"87",X"87",X"00",X"00",X"38",X"A7",X"1A",X"00",X"FA",X"FA",X"07"); + X"F6",X"E0",X"07",X"07",X"00",X"F4",X"01",X"01",X"F6",X"C7",X"00",X"00",X"00",X"6F",X"00",X"6F", + X"00",X"3F",X"00",X"3F",X"00",X"A7",X"00",X"A7",X"F6",X"E0",X"FF",X"E0",X"00",X"FF",X"00",X"FF", + X"00",X"00",X"9C",X"7E",X"F6",X"00",X"9C",X"07",X"00",X"00",X"00",X"00",X"00",X"FF",X"BE",X"00", + X"00",X"00",X"FF",X"07",X"00",X"87",X"87",X"00",X"F6",X"38",X"A7",X"1A",X"00",X"FA",X"FA",X"07"); + begin process(clk) begin