From b0588cd14fb82b437048d5a92e4fbfc26c32344b Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Wed, 13 Sep 2017 10:56:34 -0600 Subject: [PATCH] Terrain data resolution doubled --- GenerateCircles.py | 8 ++++---- collision.s | 4 +--- gamemanager.s | 2 +- gameobject.s | 3 +-- gscats.2mg | Bin 819264 -> 819264 bytes player.s | 2 +- tables.s | 48 ++++++++++++++++++++++++++++++++++++--------- terrain.s | 33 ++++++++++++++++++++----------- 8 files changed, 69 insertions(+), 31 deletions(-) diff --git a/GenerateCircles.py b/GenerateCircles.py index 22e8485..531972d 100755 --- a/GenerateCircles.py +++ b/GenerateCircles.py @@ -6,9 +6,9 @@ import math def main(argv): minRadius = 3 - maxRadius = 10 + maxRadius = 20 - print ("circleTable:\t\t;-Y for each X, in words") + print ("circleTable:\t\t;-Y for each X, in bytes") for radius in range(0,maxRadius+1): if radius < minRadius: @@ -29,7 +29,7 @@ def main(argv): y = (int)(math.sqrt(radius*radius - x*x)) if p==radius-1: # A fudge to make circles close better y = radius - y*=-4 # Because X=words and we need -Y + y*=-2 # Because X=bytes and we need -Y print (y, end=",") skipMinus1 = 0 @@ -39,7 +39,7 @@ def main(argv): if p==0: # A fudge to make circles close better y = radius - y*=-4 # Because X=words and we need -Y + y*=-2 # Because X=bytes and we need -Y if p==radius-1: print(y) else: diff --git a/collision.s b/collision.s index b308d8d..b23c666 100644 --- a/collision.s +++ b/collision.s @@ -31,17 +31,15 @@ intersectRectTerrain: lda rectParams clc adc rectParams+4 ; Reverse rect horizontally - lsr ; Convert X to bytes and #$fffe ; Force even sta rectParams - lda #TERRAINWIDTH/2 ; Reverse X coordinate system + lda #TERRAINWIDTH ; Reverse X coordinate system sec sbc rectParams sta rectParams tay ; We'll need this later as an index into height data words - lsr rectParams+4 ; Convert width to bytes sec sbc rectParams+4 ; Convert width to extent sta rectParams+4 diff --git a/gamemanager.s b/gamemanager.s index 8842bc4..f315c9e 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -45,7 +45,7 @@ beginGameplay: ldy #0 jsr playerCreate - lda #190 + lda #191 ldy #1 jsr playerCreate diff --git a/gameobject.s b/gameobject.s index 7db6c7a..8752828 100644 --- a/gameobject.s +++ b/gameobject.s @@ -37,8 +37,7 @@ placeGameObjectOnTerrain: sec sbc SCRATCHL - lsr ; Convert to bytes and force even - and #$fffe + and #$fffe ; Force even tay lda terrainData,y diff --git a/gscats.2mg b/gscats.2mg index 733bc52f958805b1f2e301a7ba73d512bca66b68..749d848d121d84b53f3b5f95bbfc9a972a6b45be 100644 GIT binary patch delta 3493 zcmZ`+aZDTM75{7!$2g`OP$t6|xsq-wQM-E0x;R8pLNppeh?+{-9mUgf>Q>bzd`I%n zP}m=5ZDB>(Zh?7G_kMTa_eh1FN`;>KePC_XH^@|wJhAcXE<)ZWP6YOFv;Cd;PRBzI z8wo$>J{@-d{P^3p-gvY9@3#2PfuF2fd+osD zUK-AxXsT%ZZ^083s`?!XGtggi$`uRO4}MW=rpp1Pb-L4M7&{;`7X2Ra9Cx{bzHdR` zVD--(^I(mnP})u+gVkx~GJaVB_>}M3Z%FKK*=*ncXZWK70+Aujkd^WtOX(c>E-5tz ztNR_toZ^Y_S*Yf6Wm2em$2s_Tev>gx^vjhC@Zqlde4Tl@vXo2@InbF-r$$KjJQ5kL zBs9hLT0^shj1Uqf!~mr=$whx#n%V*lDrQC^~4j? zlGklcN)s0(VGXb;K&!NNg1$dEJV7VvufdZ3T?6IC5<+-j>T9;n@SmpwkDZi_ld|W< zntq4aBjd|G~&}ULUwr-y5wAufayos+Zh;XC zL@luMkz&j)3(Qzx)&il1V$2UMAa1-Gd6H2#0Ae6zfpZp69xZOYz(Dx*i@P;=q^RZH z`?Oe6E(%E3)U{E92;B}S7U0KD9&kBHgQ=r@V6lX=GEXgl+C5aSuCcug%#>tr|1{+{y!u&xXe;;{^VxE^c!J(Y%Abb) z{06vfgHO?gG36`U*{cJPA3mMiZ2yZtem(bBw{|h`e&Cb9y5NT3wxB<#1>X$*BUsY4 zrK_jww_P7~J$b12(A$Ry`Mj_U_IUySo)O;xv+nub?ZWM%7h}+eo||BNXPM=4KYEwI z;Ht4SYm+D7RvxSv0ug*4DKQcE@`W2<93c@NjtAel8-e>b3fI9n;*2-%i_@&2>xB=& zFq|jg@%IOFI*j|UumHvp&sZIgWnzK2!y_?z9t^KMvzVo^+OhK6Oc^He6bwh31GBJ| ziprNjvz2#m7G|K$f>{_DR8WXq{dQLGBNvK zV0c|&LKcigjywv`m~tfHCGfg=3Z|o70kg10#tXt%P$U8#eCYh?@lr6>%14eXg=sL3 zEKZHr#_K|Dd3YiCSUH)cYBd#-aLW~PcQGf%<5n|Td`30xcR-sFY1v^n{R_5r1`946EYHJ)*tG+=2c#y3O5~cedMnn&zYJ2b^XL zt<7k5k}uO+=P=tuhjQam%fjBg0B(%St@>3VH67b7K#DQ zRDrZn(c4kX-dc2YSdMK#x1Di^Iut@egphJlD2I#n8G5`l9RJ`z$6lJ*Px7DC)&jS3 z&TH?06cIA_izB7?aTvUhK3I=?AL15$SgJM)W{q)YgKI7 z5r+!*3^`R(WC-t|@tXB2bjrnp{Z8;hr@!QnxQfo?3#*)N70QVS>hK=Qr!I4r3MK8! zs_9leK`79znl3d%LR}jEu$G59RNbNCceFlBy_++=cHyg#V(nX34|S@#lgG``jFWhs znG6w1`T~mhQcvg(n^)jSZz~K=<{Z_}vzZ{veojj16u#K;7Mi~$YNH()Lb4kn`hl_H z6$$s(BlQoCAp0%x*X+7D0>6rVJ^0*rP<-fnD4$7Ua0Aa&Y2~7a4;MT4EWLLMVVzrp zDP)d5XbOoOX03ak7N-yfuyr$lt(yUC-3(ysW&m3^1K7G5z|PG8c5Vi+b2G3BTQ@`4 zx*5RM%>cG;2C#L{Q#OUb+|FekJz@%K-Z3nw?MIK?tME~rvo^q-Wz8laP{1*3{oOGO zrmXKDNzBvNVbDsa5x}6u0Z8NkBys=}IoS1xRz#qYyFeocppgU6$N^~N03>n%5;*{g z9Dqa)KqCC629z;)t8B82B_2{^fMUs{?EAD5quu5R9fwdNv1J*iNPFSU| NT&K&H)^GmV{{We(h~xkO delta 2804 zcmZvee{37&8OL8c&DHs}I6o#iZM9zA5H$>#X@%tGpM`4btkgo;+PgHTs@z~*{JyCH z385;9JUgQ%O}!&Ex2UxUBJz;%RXd5z2xL&&s1w2-jbv@=)J7eoP)ZQ3Fs0o}|G;~m z_w~_&dZ*X-x#xY}=icvo_V@K-V(VgJ>l=~!jz>u6@5qCjA6QGs--!poZ9eLLFW)cy zNOHN%Up2p-ms$o7xmOODdk^=ycSrJnIvjV^H)~cxGkq`Y%RlNq>&o{ZNv*AaZTGbl zHOn)7oddn!R(-UoBPnSo26BbyNV03(Tz_nR-z2>q(L>8x(6W9G$+_%riSKA*BmH`J zQY!4~d`Y?jXD_KXgh^&sXOV}jm)n5NXO8`N`wvF^O@a;_QRH+Y`1xxj_mA>NP$+9J@QNDsblM(T5exx>Uhs{Y)hrbS|-MF`|7F)Y^bcWm)jf2a#~tlEfyE& zN%@~x!wQkadEOIBTqb0mkSrk<$m&|KwSfU2{Rv5T6^pCx_Orr-YUoUUf<^SZ6K51iG}4L%sV4uNRpbv9oCZuCN)0R-G;rV2 z4E4&ed~urW3R*?-&5#;sD=or28c#0#=K#$9<_d!QjXtK z%Abe1l#C;V14`k5QaGR#4k(2KO5uP~5O$tMEj)x;IG`2|D1`$`;eb*&pcD=$C8L6r z;h>_@`-$Asm<ik=&MtcYXuGMu6pD~T~8|8g9P0vOVIh1t z7O8xff&CY&=iwA2Dz5T8OQA^#e&TYzA?x?c2R!n{cKO+M`P(*Y3z?5Y$2rwH1#65j z54W!m%eNZrNm^-;A8(tRr1FbH_B8cwmebTeL<4oQhuUMbQYZIPdjhY0)Q;hG7oG7g zuE-xAl>f!#_ebR&qjntQS0eTlj&o7_Ia47*nYevfq z)Pk|!+!YKnm`-Mp%}rCWr`dkytqb>!+F|CSFu^dh2Uv+DSR6l`=8NuR#!iO63B%6< z+e(Mr-iKg_)9+k;(GW92BCng3JS5;Lm58@)Jfh35k0x&M4FVn+2*GA$cQa#}dvJ<> z8cJ~yU+38*t=yF3Y^X#?c{60+Ggm&YV1E;qem9EMZ_1zW>oxrTy)%mI9;dkI(^TvM zIknp;dA~tK@)I$pNjhhjG`3KPW<0A!-k@iZnOK!iDJf6?Wsk zwh{Id3=wYwI##SsMz{Vy3BnkkD0zjgG9h>4c0*xXB8U=tx z0iaO;XcPbv1%N~WAW;BF6aW(8n;OyIg}2Ig@?7CDmIKNy#MIz7zXqv+HLt|Bt2+3B zF-7$|d4BjxuOaY1u$u)xhrc8qXJlay%gLwOgn`xmR=r&Re9QHzmg_EPZfJGT)%6gTI1U-*PFJz_