Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-01-14 13:33:48 +00:00
Code Issues Projects Releases Wiki Activity

tfv: move zero pages values to central place

Browse Source 
also mark some constants as constant
This commit is contained in:
Vince Weaver 2017-11-24 14:01:47 -05:00
parent db5b86289a
commit 92c2815a9b
2 changed files with 73 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tfv/tfv_flying.s
View File

@ -1,47 +1,12 @@
SHIPY EQU $E4
; FIXME, sort out available ZP page space
TURNING EQU $60
SCREEN_X EQU $61
SCREEN_Y EQU $62
ANGLE EQU $63
HORIZ_SCALE_I EQU $64
HORIZ_SCALE_F EQU $65
FACTOR_I EQU $66
FACTOR_F EQU $67
DX_I EQU $68
DX_F EQU $69
SPACEX_I EQU $6A
SPACEX_F EQU $6B
CX_I EQU $6C
CX_F EQU $6D
DY_I EQU $6E
DY_F EQU $6F
SPACEY_I EQU $70
SPACEY_F EQU $71
CY_I EQU $72
CY_F EQU $73
TEMP_I EQU $74
TEMP_F EQU $75
DISTANCE_I EQU $76
DISTANCE_F EQU $77
SPACEZ_I EQU $78
SPACEZ_F EQU $79
DRAW_SPLASH EQU $7A
SPEED EQU $7B
SPLASH_COUNT EQU $7C
OVER_WATER EQU $7D
;=========== ;===========
; CONSTANTS ; CONSTANTS
;=========== ;===========
SHIPX EQU 15 CONST_SHIPX EQU 15
TILE_W EQU 64 CONST_TILE_W EQU 64
TILE_H EQU 64 CONST_TILE_H EQU 64
MAP_MASK EQU (TILE_W - 1) CONST_MAP_MASK EQU (CONST_TILE_W - 1)
LOWRES_W EQU 40 CONST_LOWRES_W EQU 40
LOWRES_H EQU 40 CONST_LOWRES_H EQU 40
@ -242,7 +207,7 @@ landing_loop:
sta INH sta INH
lda #<shadow_forward lda #<shadow_forward
sta INL sta INL
lda #(SHIPX+3) lda #(CONST_SHIPX+3)
sta XPOS sta XPOS
clc clc
lda SPACEZ_I lda SPACEZ_I
@ -256,7 +221,7 @@ landing_loop:
lda #<ship_forward lda #<ship_forward
sta INL sta INL
lda #SHIPX lda #CONST_SHIPX
sta XPOS sta XPOS
lda SHIPY lda SHIPY
sta YPOS sta YPOS
@ -414,7 +379,7 @@ draw_ship_forward:
sta INH ; 3 sta INH ; 3
lda #<splash_forward ; 2 lda #<splash_forward ; 2
sta INL ; 3 sta INL ; 3
lda #(SHIPX+1) ; 2 lda #(CONST_SHIPX+1) ; 2
sta XPOS ; 3 sta XPOS ; 3
clc ; 2 clc ; 2
lda SHIPY ; 3 lda SHIPY ; 3
@ -430,7 +395,7 @@ no_forward_splash:
sta INH ; 3 sta INH ; 3
lda #<shadow_forward ; 2 lda #<shadow_forward ; 2
sta INL ; 3 sta INL ; 3
lda #(SHIPX+3) ; 2 lda #(CONST_SHIPX+3) ; 2
sta XPOS ; 3 sta XPOS ; 3
clc ; 2 clc ; 2
lda SPACEZ_I ; 3 lda SPACEZ_I ; 3
@ -455,7 +420,7 @@ draw_ship_right:
sta INH ; 3 sta INH ; 3
lda #<splash_right ; 2 lda #<splash_right ; 2
sta INL ; 3 sta INL ; 3
lda #(SHIPX+1) ; 2 lda #(CONST_SHIPX+1) ; 2
sta XPOS ; 3 sta XPOS ; 3
clc ; 2 clc ; 2
lda #36 ; 2 lda #36 ; 2
@ -470,7 +435,7 @@ no_right_splash:
sta INH ; 3 sta INH ; 3
lda #<shadow_right ; 2 lda #<shadow_right ; 2
sta INL ; 3 sta INL ; 3
lda #(SHIPX+3) ; 2 lda #(CONST_SHIPX+3) ; 2
sta XPOS ; 3 sta XPOS ; 3
clc ; 2 clc ; 2
lda SPACEZ_I ; 3 lda SPACEZ_I ; 3
@ -498,7 +463,7 @@ draw_ship_left:
sta INH ; 3 sta INH ; 3
lda #<splash_left ; 2 lda #<splash_left ; 2
sta INL ; 3 sta INL ; 3
lda #(SHIPX+1) ; 2 lda #(CONST_SHIPX+1) ; 2
sta XPOS ; 3 sta XPOS ; 3
clc ; 2 clc ; 2
lda #36 ; 2 lda #36 ; 2
@ -513,7 +478,7 @@ no_left_splash:
sta INH ; 3 sta INH ; 3
lda #<shadow_left ; 2 lda #<shadow_left ; 2
sta INL ; 3 sta INL ; 3
lda #(SHIPX+3) ; 2 lda #(CONST_SHIPX+3) ; 2
sta XPOS ; 3 sta XPOS ; 3
clc ; 2 clc ; 2
lda SPACEZ_I ; 3 lda SPACEZ_I ; 3
@ -532,7 +497,7 @@ no_left_splash:
; 48 ; 48
draw_ship: draw_ship:
lda #SHIPX ; 2 lda #CONST_SHIPX ; 2
sta XPOS ; 3 sta XPOS ; 3
lda SHIPY ; 3 lda SHIPY ; 3
sta YPOS ; 3 sta YPOS ; 3
@ -980,11 +945,11 @@ done_screeny:
; returns color in A ; returns color in A
lookup_map: lookup_map:
lda SPACEX_I ; 3 lda SPACEX_I ; 3
and #MAP_MASK ; 2 and #CONST_MAP_MASK ; 2
sta TEMPY ; 3 sta TEMPY ; 3
lda SPACEY_I ; 3 lda SPACEY_I ; 3
and #MAP_MASK ; wrap to 64x64 grid ; 2 and #CONST_MAP_MASK ; wrap to 64x64 grid ; 2
asl ; 2 asl ; 2

72
tfv/tfv_zp.inc
View File

@ -1,5 +1,60 @@
.define EQU = .define EQU =
;; Zero page monitor routines addresses
WNDLFT EQU $20
WNDWDTH EQU $21
WNDTOP EQU $22
WNDBTM EQU $23
CH EQU $24
CV EQU $25
GBASL EQU $26
GBASH EQU $27
BASL EQU $28
BASH EQU $29
H2 EQU $2C
V2 EQU $2D
MASK EQU $2E
COLOR EQU $30
INVFLG EQU $32
;; Flying Routine
TURNING EQU $60
SCREEN_X EQU $61
SCREEN_Y EQU $62
ANGLE EQU $63
HORIZ_SCALE_I EQU $64
HORIZ_SCALE_F EQU $65
FACTOR_I EQU $66
FACTOR_F EQU $67
DX_I EQU $68
DX_F EQU $69
SPACEX_I EQU $6A
SPACEX_F EQU $6B
CX_I EQU $6C
CX_F EQU $6D
DY_I EQU $6E
DY_F EQU $6F
SPACEY_I EQU $70
SPACEY_F EQU $71
CY_I EQU $72
CY_F EQU $73
TEMP_I EQU $74
TEMP_F EQU $75
DISTANCE_I EQU $76
DISTANCE_F EQU $77
SPACEZ_I EQU $78
SPACEZ_F EQU $79
DRAW_SPLASH EQU $7A
SPEED EQU $7B
SPLASH_COUNT EQU $7C
OVER_WATER EQU $7D
SHIPY EQU $E4
KEYPRESS EQU $C000 KEYPRESS EQU $C000
KEYRESET EQU $C010 KEYRESET EQU $C010
@ -39,22 +94,7 @@ SETNORM EQU $FE84 ;; NORMAL
COUT EQU $FDED ;; output A to screen COUT EQU $FDED ;; output A to screen
COUT1 EQU $FDF0 ;; output A to screen COUT1 EQU $FDF0 ;; output A to screen
;; Zero page addresses
WNDLFT EQU $20
WNDWDTH EQU $21
WNDTOP EQU $22
WNDBTM EQU $23
CH EQU $24
CV EQU $25
GBASL EQU $26
GBASH EQU $27
BASL EQU $28
BASH EQU $29
H2 EQU $2C
V2 EQU $2D
MASK EQU $2E
COLOR EQU $30
INVFLG EQU $32
; Our zero-page addresses ; Our zero-page addresses
; we try not to conflict with anything DOS, MONITOR or BASIC related ; we try not to conflict with anything DOS, MONITOR or BASIC related