From a73848cfe44f0402eb1bcfa48c4a91ab56e16531 Mon Sep 17 00:00:00 2001 From: antoniovillena <_@antoniovillena.es> Date: Mon, 26 Apr 2021 18:41:25 +0200 Subject: [PATCH] bug cazado --- firmware/FIRMWARE.ZX2 | Bin 16384 -> 16384 bytes firmware/FIRMWARE.ZXD | Bin 16384 -> 16384 bytes firmware/firmware.asm | 23 ++++++++++++----------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/firmware/FIRMWARE.ZX2 b/firmware/FIRMWARE.ZX2 index 21958f8de67964355c3867b080da07539231aaaa..052f45225b963f93d7f92d5ea38172a94c5fd181 100644 GIT binary patch delta 1854 zcmY*Ze@s(X6z**c?Q1FYwU55X56gQ%t45wDM z)`$lCoLAOt$u``UY}tsiVdj>_Ow)-Lyb3OK*6rCe3;Z$H>5Q8UE$qHlr~Y&AJ@?#u zzH`t0zSGeGIy!)UcHbAg64X45?^ecJ|K?i0(ysw&%~mAOfz7}|x@g98>Zd8L!fbjI z@1d3OQ}E)v3FZ`|E^Tf`Ze}P>%GyW8SY|=I&u~6^o4Dt6^$acKzR9(zxk#QPjr$B!Ah^zpv>)Uwg%_N{nqSbSy4 zCBGzb)^VEz2J|jGnzpbm@Jyr-3eb-ugch)w*nAR2ay||d`fTt-?*eugDu(*>g*e~m z)8~R>cp&{K9!;t?>FrgV9GDEq1p_LF%FQerildY8ifSEA!e7*LirSdStZPEi&;IGe}?0oX*;fnn$; zxJEZKMur9SEyWQEQkAy{r(r4O-FWIwl*zda1qm2z0JS_Cjf!JYF_tK0??TdV>;y{jxt&TfzQ1y}XgX8Z|2 zTYq`xhoB%p@9#R)H9d{X9?o>!neWMZ#Lja!oLW>3|H!IQwlU}~EYb5h(gJ6<{!q|D zkT0}z7Y~7KS-cN>-_}>`FQ@RMYe`ux8t2u#IdL4tzhtkX8I&4-Wug>y=<&}CCSs_Z z8i^$ROfO%HuS8HAV~k+u?`Rc+&nH2eBoHfQQX@$Px4Kd)0LrWc=jy?)|1N)KXOQ~c_bIfZ^Hg816>uMp8%## zq%b9Er9ea0{N!8po%pSoanV#38w|5qOa|vgp+TR9>UtTSUJ=~M;GwP;?PP-6<+yX4 zGMLQ6)ReAD&g-@o;$Od0UeL04K(&!~TY)Km4D;wW!=m|a27PCA++(!pM`I>SNXCR% zDI>&6&>_B|aE=HYO)MsWJlEae1cGW-ZO`5+urFp+qEWcXXag#E*vLBOtn3YmugSz$ zfoK=)kCtOtNU?++oi<|Dh2@FvkjSm>M3~Vk__MK6{a9Qun<@k&u!?HL4f>c#AuiS{ ztYkK(EmFYa)LY;=Xv$vah*5>t1fJ`@;7*tAOOklSdV9R@JVS-etg3V}Mg?zD3osO$ zewL+!G5B%zN98U$zIIT+oxpin@O8IrHUsAcAsLy$n_*p*-8L)Uh||krvn-QyVXJA0 z)kViH>q>cWP zoCle>;TGH8*FV*8=`sSj`bTWH4E;aUj3~(ZoPG9ly^%3De_b810#pxAEZq1X>KgHx delta 1825 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 delta 1912 zcmZWpeQZ-z6z^@jwXa><_xifNx2^8eMe2oDvw0 zjY(@5X7nLf693W~OiW-2)0u$c$H>B@Y!_rob;`48%!t8M`~X3)%=20nApUdjx%b?A z&hMW4`<AKkTA-xvqS9!=Kyajm}H^+A$`{s_wRytoL zmv}MRzgb^tsavBB+#LYbLPcLd> zfxIa_n)^I>l|gp$65dj@cuD&Mk&>jHn~soNBv@g2FN*4%4wL-g?BV`JLOVe?TeKMP z`imb%2tQMN0LH(Hx2tcj7q!S~CvLpW5H!^CO`}=Ti;o(Xp=0ertRkN7On=n@*>d$+VKm`Gp(lG%C@H zQ&r@ILo{-X(I72=hki#r3G4`%I8Va+2ark;HL}>b&s!Qe8CsG!E?7t}D^;BBo@r-~ z3;#ehT1`!;7k_FJP#phgs({MeFxA+vbL2U-ID1KxV`#OC1qaLv(N5fIZVfA3C@H7( z^?#Fb9tj$%0A3N_>_a9hEg3{}vHH7!*la8S41Fz+q}n_(oNf=Kn7JL?v#T_l4cIyX+kLfin{pCv6S-W}b{;BQ2Gw2B6!pZ&*t) zPjrZ1?L(!S>;QN-(ermx4tR7UqiH0UC8JcCdy8B>Dx4=bSR;I8&QCVb@H1y~8A3TO zOyvFL{Zb=bnIO$PI|0rsB*?@0e3Hl1Bp!#;NK_U4+E-8k(%W+4iUiPpY=0{HQ}l8) zPyMUWo6(KAs5VB$Xiz||%ND$1HNz=B=8B00O{o0MAAUamLVR<)J-$8O8Sja|UQp2k zlDZt_3rE++p9Xh9GHuN4-R<|KO@?V2WTB=mWS*Kz()I^-R4hrl1oozJBx%!KDXAVO z*#Ae9q*d|V15~)9VycEq;3}X>dR+O^(7jL^AZWS(v%x-hHE<{Nl^mvv$Rqu{h1Ly+ zc^Dq)Ct-fLRZD&Wl3InGljyslmtz>Db2G;yOr>bq&h+&fy z@gS#b5_mXdU%IfCCzuUh z))}XjiLbNO=qTnLE1|g`bn294w9dnn0_TZ>w>e%zHvG3^eek5CdR&&oL#HFfny$P8 zR&VfS2Tt*hRHb0>-#Y0SKH*pdsf6Os1#b8x-c$PS95sZlz7d4Pref-?4bt zDB{ofOJ^AE!3OTYGB?-hdUo>lHjjxx7RdnNGwb~x>f&U+??9)D7MH9_E8<7dbiUa@ zF-_)3ICH_bYow@U#*B&X2`J?yPJ$j*!Mo8oZsg~qA-s)$3_XEQ@ej>(l?88Hd_1^! z%vCnZjMC~H{IkScv2ph3{Gi3DZX7n3*`QgMc;BY)Yt~$VBJRPDy=HdsvxaYVj8N9) V8|t5!j7Z-bCp?G<_`SuO{sW9o52gSB diff --git a/firmware/firmware.asm b/firmware/firmware.asm index 7154214..d9db778 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -3180,30 +3180,31 @@ calbi3 add hl, de ld (alto highb+1), a ret ELSE - ld a, b +calbi1 ld a, b IF version=2 cp 35 - jr z, calbi1 - jr c, calbi2 -calbi1 sub 34 -calbi2 ld b, a + jr z, calbi2 + jr c, calbi3 +calbi2 sub 34 +calbi3 ld b, a sbc a, a inc a ld hl, $0240 ld de, $0740 ELSE cp 21 - jr z, calbi1 - jr c, calbi2 -calbi1 sub 19 -calbi2 ld b, a + jr z, calbi2 + jr c, calbi3 +calbi2 sub 19 +calbi3 ld b, a sbc a, a inc a ld hl, $fec0 ld de, $0c40 ENDIF -calbi3 add hl, de - djnz calbi3 +calbi4 add hl, de + djnz calbi4 + ld (alto highb+1), a ret ENDIF ENDIF