From d37d1165f8500008af857e9a141fc74b7b63e057 Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Sat, 24 Jul 2021 13:55:16 -0700 Subject: [PATCH] Fix scrolling speed ALso added MAME boot script --- boot_mame.sh | 6 ++++++ gameobject.s | 6 +++--- gscats.2mg | Bin 819264 -> 819264 bytes input.s | 8 ++++++-- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100755 boot_mame.sh diff --git a/boot_mame.sh b/boot_mame.sh new file mode 100755 index 0000000..b47ebd4 --- /dev/null +++ b/boot_mame.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +MAME=/Applications/Ample.app/Contents/MacOS/mame64 +cd '/Users/qd/Library/Application Support/Ample' +$MAME apple2gsr1 -skip_gameinfo -nosamples -window -nomax -bgfx_screen_chains unfiltered -flop3 /Users/qd/Documents/Apple2/GSCats/gscats.2mg + diff --git a/gameobject.s b/gameobject.s index 4e205b2..ad1e246 100644 --- a/gameobject.s +++ b/gameobject.s @@ -130,9 +130,9 @@ renderGameObject: jsr DrawSpriteBank RESTORE_AXY ; DEBUG BOUNDS RENDER - lda #11 ; DEBUG BOUNDS RENDER - clc ; DEBUG BOUNDS RENDER - jsr DrawSpriteBank ; DEBUG BOUNDS RENDER +; lda #11 ; DEBUG BOUNDS RENDER +; clc ; DEBUG BOUNDS RENDER +; jsr DrawSpriteBank ; DEBUG BOUNDS RENDER renderGameobjectDone: RESTORE_XY diff --git a/gscats.2mg b/gscats.2mg index f29bf2756774bb7071b7c1be08fa39c446c3d886..15ff1269723b84f5da5468e8b5f0edd5b12c5077 100644 GIT binary patch delta 2831 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 JmXtFM{{!xkgs%Vq delta 2904 zcmZt|eQXog{oOe>w)5o_vYt&h9%2YktM=Lr7P_eow1@x+A+!XNIKz}=i5;BBF*{D~ zkNL)AtxGxR#D?(*TR;lQMce>YG&^lkqx_YV3Om9_Ll9qO&;Vf^Ds(HV>iyo?fuPRP z^ZVWJ{l3568m*dQ)CvfSG4<{h_W!hIbmSD@Fmdh>Q-?n9&vhC5pGM0VY zmiIhKI245NzZvBx$=}=A)$x)TKH$N_h4{@v+(9sARYHuY!XUYksA1w^B^!RLRjnbs z4S(FK))CW&@3yM-bpNJR-Awm_3de9Xl(iN(1BMIQ0h1gvH2Fp?6PPB5t14xb$2nytva$d}*Zh&h$W0Yen z>1rek10cH}-_L^$M0eGZ48ohAMbv|$&E#k>xn>627Jozkqxqu#z+A3hH&^P9&2s%q zvr7N3S*>@Qb@~A_pr_47eb5Z+zcZu5d|;Rd@AP%Z{L%*&WIoL=UeCZ;vxlMDkqn9f z07EkXU_f&QlK}v;d4YujsC+w>MaU|E$rMr`T^0<+hMnx}coPXAR8|Ykld2RHDKB+a zfVxSY7gC=I&@s>^+D$>vLB}^~mjz>!Rw2l?Dy>qG?NthN{|xKjRrObh%pdY~gv^)V z&_`u4D0NxD1u^`3HEp?Bov9lFutO68MagXsI{1rfF%CVCzipHLqg@qFK?3jp9jbu8 z4Ri_bV1-a})9cAul}`Kg26X(ac3m*?N}xu7Idw*mhB<&?22uE9YUyRcoT=Rq5)Mvj zsBUyX3lt#CW@iu_^aDEK=;Y`T3?p1u?SNE+3BAzNOcEM;_ulRIc02`k<*}=sYqvLV zFA{hmxojrOCBMpJi{cdm?}8SF>Cl}{13xIo1Cb$cGpMSORE3}(i_jQABrgl8o5HRz zfoe@%6-+0M%XLAb-3dETyWs~O0EY#g71WcF)J37TZ$JHZ_h}m=rc0FHh+>4K91*XJ zDshl;Nyv^?^&^Xs(!u~%Pefqy&DoN00v^14;D=mhkoUJvLqc{lb{|IQKt>Z)hSjL$ z*JSn-62Z6A%-3n330&}T8p=XD9~X2ag{CjA_KZ`$7Qtl{#TP%Ykb;8HKry zvjS9^MOP{49>l*;t6dbHxLXr3J)-<#8@Nl2z;~cJMCl=f_=&0SQfK?{#66W`=`oG%BQ`%h0w+glK^ZGAMm)plS+ha)kjQ+yf_99 z2jbsVSRr_vRGqm%ny>_O`)U1-XRoqirHU53g~M~#KbFo?s~$_Aen%4Sjy)SMkZdde zHa5)^1uA<=7^IGO>&FmZI9L^t^7UhBk9}}MM6wOO6M^R395LO{kfy!I>yy|XFZ9`9 z9d+az>PWVHo@9(V+J|xbGy@>=pngTWc1bW@v>Pr7EB*CPE0V$5 z+>);=KpUTPur`<81ab=uWw=1#+HiqnF6cti3=6QKgrh7wauUw6X;QSxNM9|!RRDJa z*W-ji($6IydRSjP)=r)qgG+9 z_r%d?$5aEq6A`V)#xnx7_S{p^4#OqZW*;DGw8LD)H3yMN2Sk?{3{WstnL=E^IkPX z8o$&zvB#Sl&A=B#yax50=Ix8pNV2(5IyIKTz_$zamOjUR?>#0pF5YUo<(>GK!Jj0uG3;C72JoHh!fXJkueno%@858!=hq{Q^f?u3Mu{zLX0*pT61Jv z)W(vB7P2!7&WT`}H4Y3>8@F(aFNmoN8QiFtE%X;Y0dCU{{Cts8WXa0-PNPAa${27j kVi((gTlz8!%LXe47X5a>ngPoR%LU5~E4R1w<-GO(1I*{3L;wH) diff --git a/input.s b/input.s index ba3e978..72f1fd6 100644 --- a/input.s +++ b/input.s @@ -52,7 +52,9 @@ kbdScanRightArrow: lda mapScrollPos cmp #VISIBLETERRAINWIDTH-VISIBLETERRAINWINDOW beq kbdScanDone -; inc + inc + inc + inc inc sta mapScrollRequested rts @@ -63,7 +65,9 @@ kbdScanLeftArrow: lda mapScrollPos beq kbdScanDone dec -; dec + dec + dec + dec sta mapScrollRequested rts