From 2a83fa962d5cb0808f9ba1c8e534714c3deb29ca Mon Sep 17 00:00:00 2001 From: pkali Date: Wed, 14 Sep 2022 06:30:50 -0400 Subject: [PATCH] memory map settled (most .IFs removed) --- definitions.asm | 12 ------------ scorch.asm | 30 +----------------------------- scorch.xex | Bin 48609 -> 48613 bytes variables.asm | 29 ++++++++++++++++------------- 4 files changed, 17 insertions(+), 54 deletions(-) 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 8e5f0c7a32e73638176ca9b36c4048c28c842a54..71a7811bafda3fca192a99638c735c245553e8e8 100644 GIT binary patch delta 16854 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 POn1M1!E;U*HunDkA>|ih delta 16684 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 PW1crJc)v@EnDGAq`J9*` 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