roishtar GFX ok

Author: jotego

cores/thundr/cfg/mame2mra.toml

@@ -2,8 +2,7 @@
 sourcefile=[ "namcos86.cpp" ]
 
 debug = { machines=[
-	# not booting
-	"roishtar",
+	# GFX problems
 	"genpeitd",
 ]}
 
@@ -14,6 +13,7 @@ names=[
 	{ machine="hopmappy",names="Fast" },
 	{ machine="wndrmomo",names="Kick,Jump" },
 	{ machine="roishtar",names="Cast Spell,Select Spell" },
+	{ machine="genpeitd",names="Attack,Jump" },
 ]
 
 [header]

cores/thundr/hdl/jtthundr_busmux.v

@@ -42,6 +42,8 @@ module jtthundr_busmux(
     output reg [7:0] mdin, sdin
 );
 
+localparam [12:0] OBJMMR=13'h1FF4;
+
 wire [7:0] bdin;
 wire       mbank_cs, sbank_cs,
            scr0_cs, scr1_cs, oram_cs, vma;
@@ -53,7 +55,7 @@ assign sbank_cs  = bsel ? ssbank_cs  : msbank_cs;
 assign scr0_cs   = bsel ? sscr0_cs   : mscr0_cs;
 assign scr1_cs   = bsel ? sscr1_cs   : mscr1_cs;
 assign oram_cs   = bsel ? soram_cs   : moram_cs;
-assign ommr_cs   = oram_cs && baddr>13'h7f4 && baddr<13'h7f8;
+assign ommr_cs   = oram_cs && baddr[12:2]==OBJMMR[12:2];
 assign latch0_cs = bsel ? slatch0_cs : mlatch0_cs;
 assign latch1_cs = bsel ? slatch1_cs : mlatch1_cs;
 

cores/thundr/hdl/jtthundr_objscan.v

@@ -40,8 +40,8 @@ module jtthundr_objscan(
     input      [ 7:0] debug_bus
 );
 
-localparam [8:0] XOS=9'h3b;
-localparam [7:0] YOS=8'h1f;
+localparam [8:0] XOS=9'h1f8;
+localparam [7:0] YOS=8'h0f;
 localparam [1:0] HLARGE=2'd2; // 32-pixel wide object
 
 reg  [7:0] y, vos_dr;
@@ -53,6 +53,9 @@ reg  [1:0] hos, vos, hmsb_nx;
 reg  [4:0] nx_ysub;
 reg        inzone, wide=0;
 wire       draw_step, hsub, cen, hcnt_nx;
+`ifdef SIMULATION
+wire [12:0] full_a = {ram_addr,1'b0};
+`endif
 
 assign draw_step = st==3;
 assign objcnt    = raw_addr[2+:7];