diff --git a/definitions.asm b/definitions.asm index f257c4d..6b9f945 100644 --- a/definitions.asm +++ b/definitions.asm @@ -1,10 +1,15 @@ ; @com.wudsn.ide.asm.mainsourcefile=scorch.asm +;---------------------------------------------- +; Player/missile memory + +PMGraph = $0800 +display = $1010 ;screen takes $2K due to clearing routine + screenheight = 200 screenBytes = 40 screenwidth = screenBytes*8 ; Max screenwidth = 512!!! margin = 40 ;mountain drawing Y variable margin -display = $1010 ;screen takes $2K due to clearing routine MaxPlayers = 6 maxOptions = 8 ;number of all options PMOffsetX = $2C ; P/M to graphics offset diff --git a/scorch.asm b/scorch.asm index 8e1e4cd..7f25663 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1397,14 +1397,10 @@ MODUL equ $b000 ;address of RMT module ; TheEnd .ECHO 'TheEnd: ',TheEnd - .if TheEnd > PMGraph + $300 - .error "memory conflict" + ;.if TheEnd > PMGraph + $300 + ; .error "memory conflict" + ;.endif - .endif -;---------------------------------------------- -; Player/missile memory - org $b800 -PMGraph diff --git a/scorch.xex b/scorch.xex index 1c7db0a..8f7577e 100644 Binary files a/scorch.xex and b/scorch.xex differ