From 004cf1f7fc73c907d253e919b1f3617b30b6e0d5 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 13 Mar 2018 00:59:54 -0400 Subject: [PATCH] mode7_demo: move graphics lower so room for sound --- asm_routines/gr_scroll.s | 2 ++ asm_routines/multiply_fast.s | 2 ++ mode7_demo/README.mode7_demo | 20 ++++++++++---------- mode7_demo/mode7_demo.s | 16 ++++++++++++++++ mode7_demo/starfield_demo.s | 13 ------------- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/asm_routines/gr_scroll.s b/asm_routines/gr_scroll.s index 5b77bd1f..d92d27ec 100644 --- a/asm_routines/gr_scroll.s +++ b/asm_routines/gr_scroll.s @@ -1,7 +1,9 @@ +.ifndef scroll_row1 scroll_row1 EQU $8A00 scroll_row2 EQU $8B00 scroll_row3 EQU $8C00 scroll_row4 EQU $8D00 +.endif SCROLL_LENGTH EQU $61 OFFSET EQU $62 diff --git a/asm_routines/multiply_fast.s b/asm_routines/multiply_fast.s index 294b3840..f59736cc 100644 --- a/asm_routines/multiply_fast.s +++ b/asm_routines/multiply_fast.s @@ -30,10 +30,12 @@ ; Note: DOS3.3 starts at $9600 +.ifndef square1_lo square1_lo EQU $8E00 square1_hi EQU $9000 square2_lo EQU $9200 square2_hi EQU $9400 +.endif ; for(i=0;i<512;i++) { ; square1_lo[i]=((i*i)/4)&0xff; diff --git a/mode7_demo/README.mode7_demo b/mode7_demo/README.mode7_demo index 52ba21ec..ac3d48c2 100644 --- a/mode7_demo/README.mode7_demo +++ b/mode7_demo/README.mode7_demo @@ -10,17 +10,17 @@ Memory Map -------- $ffff | ROM/IO | -------- $c000 -| DOS3.3 | 10.5k - --------| $9600 -|Multiply| -| Tables | 2k - -------- $8E00 +| | 32k decompress + -------- $4000 +| load | 8k + -------- $2000 +| free | + -------- $1c00 | Scroll | -| Data | 1k - -------- $8A00 -| | -| Free | -| | 30.5k +| Data | + -------- $1800 +|Multiply| +| Tables | -------- $1000 |GR pg 2 | 1k |-------- $0c00 diff --git a/mode7_demo/mode7_demo.s b/mode7_demo/mode7_demo.s index 41488a17..aac25942 100644 --- a/mode7_demo/mode7_demo.s +++ b/mode7_demo/mode7_demo.s @@ -1,5 +1,21 @@ .include "zp.inc" +square1_lo EQU $1000 +square1_hi EQU $1200 +square2_lo EQU $1400 +square2_hi EQU $1600 + +scroll_row1 EQU $1800 +scroll_row2 EQU $1900 +scroll_row3 EQU $1a00 +scroll_row4 EQU $1b00 + +; matches scroll_row1 - row3 +star_x EQU $1800 +star_y EQU $1900 +star_z EQU $1a00 + + start: ;================================ ; include VMW logo line 0 diff --git a/mode7_demo/starfield_demo.s b/mode7_demo/starfield_demo.s index 5fc55a8c..3b50eaa5 100644 --- a/mode7_demo/starfield_demo.s +++ b/mode7_demo/starfield_demo.s @@ -375,19 +375,6 @@ move_loop_skip: rts - - - - - - - - -; matches scroll_row1 - row3 -star_x EQU $8A00 -star_y EQU $8B00 -star_z EQU $8C00 - ;================================================== ;================================================== ; Random Star