Skip to content

Commit

Permalink
riders: xmen obj displayed correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
@jotego
jotego committed Aug 8, 2024
1 parent a9b0abc commit e12118a
Show file tree
Hide file tree
Showing 40 changed files with 84,015 additions and 32,897 deletions.
2 changes: 1 addition & 1 deletion cores/aliens/hdl/jt051962.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ endfunction
// Tile ROM reads by the CPU
// This will need to include a wait state
always @(posedge clk) begin
case( cpu_addr^debug_bus[1:0] )
case( cpu_addr/*^debug_bus[1:0]*/ )
2'd0: cpu_din <= lyra_data[ 7: 0];
2'd1: cpu_din <= lyra_data[15: 8];
2'd2: cpu_din <= lyra_data[23:16];
Expand Down
2 changes: 1 addition & 1 deletion cores/riders/cfg/mem.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ sdram:
data_width: 32
- buses:
- name: lyro
addr_width: 21
addr_width: 22
data_width: 32
bram:
# RAM holding the MSB bits of the object tile ROM address
Expand Down
0 cores/riders/doc/color check.jpeg → .../riders/doc/lab/ssriders/color check.jpeg
View file
File renamed without changes
13 changes: 10 additions & 3 deletions cores/riders/hdl/jtriders_video.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module jtriders_video(
output reg [20:2] lyrf_addr,
output reg [20:2] lyra_addr,
output reg [20:2] lyrb_addr,
output [20:2] lyro_addr,
output [21:2] lyro_addr,

output lyrf_cs,
output lyra_cs,
Expand Down Expand Up @@ -126,7 +126,9 @@ assign cpu_saddr = xmen ? cpu_addr : { cpu_addr[16:15], cpu_dsn[1], cpu_ad
assign cpu_d8 = xmen ? cpu_dout[ 7:0] : ~cpu_dsn[1] ? cpu_dout[15:8] : cpu_dout[7:0];
// Object ROM address MSB might come from a RAM
assign oaread_addr = lyro_prea[21:13];
assign lyro_addr = oaread_en ? {oaread_dout, lyro_prea[12:2]} : lyro_prea[20:2];
assign lyro_addr = xmen ? lyro_prea :
oaread_en ? {1'b0,oaread_dout, lyro_prea[12:2]} :
{1'b0,lyro_prea[20:2]};
assign lyro_cs = lyro_precs;
// Debug
always @(posedge clk) begin
Expand Down Expand Up @@ -274,7 +276,11 @@ jtaliens_scroll #(
/* verilator tracing_on */
wire [ 1:0] lyro_pri;
wire [ 3:0] ommra;
wire [13:1] orama;

assign ommra = xmen ? {cpu_addr[3:1],cpu_dsn[1]} : {cpu_addr[4:2], cpu_dsn[1]};
// xmen never exercises cpu_addr[13], although it is connected to the RAM
assign orama = xmen ? cpu_addr[13:1] : oram_addr;

jtsimson_obj #(.RAMW(13)) u_obj( // sprite logic
.rst ( rst ),
Expand All @@ -284,6 +290,7 @@ jtsimson_obj #(.RAMW(13)) u_obj( // sprite logic

.paroda ( ssriders ),
.simson ( 1'b0 ),
.xmen ( xmen ),
// Base Video (inputs)
.hs ( hs ),
.vs ( vs ),
Expand All @@ -293,7 +300,7 @@ jtsimson_obj #(.RAMW(13)) u_obj( // sprite logic
.vdump ( vrender ),
// CPU interface
.ram_cs ( objsys_cs ),
.ram_addr ( oram_addr ),
.ram_addr ( orama ),
.ram_din ( oram_din ),
.ram_we ( oram_we ),
.cpu_din (objsys_dout),
Expand Down
8 changes: 4 additions & 4 deletions cores/riders/sch/ssriders/colmix.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
(title_block
(title "Sunset Riders")
(date "2023-08-29")
(rev "José Tejada G.")
(rev "José Tejada")
(company "KONAMI PWB 352359C")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 3 "Sheet 02")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/riders/sch/ssriders")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "jt74:74LS138"
Expand Down
8 changes: 4 additions & 4 deletions cores/riders/sch/ssriders/main2obj.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
(title_block
(title "Sunset Riders")
(date "2023-08-29")
(rev "José Tejada G.")
(rev "José Tejada")
(company "KONAMI PWB 352359C")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 3 "page 09 (missing in original)")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/riders/sch/ssriders")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "Device:R_US"
Expand Down
21 changes: 7 additions & 14 deletions cores/riders/sch/ssriders/objects.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
(title_block
(title "Sunset Riders")
(date "2023-08-29")
(rev "José Tejada G.")
(rev "José Tejada")
(company "KONAMI PWB 352359C")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/riders/sch/ssriders")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "Connector_Generic:Conn_02x32_Row_Letter_First"
Expand Down Expand Up @@ -10055,14 +10056,6 @@
)
)
(symbol "053245_1_1"
(text "EN"
(at 34.29 36.83 0)
(effects
(font
(size 0.762 0.762)
)
)
)
(pin power_in line
(at -46.99 -36.83 0)
(length 5.08)
Expand Down Expand Up @@ -10639,7 +10632,7 @@
)
)
)
(pin passive line
(pin input line
(at -46.99 36.83 0)
(length 5.08)
(name "TEST"
Expand Down Expand Up @@ -10768,7 +10761,7 @@
(pin output inverted
(at 34.29 46.99 270)
(length 5.08)
(name "CPU"
(name "NCPU"
(effects
(font
(size 1.27 1.27)
Expand Down Expand Up @@ -10966,7 +10959,7 @@
(pin no_connect line
(at 36.83 46.99 270)
(length 5.08)
(name "N.C"
(name "NC"
(effects
(font
(size 1.27 1.27)
Expand Down
7 changes: 4 additions & 3 deletions cores/riders/sch/ssriders/pcm_snd.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
(title_block
(title "Sunset Riders")
(date "2023-08-29")
(rev "José Tejada G.")
(rev "José Tejada")
(company "KONAMI PWB 352359C")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/riders/sch/ssriders")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "Amplifier_Operational:LM324"
Expand Down
7 changes: 4 additions & 3 deletions cores/riders/sch/ssriders/scroll.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
(title_block
(title "Sunset Riders")
(date "2023-08-29")
(rev "José Tejada G.")
(rev "José Tejada")
(company "KONAMI PWB 352359C")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/riders/sch/ssriders")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "74xx:74LS07"
Expand Down
7 changes: 4 additions & 3 deletions cores/riders/sch/ssriders/sound.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
(title_block
(title "Sunset Riders")
(date "2023-08-29")
(rev "José Tejada G.")
(rev "José Tejada")
(company "KONAMI PWB 352359C")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/riders/sch/ssriders")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "CPU:Z80CPU"
Expand Down
7 changes: 4 additions & 3 deletions cores/riders/sch/ssriders/ssriders.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
(title_block
(title "Sunset Riders")
(date "2023-08-29")
(rev "José Tejada G.")
(rev "José Tejada")
(company "KONAMI PWB 352359C")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/riders/sch/ssriders")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "arcade:JAMMA_CONN"
Expand Down
7 changes: 4 additions & 3 deletions cores/riders/sch/xmen/capacitors.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
(uuid "dce20812-97e2-49e4-8d51-ea187a8a8b57")
(paper "A3")
(title_block
(title "X-men")
(title "X-Men")
(date "2023-07-17")
(rev "José Tejada")
(company "KONAMI PWB353018A GX065")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/simson/sch/simpsons")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "74xx:74LS07"
Expand Down
7 changes: 4 additions & 3 deletions cores/riders/sch/xmen/colmix.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
(uuid "cc4b3911-92a0-489e-969c-6fa026f11489")
(paper "A3")
(title_block
(title "X-men")
(title "X-Men")
(date "2023-07-17")
(rev "José Tejada")
(company "KONAMI PWB353018A GX065")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/simson/sch/simpsons")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "arcade:HM6116P-3"
Expand Down
7 changes: 4 additions & 3 deletions cores/riders/sch/xmen/io_cabinet.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
(uuid "11020325-7dcd-42cb-9202-ad2f9f5be8f6")
(paper "A3")
(title_block
(title "X-men")
(title "X-Men")
(date "2023-07-17")
(rev "José Tejada")
(company "KONAMI PWB353018A GX065")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/simson/sch/simpsons")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "Device:C"
Expand Down
7 changes: 4 additions & 3 deletions cores/riders/sch/xmen/main.kicad_sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
(uuid "b2baf9e3-1f8e-47a8-a7df-bc8e2f129133")
(paper "A3")
(title_block
(title "X-men")
(title "X-Men")
(date "2023-07-17")
(rev "José Tejada")
(company "KONAMI PWB353018A GX065")
(comment 1 "www.patreon.com/jotego")
(comment 2 "JOTEGO")
(comment 1 "github.com/jotego/jtcores/tree/master/cores/simson/sch/simpsons")
(comment 2 "www.patreon.com/jotego")
(comment 3 "JOTEGO")
)
(lib_symbols
(symbol "74xx:74LS07"
Expand Down
Loading

0 comments on commit e12118a

Please sign in to comment.