From 217a422ab7e849e8b33b59e786cc2f61e0e8ac68 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 19 Apr 2021 13:59:05 -0400 Subject: [PATCH] ootw: fix glitch in ending on real hardware caused by uninit zero page value --- games/ootw/Makefile | 2 +- games/ootw/ending/ending.s | 16 +++++++--------- games/ootw/ootw_side3.dsk | Bin 143360 -> 143360 bytes 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/games/ootw/Makefile b/games/ootw/Makefile index ae2f8234..35741193 100644 --- a/games/ootw/Makefile +++ b/games/ootw/Makefile @@ -168,7 +168,7 @@ HELLO2: hello2.bas ##### -zip: ootw.dsk ootw_side2.dsk side3.dsk +zip: ootw.dsk ootw_side2.dsk ootw_side3.dsk zip ootw.zip ootw.dsk ootw_side2.dsk ootw_side3.dsk ##### diff --git a/games/ootw/ending/ending.s b/games/ootw/ending/ending.s index 048d5c12..a075a7b4 100644 --- a/games/ootw/ending/ending.s +++ b/games/ootw/ending/ending.s @@ -78,16 +78,14 @@ repeat_ending: bit FULLGR bit KEYRESET - ;================================= - ; Setup pages (is this necessary?) - ;================================= - -; lda #0 -; sta DRAW_PAGE -; lda #1 -; sta DISP_PAGE - + ;============ + ; Setup pages + ;============ + lda #0 + sta DRAW_PAGE + lda #4 + sta DISP_PAGE ;============ ; start music diff --git a/games/ootw/ootw_side3.dsk b/games/ootw/ootw_side3.dsk index f7980c43fed394a88c9b1f18f2032628a88285da..0089825cd510dc62aaaf33f54bed782fa6d28d99 100644 GIT binary patch delta 4290 zcmZWs4^$IZx}V`s2mzO1w{HU^xdSGFgkZDJw#&ACE^aFUniX_gwXe2>iU=&!TC3P@ zF%ca^^eP;D8XNuL zD$~DzYC70H+S2A~8$Ho};)Ls9J0ZOE#K{8(4vfNoArlLP@aN|o19_xAQ-|F;D@!;- z$axDndE}f#&I#naiJXJTc@a5pAm`tabKHSekd*Bz3iRx%s==e8#0k^_N)#ntb{{=X zu>`KsvC;Ub)*8yu;=@{eMC(1GpiS3%;O}`5Sn)pjdh0@9d(N8%Cd=h31qq6Aw<979Y*w4D79#0x~&UIQF~vpX=`=G z8xN8`$$1I!(bTX8Mp{Ju5{3wqw7kD0nCDCIUdgB$fe{1b;=N-T)NV@D_T3ON5y+zhcWg>0g@ zgDmGX!6-i3^123mOvC2g9OrRcn{Romr zu|&|?62+EwEBu3~eh6V>x_=neUqtxvbOk%`_J&O75CS=?gS8t*{+r0Og}2oX-$Yzx zq{)QX)$K!f5h&+oP)Ssw-Lyo+oD^z?W)S}swx0_-&OJxwx+N5xYs$%dm6@F4xMdF{T z@H3)(R)zCLS*XGmm80Tg(vVoK!nI=68!Eib@$yPirF>t7kBc>|3ZD?=A659IDF0i9 zKXkOMBr}!Ys_=wZ^PLLc6{VoUv1*VBYMgw8x}2^{xtB7SLZuEuUYNQmm4?#qQ~x)D z2UEVhF9#j!e9|auS1UGY=&arj^^wPha?JT@F!_1;wACFdaL*UGg#wZNsHU_^TBxMw zfd&^q=${PoA2!HOJL1Vi$%9H4aqxn2FF}ne3-k(psmM_VTib~fA7s5(F5k1U`-E?y z(AVyhzE_^uwMk?%@ke;&ea6*&tP8tTU8cq<>K&DfI6gIE@@4dyd}@EYn$Gffz|cdq zzIQs6p6?B((n5OyRhw4XJvJ5yjF`C3V3(i?!ArZcU@I-BQX=$hh~$wBw);<0f0}Yn z1v&0_0H7B(6DFBP3sim@b-{7YOy;bkx8{0dDf&&Xgrc`WNhGLk3rSIXU$JRhb;X+x zl0J#vmg~)-=(oH}DSA7U#5UU(lA?A&;V3R3a}vHr^iFRaMZfKR%(1V4Txt7E$3?LM zT@O^6c7905{Tn-ghja?BOIJ03T{^E@ltA(X{7_5u{2des>}_@p^lr$+l%{u9hqE+i zMi9W<@d4*u1T`RMkbeX@!{}JEH$ek&X)$Zq0SI}>E}~rjT{Jg{{4;3oq7BKn`=?N$ zpr|5&qad^k1>lpVw>lWJP@X{C%3v&~6zgw)PhQ_W9QV97DCK?xdYA^j zt`iHBk$hUm$%65mM65ZcRkYV%Mb4`>Xj(stoTG@gSuv+$cjC`wDfhJhWcrslor`qFrU$j0+Q9p_BvWzS~8g4^i!&*j% z8J*?%3?LdF;n#JdhDY9$=|%biTWlR&Hy=X&5E{CSS|t9j5X^Ue0{JJ<(3n{9t#~=) z*PR(hd}=OSK6pZqX z!d~D64bUfkR^uN;c)7+OxqAFpk%`{r7v~N$zLKF&!eel!>UmBMr+{6;>EM1ke^hJv z!;+w!Q;OG8Y-^9j#u9MLvE<%nS$A($4c*XNT?1kdL~?`kE8wsO=Vjz>sETs_4Y~Kg zZhi^pz#6e;YiN6~N3`AzR6T*Zd+g3{p@rQ!hTL{&aSge5LyPNT3z#Y=fmOEDW%$2D z^dA4;5Z&Ovj-H@*`>!F|4r?Zpb@w#jxpe3gpA_?YcySDgL#T&$$1sA8DT#+Ch<^wj zS#epZ%v0lhk-98uyhfDk)%aCWmaB2K!(<_!N`^?Er)TfSx&ZP>tL{-pi-r8LZHt=C zqBX3J)>^(%Q+`zhEv2Qz=n1sAs@12v6@ zENUe+qU`obii(OnzNu!O3{af1pPOmorYj3%z8}hb@m&J-M`ip7mu4{N$wGlklG%K5 zP*pX|#hMm@8xQ>PCgq`OrNVnbS>?fulJ(RMDzQUZsgJ87gYhjt5WAH^|FL4XW1bcX zpDlJQcIfqZsLz!lM#;zbbGMtgNlQ2_vqIsT;!P-$*>llMAmHTkod+-b?@bqAp&x=@EV9bKPw z!Nq@m9r2!%2M7p>bIbExdMKWEmH;aI_5CfFRlHKfXs`Vu)T zo#uJrNi#9V{3q-aF_z>JN+$^BWilMMqwcleu8rI75MCzlN?kDriL(doXPH+>^?%&X z?w8M4y{GO4C9s(rjNZO`TsnLcMW4knXLouJ^g&{$@Vo%aCJ6B5wKW^RnJv~tvj#`W zM~^e3{=*J^ab8HL+u?sjx&rk>yx-|D!n0nu#Srkh4jtb zNAP}Az_nN1A50 zs4X*qrb&KnY$TEUt2Hq}=BRs>+$}BNXqzDR30bF0$uKG1vBSJ&nJ#Y+QwGcN_s@%E z_H{`~%xeG&XWld0KUwK!HUbzYrjz9-i+QFTK!u>`+LAK&9J2|)7t(^%VM5@U3IO?b z;Ri%=NZ!eoQYnL;%0L*3^xuX2zeCBlk9UX+HH{lb{=`G?M>@z>v{Hd9oWVV88 zD>>;AHcfh%Hv!1s?R>UEkjt5E0CYRDT3~)N%v%76BG)eSZnK@)4&c&Hh-7PK={jZy zfXFb_r8cIH3`j!*-+*ztA)X_LySLq;*pVDki7 z#mG&W1ZXTRaQ~AT?v)!l#OvLjcTK<>sa4OCO#-4C6oE yO2$fupDiU;3`QSk7*P9OG84~d*oqkk89v@lN~E{9#ElY%H=bsG2Nl03TmK)M;E;X* delta 4357 zcmZWs3sh9sxjvi6a2T}=rX~Z-%s$}Ez`$rGO_S25i(-Qekhv9ejgPj*Q4tv<*BIlg z4bDhBipoZ;>D@z;Ne7l#&eXYUNW8UlIhEDA(isBe5FfEV2;L$A6*yY5;2PoF|A4Ws z-eI%<{q6tX|9<}8-pA9&dLW%biTUozocg)k$2pwQ%3aLip0aYMvK*OO;TCyTOV(?x z%iFD`?besut(x|g!ggK~wESHz4-3ElXR-59u_?m+1#|WkZnG9V?Gj`%7Q6X@9Aw%x zUxNdu{FXIRQ{$b;|778Zk@kr{boTe#PL-X18q#+wZQ`y%+eBYkp$*bt|F;Wm-}$4h z*4tnIj{lwhlirgj{k2|3UP{~Z(Y%%zWn z?E4?=`#bjCpqYyh=e~*~t$SRX$u&iiSZ)TzDU#$oL{?5d3UZxJP^f3`Y)_f(J~+`JxIMLh~kO|IWHP zGxs~LDa)5$YGRA!To(ha>tm;eaU|lYx{Nh30uy!C#|Ud$wBasXbrBO| zdiWBq>c+&Ht`&NAFU#~@#30AamL%UL9PY=qEt0#kw;ziY(@pLu2c#w3jjM*0a}u5& zW_T2f#o=MBF?g@v#h{$Lhf8CMJ+}D@7Fnpdeh*9Yz{HmRFDA)h3By{$l)gE8LXRcM z`c=AyYY7kG+|oHig-MDtP4d(b7H19Jo%S5pJA}R3sv&Gkh-&KNg(NE+zdPySPOOGs zVoyuksZ8JJFqM*)(44S{B{qD_e_;W7mOfvA4DRc?NUKD8b&-AJ!fb9J&2bP1Y_pZR zZ#0LB6rBciT(^PiOslZC1ARz}g(y8f4pA9>Pf|f#I`Xm8&$LR?`~YYkckrlryVCsl zxZ^$S6n@CHJm?T7==lP);AlH*`CQ0rop zvv{4JY*1<{^yD?Yf0y8IU{nnrRRfdI;7O=yFV&1XXI#CfCm$$=je2rik-ycGfFgr> z5~A-fMwz-V^yH>eb6ZdDDso&;CKVZLAc@DgYZgOFSIVN))u~mfT`4s6BgmD%&mPJy zYA!@pb-h8m!N_N|9W@+#`uc*xyfj#aDb2XEd8DX$s;F5m5*U7j^Q2Yqas@vn#61Kf z|6-8$xIrHMv=DJAT{=Hg+o{{faMyH27Ok`}s;z&DYt^|F-pX*lbMoY=EK;WV<@%PB zp_xLvH^h>%+3#*R{P4#FHSN}=?Sh|p^-Z?@W852hKXYQN&lbvPw}lMhdIO&oJ_=J9 z;Vo^Wsr*!%l*-HAB5p%kMa$q|B+_RSKZ9+9CXB>3Wx?J$ewQ-M(b?1abO!tX@z}>> z&0|qf`~U#-B4C(o8ZUEsXvkgI=?%hj`6FpCWx`C-c~E-ywfb+pWW83W86 z>hayhPy_NF4qwJT2_HWcj5R{II(}pndVmQa>&Cg^yLhq-hwtIZZa3C!58uJXvet!w zd?4bBWuT!M_KFo*g~|r7xHK9!Q@)AC#nE_Cr_|s2hSP38P6v`H%8E~c9;QKh%}U|R z>3q~Is-uabN~w9@r1e%^#lEXtW$?IaPiu#0qAcnqj4lGn-o%PK zuUT0N;GWNMq6V_ySLwhW0%r}Rvl`BuD1~AzN!qF}G0Dlul49YK1d^<*Gm|>AlbjnDtsQpe5Y>W@J)QZPpSAqxiboPp1Fag z)Ee=L@Ta&~xnv~OnOoRVn{nng4&T5n&fY87*~D;-8F2U@D}|6~oFBe|qcNd=*b5SC z1Xd+47{gtdJZ}t7-$>!BIG5iOR^|>fzLH@{B7JbxS|m{er=W4ZXohR6`&TB%Z{|le zqE5N3;$by_)Gis1wid(*47Zz>zJ#>%&I6TI`!3+-YFCV}2RFYBd-xfxdI>${zKL5} zJ-#o%z~k$~%^ongj+^&_K`$H+C(K7w!BRT5WQ0G%{M+Fk%vXndF~2u_9rGSo7qz;j zwVHgD4n2^7l2^fFv%`^2>DYzr!u#U!;mlmJz( zUNPP_2iyeUpRCr^t1rIS?4>)Je!W(xp>y0Q`+ypRVZDDRe!}G@BO`f?Ky5V;C z2mEVOyH2Ae=oF%7N)cNC&!7A7zJdTDwPuLFnP`LHC8J6JL2yE7&IC2TlYH}H6p~0M zCS#cBIIe)B>{2wrmaNzqSGV^4A5->aK(c48?DjJ-gntJ#E=lt9c4m;W%K$NhNdbAy zFz8-E6Q&(I*S)_yVY>{k&(!99QZfXA$pr6&>8B}wQ0i~u96zI`<>-f*WjXt6;N9IM z@84O`QW2?!F1IrPIR?<(FqvzcIxLW31 zt>+vBYJu`jE#QJ>n}Lyn<(o-j&VQ}nEWO?#{iH+6^v`NLp4~8JZab6Ruq?AibGLiU z%vrL9KJsF=kWC7*x%_O$Ny{U%&_grD=EDE8shxJ^&34cDQj8|aYnk2EnKM4#oYs3D z^AUN>N0TZzXLIh5Et(iY0m0g*3dOiM@*QJeJgm>K#h=`i9g3^*Hr=Z2w~zr#-K52@ zY0?1u!R;|%5f~7|ija%dGLbDs6-Bp%9?Gsn6SK?KyN8(ra+bfNLrtBl(33P{73yVG zc8{Dle*ZpYe+nBFJBP7*q#w(a{TZ4_=uoTQeRpCtP53$bU-ln=mODB^OdDlaBSY@3 zoDR)>XYix1qbhj&F0%&PzZTQs>nQddi95F|c(@&saEDCEu!6D--(Id9vMEQnLtkBu zn%wzgD|WPY-w71Z+_JQ4$ zN7;>l>~=R=RQ4z6p#o4t0~2VQbv8g*7oZ(G>|35S=f6$aO@MBnU!wM`NJ^sYYk-RH z|Jv?3ySSOMn*j|mwibei3wOlf+|hBYvW zt)LWyVZYp{QB(E}K(i&0CExmdhFqW#0m1-jP)g(}fdQ1&Ar}@3HT-dnmgH(B|sFal|%mA1^xhirWP5g zwH94qf3%U2*RuW$$`ZvuV`rT1ryD6-2WYKZUEkQqG@fRUDANqBvNJDbxR;zbir|p_ qCz^n763S9AytgHxpE4