From 1b0521d2653e9d3556cefeda81985564e9a9d5e8 Mon Sep 17 00:00:00 2001 From: 4am Date: Sat, 3 Mar 2018 10:45:03 -0500 Subject: [PATCH] consolidate raw and non-raw paint loops --- views.s | 37 +++++++++++++------------------------ weegui.dsk | Bin 143360 -> 143360 bytes 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/views.s b/views.s index 2e56ce2..1d02ea6 100644 --- a/views.s +++ b/views.s @@ -487,28 +487,23 @@ paintCheck_plot: ; Paint our state lda WG_VIEWRECORDS+13,y sta PARAM1 - lda WG_VIEWRECORDS+4,y ; Raw or Apple format title? - ldy #0 + lda WG_VIEWRECORDS+4,y ; Raw or Apple format title? and #VIEW_STYLE_RAWTITLE - bne paintCheck_titleRawLoop + asl + eor #$80 ; becomes #$80 for Apple format, 0 for raw + sta paintCheck_mask+1 + ldy #0 paintCheck_titleLoop: lda (PARAM0),y beq paintCheck_done - ora #$80 +paintCheck_mask: + ora #$FF ; Self-modifying code! jsr WGPlot inc WG_CURSORX iny bra paintCheck_titleLoop -paintCheck_titleRawLoop: - lda (PARAM0),y - beq paintCheck_done - jsr WGPlot - inc WG_CURSORX - iny - bra paintCheck_titleRawLoop - paintCheck_done: rts @@ -671,29 +666,23 @@ paintWindowTitle_compute: dec sta WG_CURSORY - ldy #0 - lda WG_VIEWRECORDS+4,y ; Raw or Apple format title? and #VIEW_STYLE_RAWTITLE - bne paintWindowTitleRawLoop + asl + eor #$80 ; becomes #$80 for Apple format, 0 for raw + sta paintWindowTitle_mask + ldy #0 paintWindowTitleLoop: lda (PARAM0),y beq paintWindowTitle_done - ora #$80 +paintWindowTitle_mask: + ora #$FF ; Self-modifying code! jsr WGPlot ; Draw the character iny inc WG_CURSORX ; Advance cursors bra paintWindowTitleLoop -paintWindowTitleRawLoop: - lda (PARAM0),y - beq paintWindowTitle_done - jsr WGPlot ; Draw the character - iny - inc WG_CURSORX ; Advance cursors - bra paintWindowTitleRawLoop - paintWindowTitle_done: rts diff --git a/weegui.dsk b/weegui.dsk index af3f51a08e9a8570e684b3dd4798402fc09bf227..1fed67d0cc2f377f30bbc80e42e30e1568e2932f 100644 GIT binary patch delta 5084 zcmb7Idr(}}89)2F%R(ZXN6qdg>XoDkC|bQ@(CE*b^FK-Cpm82!rX3%Nk)fp248v31kVId^W zwEVH>obPg-hZb`cDu0(`BLxEqex+_tSR{Qeu^2-WJ(DWabj;u(x z0+C(9mIagj4M`v6QD0OFsqH62R`#~gbER8XAH)%Jrg#WT6?9{EgtAp7hzGG0F;`gx z`!4fHdz^jmjO0o0()|PMTHTy=D8(zyF4uD1I1&E#v=3rYu53clE`0nLu60B^@$sX$ z)f+vE*In$y%`l3cnBT}h9+fKzrQ6XOXofkVKKZ8Y3Aqv|t{KXvX`BmD4QByx9GyX- zM~WkBV;dB9AEh`~EWDZn?(|+dh%a?w!Y)@Tw;w-_m1KT2C@c>Oj-X)QJ`oH6#HU2< zm(7>DFu^~8m4BQY!pbn)g;WVurIBUm6aNF8YHjQNbY~X*P*&h~=B&!> z((D7p$BRdb8?%S9Cv)D-ZO%K-47(-^o%!MXEzH*9my6dI8A=L@s*0W}l8RP3k2!x; zY;ZYTm9D2!%74SV=+BqUIRIUvr9#y*N<#nK?}*Xi}T z{rXCS@jj?Smeip+(^h36RapwFOE7XUo`Ax1lU<6GXo*S*{p_K;*UPvUqIy#O?NfhG z;b22QZaj?}2h{bT`a6UhhjHTwZajk<&*H{&I7qJ#H9SOfGXRo~cykIj4C00%EKS8R z;&MdMSrtr`E+T1$@HC-)6rdN8TEJClMN&gnkyA?wS8DgqCY5!$ve3x3VACX&82YxpFn?Dz#C|#fcCOM z!4eb_f`U0HP{g4&8ADD%8gi~WEZ+jdW3@(UBX5z-Sip;aEg{0S!z)%)K#D{T^0UZDp%(M=~A%<~*u8teV zK+tvxC@(K*JA;+A;@i%)5iB-2>0T$l3U01m3~R+I#xU%QN1zCS#3vGF6YTI8)Jm#| zB2R`}prSgDV5SWvaE4=3%7(P$8+_Eu=ICLZ#wp5;B|w7NOG0W^e-qSSiyFi0QXLG4 z-MGFJ*LPuhq$I$Qa%1T8ML`i~zrr~%dYVE!1nxy~20^xz{IsXMQi`*ObAFp+~=3@7vbu$N(vGr$StASbYfpl~F? zg@OZ$rf}WA9fE^A5*U7nOT~~u$VdXIOekAQ+5jURMxQ%c7fzRLCmwTV6f$bHDu(ne zg+Y2K`{O?RvZJLF&*SqK28FeO*$R}65sFhDfI^%#z_xAX?2uk4hK2C7>1i9a3V-S)&M2^QWBR!>OoP8AuTB}TDd!xq5L$KB_~N! zw8KRg6wxc4+M|FxkXcDbKkcG75h_0hEb+w|*a3cR=Y%Flzn4W<6~Rrxx3@rn8uscu zTD7Qok5F}IafCD1ox`ML;+GcCN1&gnJ2Rh5q!JTxKd$Rnw<45PujVacRwrGg;M8{| zVumQr#k4{D03o(*J58=A8}taV`BD)JhoDz-gWF0$flida@A8e{9q$e=bd#;52N9*V`oP zLai5nLK-2i{K1l37eYQVx)Iu3o}KH3mb9we<0Z3a%Dn|%XC4yDbIVu{i|Wcfxh(9P zeK6)=bf+(m&GzJ>2Ynx^jcjZAg9T0}LJ#}?q^?6gw~OGllQA2iE}y8{+$AQ~hj?mxAJYLp^(9yDduP4um9`T0` zp3Abgy94B2r08Q#y3il(#j-Bo+yk!eB_diBNL;Hxjv0HI#dEr)KH73DT9WAZ>7|*38>^8g?A6fHVfZt3fcUerj?Y2r6di0#sii z_rzrtTA(y+cr#QTLc;WDnbo-+UeNzZq8_y6s+{Mws1Ca{IgXeCr%uC!gEuDn6V%BcMvB)W6i+cc?{i|Ux(wt75~$e}5FeJR^)=6l(BeAGP1iWd zyooN&hTgJrPD#Z5xA60XXDbA(hd5{ov^oJwbcS+$wK(&&%P(#n=ZUMBuK=oTPKc)v z(xZnFi;(idBiJ*VBo`@hy8-R3GK4iD9dB1%CcCdvZM~Y-iP+|c9`Wa z!lU%!e!c+i?%n<-6hs$6)4*SIyJZ-&x@kI~4!xOsu zU`}Z0tyJzCDdpq=IqAXyS%0Bz7xgZDgk5FRud>!#qk50L2s%Q&CwheyktaINiaJlw z>JZC1cw2ZWJ?3t?#jKtHMSa>5PG(C1`<4A@0EgMN? zB56!?MF$h*F0;zkmT`8})*77iF?)rLxm$hLeb8QEA8TC$s?)z^t$O#;_fumzib0%U zVg1xSQqF6s{F>+ltE9l>cCbTZyLcTNrLv)*)kIt{09P>dmqSbJh-F5?<{C?fXfGA% zQgKbGcyFnAe`)l!&bzp4tkkja8Y_O!iWl8Aq(=~^SQ~Gwzs9bc2nL48E4Tz=QEPC1 zU7Ao$yaHe?GHFKnHxQsSy=-u$P8KdMU zq8*d63Gz9~(&&>cgGa8czrxm!v-J~f*bWY~7KMKVgOnUz3`2c2bOU0wQPPE%afFP* z%U~cTr%9YRZj|)mIIyTxX*5m%c3|Vz)L(}5OC^Mk<}fac6EsG!=Q8W(`$^2APz!Vf zY3eVtfK3dE8av|Bc$g|j_Ki>4n92X&=Cm^_+aeA4s`(?dW0I5aqWhPdH5u*T?d~j zwkmr!ReP_J4qt_STa}~RT$`fM(>StMJn!%%x!9FY=$8Ce~AF$(C{1mqhyt8jq M|H9k5-qyYHUrM2BI{*Lx delta 5060 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