diff --git a/definitions.asm b/definitions.asm index 8c3de4b..c05fc5c 100644 --- a/definitions.asm +++ b/definitions.asm @@ -5,23 +5,11 @@ screenBytes = 40 screenwidth = screenBytes*8 ; Max screenwidth = 512!!! TankWidth = 8 - .if target = 5200 ;---------------------------------------------- ; Player/missile memory PMGraph = $1800 ; real PM start = PMGraph + $0300 ; Generated tables -linetableL = PMGraph + $0300 - (screenHeight+1)*2 -linetableH = PMGraph + $0300 - (screenHeight+1) display = $2010 ;screen takes $1f68 because it has screenHeight+1 lines because of out of screen tracer(?) - .else -;---------------------------------------------- -; Player/missile memory -PMGraph = $0800 ; real PM start = $0b00 -; Generated tables -linetableL = PMGraph + $0300 - (screenHeight+1)*2 -linetableH = PMGraph + $0300 - (screenHeight+1) -display = $1010 ;screen takes $1f68 because it has screenHeight+1 lines because of out of screen tracer(?) - .endif ;---------------------------------------------- margin = 40 ;mountain drawing Y variable margin diff --git a/scorch.asm b/scorch.asm index 6d817f9..b3c4a5e 100644 --- a/scorch.asm +++ b/scorch.asm @@ -12,10 +12,8 @@ .endm .macro RMTSong - ; .IF target != 5200 lda #:1 jsr RMTSongSelect -; .ENDIF .endm icl 'definitions.asm' @@ -134,13 +132,9 @@ .ENDIF ;Game loading address - .IF target = 5200 - ORG linetableL - (variablesEnd - OneTimeZeroVariables + 1) + ORG PMGraph + $0300 - (variablesEnd - OneTimeZeroVariables + 1) icl 'variables.asm' ORG $4000 - .ELSE - ORG $3000 - .ENDIF WeaponFont ins 'artwork/weapons_AW6_mod.fnt' ; 'artwork/weapons.fnt' @@ -1675,31 +1669,9 @@ noingame TankFont ins 'artwork/tanksv3.fnt',+0,352 ; 44 characters only ;---------------------------------------------- - .if target != 5200 - icl 'variables.asm' - .endif -;---------------------------------------------- ;RMT PLAYER and song loading shenaningans -; .IF target = 5200 -;;---------------------------------------------- -; ; 5200 memory layout -; -; .ds $0320 -; .align $100 -; -;PLAYER icl 'artwork/sfx/rmtplayr_modified.asm' -; -; org $b500 -; -;MODUL -; ;opt h- ;RMT module is standard Atari binary file already -; ins "artwork/sfx/scorch_SFX-only-str.rmt",6 ;so remove the header to reallocate -; ;opt h+ -; .ELSE -;;---------------------------------------------- - ; normal (A800) memory layout ; reserved space for RMT player .ds $0320 .align $100 diff --git a/scorch.xex b/scorch.xex index 8e5f0c7..71a7811 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/variables.asm b/variables.asm index 69416c5..14cb87e 100644 --- a/variables.asm +++ b/variables.asm @@ -43,22 +43,13 @@ RoundNrDisplay ; 4x4 text buffer ResultLineBuffer .ds 19 ;dta d" ", $ff - +linetableL ; = PMGraph + $0300 - (screenHeight+1)*2 + .ds (screenHeight+1) +linetableH ; = PMGraph + $0300 - (screenHeight+1) + .ds (screenHeight+1) ;===================================================== variablesStart ; zeroing starts here ;===================================================== -; This is moved from display.asm to be easier to relocate -ListOfWeapons - ; 0123456789012345678901234567890123456789 -; :number_of_offensives dta d" " - ;:32 dta d" " - .ds 32*32 -ListOfWeapons1End -ListOfDefensiveWeapons -; :number_of_defensives dta d" " - ;:16 dta d" " - .ds 16*32 -ListOfDefensiveWeaponsEnd ;constant useful when clearing ;isInventory .ds 1 ; 0 - purchase, $ff - inventory ;-------------- drawFunction .ds 1 ; 0 - plot, %10000000 - LineLength (N), %01000000 - DrawCheck (V) @@ -430,6 +421,18 @@ Xcounter4x4 .DS 1 nibbler4x4 .DS 1 CharCode4x4 .DS 1 ;plot4x4color .DS 1 ;1-white, 0-background +; This is moved from display.asm to be easier to relocate +ListOfWeapons + ; 0123456789012345678901234567890123456789 +; :number_of_offensives dta d" " + ;:32 dta d" " + .ds 32*32 +ListOfWeapons1End +ListOfDefensiveWeapons +; :number_of_defensives dta d" " + ;:16 dta d" " + .ds 16*32 +ListOfDefensiveWeaponsEnd ;constant useful when clearing