From f5992677188833832470bd557ffd0a3af0418383 Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Tue, 24 Jul 2018 18:43:41 -0700 Subject: [PATCH] Fixed compiled terrain rendering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I thought it was working after the merging with fill mode, but it actually wasn’t. Should be now. Using only compiled rendering as of this commit. --- gamemanager.s | 3 +-- gscats.2mg | Bin 819264 -> 819264 bytes macros.s | 18 ++++++++++++++++++ terrain.s | 36 +++++++++++++++++++++--------------- terrain_e1.s | 3 +++ 5 files changed, 43 insertions(+), 17 deletions(-) diff --git a/gamemanager.s b/gamemanager.s index b33864c..5e5ef2c 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -122,7 +122,6 @@ gameplayLoopRender: BORDER_COLOR #$3 jsl renderTerrainSpans jsr renderTerrain - stz terrainDirty BORDER_COLOR #$1 @@ -337,7 +336,7 @@ fire: basePalette: ; Color 0 and 1 must both be sky blue. Compiled rendering uses PHD (which must contain $0000), ; and span rendering uses fill mode, so 0 can't be used there - .word $0aef,$0aef,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$0777,$0f00,$0bbb,$ddd,$007b,$0ff0,$0000,$0fff + .word $0aef,$0080,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$0777,$0f00,$0bbb,$ddd,$007b,$0ff0,$0000,$0fff statusBarPalette: .word $0888,$0aef,$0F00,$0861,$0c93,$0eb4,$0d66,$0f9a,$00f0,$0fff,$0bbb,$ddd,$007b,$0000,$0ff0,$0fff diff --git a/gscats.2mg b/gscats.2mg index 0571114ba804f978a0e52a53070eebb62ac62686..788621231d7368878031345dbf92b011e0aee5b3 100644 GIT binary patch delta 19079 zcmeHP>rWil6~D6!>t!G8G^yJKA~Us9m$hqWlGO4N8b4@lQHQ#dre0Oshj4-T&cND4 zt!s%dJ5sZN>r4o-@UShBux02D$<(C?ZMQBhwQLD2W3BUW2zAMtBC^;eUe}_2GzvX; z7BIH|fcbK-bmyKq_ndRj{O)hg$1@~9GbBIrhvM8H-FedY7()L-b|P5Nx^I2&+dIm) z?|xy&(>#w5vYkbCH10+ZnUy?jb^-a(-O!SmAslVYEp#tB8k%1n&y63?WzNd^nY|Hv zx7|TTED=;+X<}9~KUSNYm}g-*-NfuJ9E1JBks6e|^){}n7!NL3d&OXUO*2!(#J9CD z8}pfC>Vad-S6xp9ydvVBi`ZVZ-&0@dVOGWmjxh(AoPj->FJ98YBwS31I(d@$MR)>Z z`*RAiNg-B$Rg!EDdBV~A4mzeQ~6Nh{vqANRam|k>@X5Eas>M}0qm8df(9P# z##0rzF`=;vveTL!5u0A*;+f!GLf7B{)wFQyRUd7E~`!Tly{wV(r)6I2ga zcfDl9;kwk^9_F>2XNB3c+TO$LVR-d=591Gy<817*NP{-NwaBlzw#}w->;yuILu`e1 ztulIu9UeC1ntYHu{4+f$mYzEJ#>bg|mMP6bcSF&_fldwa73&ux`1NMNH}9EQfgti{ zp56hA5orJ|1vwAn2U88n>Gei{U>8E#A(lYTwRwhzYEZ`E)lQ;XTf`<`U;TIc)kXsa zFoWzmi`hXmch3ICmdrQP>8x0h*{O{qrC7c3JH~4%X5Um+s;gqmnlBWyd8k4@tCQ6! z|3xoWzaL}PuHxF5>4Vez&ZmGKACnxip*1uYDHv=}kH?t8aJjjIo=@>N69LLUGtn{+WpY<)4}8)A~pGNBL(a0+fGdqEG7|;`DZ5j zwEj{4QT~~U0Og;V=+pW~`A7L@CIXayW};8)ALSqApP2|y{+WqBt$&n%lz(O-K>24T z`n3K%%0KkT2F%b^)4FEV-2k`ca6W3W_R#;b^@pEF+%3#{fx&?16sc4>Y~ z7efT{dfv@7xw$|+_Z60_^Kj|>)yRI8`#0wDEYP%Ll0Ws0p_DI^hgxAh!$Y45fL*zQ z^(o8(4BXj$dJ^+iZY|c|#ThI2GpxT))}LejGFe~6t?W=r9}nY9>GF8irFh19Pv>`z zf?H4H5dmdNx(oa>0y?*!eN27=beS)A7kEVhjb6j7tGfWUb`ee{ zah0CJg(DV}aVshOP6`8DonyGFGlk`w1c-~cid*kl-3gHOyR#W8Y3zvX_lmzo$~6pl zYV#z}&IOc3H>6KI$8qNsTm>O}xs$Gi$nP#FE-otGhodeV=iYHu-EhdL{j#Maoc)Gd zg(SZ-JW2nP=d$ubN@sW?Kr|5G^sE3H2$$7l1<+hJG$5Q3NvLW39gwGq5>i^$_+^8W zppdizr=mFpI;-`G07TbITWE&7VSFb-W#SHhDVM~}_01)twkyD6Yofwd0ZsgQF>rEsi`AcMD1=+}xZxF3T zo=C(c(zgd1)?_12)$3a&_}jKhl~eVLDU%GtPdKr3{-DR{zuO1Ce9l`Q zC;6L{NuyKEGUGncE80=SmgpD#Gc1bO@4F}Zr5M+mpDj!TfCpIF;Z@(xwRplUp$-xu zmQKM{+%(8C9(?_FD5zPGm)l@@=XNNI27Fgz(9k?Y?$O(!WL{%Xvm5sM?NG+&#UgT4 z#IzL%B7nvb>$AgE4easbnZK>-)qDZ2JCB^zXp`?E81XWjC712*QW#6~b}yM$m^mfN6)B2h#!58Q<=8&F}j^AmX=* delta 2432 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 n0Pw4B{2$y_D{#