flstory: fix sprite vertical positions (#889)

jotego · Dec 10, 2024 · eb11312 · eb11312
1 parent 492a32a
commit eb11312
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cores/flstory/hdl/jtflstory_obj.v b/cores/flstory/hdl/jtflstory_obj.v
@@ -31,7 +31,7 @@ module jtflstory_obj(
     input             gvflip,
     input             ghflip,
 
-    input       [8:0] vrender,
+    input       [8:0] vdump,
     input       [8:0] hdump,
     // RAM shared with CPU
     output     [ 7:0] ram_addr,
@@ -91,7 +91,7 @@ end
 always @(posedge clk) begin
     lhbl_l   <= lhbl;
     draw     <= 0;
-    blank    <= vrender >= 9'h1f2 || vrender <= 9'h10e || !vrender[8];
+    blank    <= vdump >= 9'h1f2 || vdump <= 9'h10e || !vdump[8];
     cen      <= ~cen;
     if(!scan_done && cen) begin
         if( order ) begin
@@ -148,7 +148,7 @@ always @(posedge clk) begin
     end
     if(scan_done) {info,vsbl,order}<=0;
     if( (!lhbl && lhbl_l) || blank ) begin
-        vlatch    <= (vrender[7:0]-8'h10)^{8{gvflip}};
+        vlatch    <= (vdump[7:0] + (gvflip ? -8'h10 : 8'h10))^{8{gvflip}};
         cnt       <= 0;
         obj_sub   <= 0;
         scan_done <= 0;

diff --git a/cores/flstory/hdl/jtflstory_video.v b/cores/flstory/hdl/jtflstory_video.v
@@ -58,7 +58,7 @@ module jtflstory_video(
 );
 
 wire [31:0] scr_sorted;
-wire [ 8:0] vdump, vrender, hdump, scry;
+wire [ 8:0] vdump, hdump, scry;
 wire [ 7:0] scr_pxl, obj_pxl;
 wire [11:0] scr_code;
 wire [ 5:0] scr_pal;
@@ -96,7 +96,7 @@ jtframe_vtimer #(
     .clk        ( clk       ),
     .pxl_cen    ( pxl_cen   ),
     .vdump      ( vdump     ),
-    .vrender    ( vrender   ),
+    .vrender    (           ),
     .vrender1   (           ),
     .H          ( hdump     ),
     .Hinit      (           ),
@@ -162,7 +162,7 @@ jtflstory_obj u_obj(
     .gvflip     ( gvflip    ),
     .ghflip     ( ghflip    ),
 
-    .vrender    ( vrender   ),
+    .vdump      ( vdump     ),
     .hdump      ( hdump     ),
     // RAM shared with CPU
     .ram_addr   ( oram_addr ),