From 0fb6ec1d14ee14b377977dad86bb04cca788ab36 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 30 Jan 2024 00:19:57 -0500
Subject: [PATCH] trogdor: fix possible glitch

in some cases glitches if we have code in $BF00

I forget if that's a limitation of QLOAD

in any case, moving it out of the way fixes MAME (and also occasionally
real hardware)
---
 demos/trogdor/Makefile            |   4 ++--
 demos/trogdor/gr_fast_clear.s     |   4 ++--
 demos/trogdor/qload.s             |   2 +-
 demos/trogdor/release/trogdor.dsk | Bin 143360 -> 143360 bytes
 demos/trogdor/trogdor.s           |   2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/demos/trogdor/Makefile b/demos/trogdor/Makefile
index 4b452d00..f84a2444 100644
--- a/demos/trogdor/Makefile
+++ b/demos/trogdor/Makefile
@@ -83,8 +83,8 @@ qload.inc:	generate_common QLOAD
 	./generate_common -a 0x1200 -s hgr_copy_part qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s hgr_draw_sprite_big_mask qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s horiz_pan qload.lst >> qload.inc
-#	./generate_common -a 0x1200 -s hgr_vertical_scroll_right qload.lst >> qload.inc
-#	./generate_common -a 0x1200 -s hgr_vertical_scroll_left qload.lst >> qload.inc
+	./generate_common -a 0x1200 -s hgr_vertical_scroll_right qload.lst >> qload.inc
+	./generate_common -a 0x1200 -s hgr_vertical_scroll_left qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s horiz_pan_skip qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s horiz_pan_skip_short qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s hgr_copy_magnify qload.lst >> qload.inc
diff --git a/demos/trogdor/gr_fast_clear.s b/demos/trogdor/gr_fast_clear.s
index 9c7787c0..6edf073e 100644
--- a/demos/trogdor/gr_fast_clear.s
+++ b/demos/trogdor/gr_fast_clear.s
@@ -19,7 +19,7 @@ clear_screens:
 	jsr	clear_bottom
 
 	rts
-.endif
+
 
 
 
@@ -75,7 +75,7 @@ no_draw_bottom:
 
 	rts								; 6
 
-
+.endif
 
 
 	;=========================================================
diff --git a/demos/trogdor/qload.s b/demos/trogdor/qload.s
index 10d9167b..abbda764 100644
--- a/demos/trogdor/qload.s
+++ b/demos/trogdor/qload.s
@@ -213,7 +213,7 @@ hposn_high      = $1f00
 	.include "horiz_scroll_simple.s"
 	.include "horiz_scroll_skip.s"
 	.include "hgr_copy_magnify.s"
-;	.include "vertical_scroll.s"
+	.include "vertical_scroll.s"
 	.include "hgr_copy_part.s"
 	.include "vertical_scroll_down.s"
 
diff --git a/demos/trogdor/release/trogdor.dsk b/demos/trogdor/release/trogdor.dsk
index 865695aa3fbf38ab54f175df4a9678596f538f1d..a2a9cbcd9b2a1ae66fc4cd47deaeb0fcb1b83023 100644
GIT binary patch
delta 2021
zcmaJ>Yitx%6rNf8+M?}tUo$(i+g{Ty0WAj6iY6t#f<n8A#fFF)$uzOS8Y6%Ff&S?d
z7^u?Q!rlnhYABmd;o7KRqqrt5tHeSPnu#I);z!*ywW3z+yG=_y_s;HiOVQ2dKF;f&
zbH49PcqlJCly_Ehh|iNc$K&E2^0A||FeuS~^xM>>FQK4>g5;`0c7iNhx1(Gq75RpO
zJ=2bS@mXUI#R6!3plcfK51^RL@BLHe4NJDwl7(V{jz$!djM-bx0h^f%LFPikD&H2#
zI_CponAAESd?@UTW}&@-s6Vtn04G@dA-HCtt?aZj(A8|-6RL6QL&lJ~ppi??CtSTj
z_1NuWYe#O6tUb3-RaNy_Zw1-y+EhS=TQ=&(t!h;06^bKEyU0;jO?J0R1)Ws8OYNI|
zroH1J+Uz6Y?J9}5pWblYclq1`zTq<#@Q*%Y5%>FyKk*Mf<1c*C7ZnaoMs3EVTt9v$
zCKT&yBdWZ)-#2#AcR8M8j*d(klLIB@PZ};);DJQ+La$JQT?+Op_<m)(hKm(Q0(+Ez
zgb{hcv%!8?lIzR#b+IO*dp3G%C2GenN*Y}cD}55zN*eV2is!M2zdGVQWV<SpCU1q9
zPx`!X73WDP;VrL?qdgM61~|DnPUVg`+Tj9Nwn^XG)Zg?`eVpd&6QKQ_UeIrby4C1;
z$U$F-D9<!<ypq@ee$=K<S$OSDWB7lVcFh1FDX>${GZ_S6&NBdH$|gmK8MKqhHf6A8
zb)ad>5hDdVl`*Fx*C%j*ysVbiR4B9zf0OL+2isVW4=MP41-G#tALl)8Qt(F#)|Ii0
zKa238GRo|m75oXeJEGura#ek_aG=aQpcxZ*UXdHzSRsY3N>c4V8tjzi286$sqk_@G
zPN(HwA^fR;u9!1po$}ae`SVVBAmXl$1Ug@pjh2QS-0Q`0Z-a<0dU3zEV;}8k6LQ+Z
zIc-92TR68VUgP*%Gg`I*KUz?ymuB(p4ZTHU-dT8!gbO6_E|RdD?UIBQ*n5@&c~M(T
zBKG*h&wZz$M-)CuutOuQ<MIx%XK9{3O=W!s?egD6oj_Yv5{|1LKwZGEx#&EubJ3^J
zD=unBL!|DKYfDT*iz)=CZbl7JpG`-y#Q7k$A`f%34raD5Dg5gDf^08D_>$pFMW%vz
z;O3;Pe@kO~Ak=UG8Jrmjxgk$a44gI3fXxKefUz2a62b9jmf9(nn#NLNY9T{?im4B#
z)$Tjge=v0mQzP(Z@d}va3tZP|1<Xu;Wh@C^&5WIF1+VdSs~R>_R;Kh`m>Y<m3ksn4
zq!rfc5>$=cej{1qWpkV>;Ujowap_z#TE^z_L?48lL(P3~g7q$DX%WO+E}1t>L#;A<
zil>~TPeB`7<>(sZhp(x}8q|~sKC&Kb;(F#U6=gSC0I-f%W^|n0i<j@#(@^Ph(rHmU
zhu)SX1Sb>6o30QoTUk7`C*it}<8_?18WwWm+Pk}fPDzSG=QD_q90lO%MoyX($p1l_
zOpd{jq>v+T52|dwjtrJocB@@eqr(aF7uGw*^O1y+7|1a%@QYO;XjVOxK-<-xn}f#s
zMm{{Dlgn`NI@3t;Mrf<(o()fhe(hVub0$yw!o%#Y2`hfr-(2_3$)!q%^wN7iw4<kB
VZalk342ngEMTdA^bl8?k{smQGD*FHc

delta 2119
zcmZuxTWl0n7@k>ow_PsFc5gF#rrVyRrQ8D=HAqUlMdh*&CE#6fYFy|FA$>3rHE~y9
zkRYciJw~!7l(H~QN2386f;{wMVt@r9!$nAl5A6!2qPBH=qoh**Gqc^@N|VW)bN=(+
zzwbY>uEJPX;c?l;H_&R=a{eU!##J__R?z-Y9%>$C0@n(-mj2=r-5|3m4qV{Ycw@n}
zts|}({QO|^2woV()_^(|Y790-u~k&>54e*Sy#O@FLP^P3QuIalLjEG%?q0O|Vjy9~
z8-j`A(B>fQ;8z@iqZRzXZbh(pzy4UL%B^&%UHZ7ZrA0k{rv`T&RcnrI2~8Z;c>L?p
z<!b28g%*0w{mh(XxxPzQ2gys481a%Y{aLE?wAD%n9v-OZdDv5NVtmb-HQ%<ysK@gJ
z{mxT`>m`j-?kc@XTAQH^YF_0JtwXsNs+SU{+qe>CoSrIP+u$v8><s9RrrmgFfW}r!
z^cC;(OH0xD6XRqaQpbr4ssEB9r2a)_BlU0ML<w%sP{N`PiQ#n18E{ikB+%2rlBNBA
z&8pPlet(TpCyQ!b#7bTh$eTihC+`U4UADd_kT6?o1hSP{eM=ly1u<N%%s+FDuJA4M
zH42)891>)00sOURNuwYGBvIef4gNhAAwc)~pW<Jo?fz{g>jk_-SiHUypA@u9fS=dE
zZ?UTruk!$0tArmdR6;LAoq3qy#-L_VhOr^rVB!ce^Sn8GK0B=cX37=@n@1-B&odqc
z7!49+j7I_B$@8S~C|<#2QFSaEA;X+JM<aQL(`RvpD;2|a%DiKPCn{EQ13_-!Kt-=^
z?<+!mPISK0uJ`r~sYA(9{h~}hLI8Fu(b2}0l1+$IBeD$zR?8%U0Ba&6vK5hysBa?@
z!zofjol;p<3~A+rXCwi;eXE$|6-2HhavOnRw_$h<k>3%~QD5H2JanO6rhgNWyN2Ek
zM0)7w(v$R*Z*4<y{oH<0j9|hA5}aDcc4@JViyh+d1%0%yU+hbZ-}j5jhTyTcA^I|t
zEm!>Hx*yna(@$=(wcAf_v-Pf@-19f>P?yCyYdmI+bGCTQ)>-A673b{nm_5!F#A5|}
zUEK!h?4(d2Ga1R8LhD4ZFk!KZ)Y19)%QgvrhK!+w6|gb4xfSxbuN5jIny8H8mBrIs
zr*OKR#yX`i5Q!rjJ=z0O?a`jYZ+SEaUWBx(Om>9HWRRH-QWAvHybN_-xu5lGif4e>
zR7)CaO-yY^MtJfkr_FB_@mGvU@Di|~O3F~D<!4t$W5G~l7v5)3FC|6_l~nS$-U2#<
znhXOkV<;F5rzT}wb9vWCSkAjAbA~w@1eKiipX|DhU1KPT`ExSK52QMpU!|G;R9_;r
zBHuSQYc^_p->il`NoFi<77QkMFMtb}p`rZdLDhInQZqH4*VD!&yuSZ0F5Akyma&09
z*bXko@cwq#!G9XHtO$JON@gfRA8&~)l##Ms88!ronYb99ai94TOp4%j_n9Nz`rurV
zEouV50IAGtDLa?s&Sq%nO)lxIC}u!!$q+(h9W?OPrigM{CMz8oxMmx8ea%`8KYH-e
z$D4po8NyFRIx`r+(@)uGWI;ADeuOmn9D|XWM2>F1EU{_(@^V>az0^G1dpo7yVD1>t
zds1pDY1cc9gIVEpfl_#+z4hK@bwLzzO-Z4{Ik=2Evq%|@kRPGD4MK&w+aF1p$+NZ)
zn4Q6Tz@m9cWk-U8H}d)i^FKU1QRxz1|0ICdwK~VrHoD&PMk_y8bA7?P_|v@0GEw>;
Domdyd

diff --git a/demos/trogdor/trogdor.s b/demos/trogdor/trogdor.s
index 4e855d2f..327916c9 100644
--- a/demos/trogdor/trogdor.s
+++ b/demos/trogdor/trogdor.s
@@ -1262,4 +1262,4 @@ common_cottage:
 ;.include "wait_keypress.s"
 
 ;.include "hgr_copy_part.s"
-.include "vertical_scroll.s"
+;.include "vertical_scroll.s"