From 7c781c92b014a890b44a00f2474da18c6013f282 Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Thu, 26 Oct 2023 15:58:08 +0200 Subject: [PATCH] Triple preview. --- bin/DMGTRIS.GBC | Bin 65536 -> 65536 bytes bin/DMGTRIS.pocket | Bin 65536 -> 65536 bytes src/include/globals.asm | 7 +++++-- src/res/sources/tiles.gbr | Bin 39009 -> 39009 bytes src/res/tiles.inc | 28 ++++++++++++++-------------- src/rng.asm | 24 ++++++++++++++++++------ src/sprites.asm | 24 ++++++++++++++++++++++-- src/state_gameplay.asm | 25 ------------------------- 8 files changed, 59 insertions(+), 49 deletions(-) diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 6466af9ff4bdd57ca2679048e8b1ad1b6adc0ceb..8ae3c76f26f5ffb01eaa115fb5dd44d525615c44 100644 GIT binary patch delta 4021 zcmZ`+4{Q`w8lUOz%>Hj#TIjT;b=IvoKr6JgP@3Jb>gi&enQ}&DIX4>2orH5w+%5Z{f1rrb^J&`B9cXz_%6Y4qz3DjWpW+o}O;9E>kF2LC+F8VGR#XO$Imt_vylH_s#Umj=ibk9IN z`;B5@?<$zLR%v4&cdCoLiG+`Rg`KbTSj8A&@3WLY*h~g|N7j1hFd8FS%YwqU+i}-6 zyn_rV9o&3&IQ9g$jz0-⁢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 diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 908be6bede57abf33c0937659e89e77ea3722bec..c17efc6da526c80957e848248200cbc8fa8f7090 100644 GIT binary patch delta 4189 zcmZ`+4{#Gz8sAN_`P;NjTiR_)>xNWZODnXrP&&zqdKesUY;{zSf9>3Pc!xTU-YH=Q znj%)kips2b96C1YVgL?r{hCEWt#WC-W{2nI8r#up_HTcYHm7hfD_@$~M2TJ{Io$lhs~^R3*>K4n*K zbVVX=b}w5f?=}fNguUNbvayj2xR0!Mk=m2J3vE8b29ld~!-aO9+#JepV&qrH;}-az8A%Q~kp4$_3mezwL=cKODQ&{Xs7 zwYu41d4sit9gw$JYxI5&T7~jKFCHYj^eFad?YwwT7+TY2J~?E)u4>SCZAxNYOz&tw zH47`rkdKZvWSyHuJ0J4lA?jCdv6Yq#sEig+zrU~CPIl^AnqOx3%wn5|d?`<5j#jW_ zIO1qfUiqN4{GlQct`#~NS6R{OC$BdJK54L!P9N^%^U0YEu#9wiA*sJDnGoU8_4j8A*X5WytdD+gWg|+tP7=4?8hsmSMVKZdNJD2fWE0m&1?vtgd<=? zYR0EfaK2>3m!v4Z3;fEiqWs{9nQ5}c!z+uzPZWiB6@}j_3YYR>FCT8>!zbp2_w!-a zLr$s9f}PHTi_XI-ALQQ%9z}f0Wo>p>MOixoafJ5+(Wd=hppBXS6N_%%Q~t?%9}5(l&#<~+{ZVec|x9>^2WXqX_s z)P4w`<`<-?)J&-pK&8znH4Y2*XDTCQK`3X;YErZWB_5B^NOJH9f%5`Vd>Yme7DT9JAvu92 z7rGZkTpuUVjz#X~i0fTV_+!Ksq5^tP1fP(nlj$V>YQE_rcma~bFG*8>HQySwgmSe5 z!448kF*)HU1NcM$56FRv``C>=$11)zvKM;}iFNF~7nA)P#RBOF-o)k_^tHYPKODdh zM>Xu#YhVS!EMB;^g3R72azo{-!S@%z1j62cogr7iZnzXuHpQf!+BT4;ATskSjqhJjC7SJ=ducB%eT2Tdjtpj1Mo?*LBSrb#tU9>CqstA3} zO{}GHfPHODv1oSFRT0j}x%BI!+1IU#DOQbOP}ZeHh+!^0OEtp!m|{ygNQ#GlT;a60 zEz;KexZGS@cD*!TX^-^UlxHH+Ys&VB(h(uYlpT@Y^UBi^a$I?iO3%uV)Qar1yr)(I zKgF7dGVSfAetO1hJ#0{F$Ma!NUoUOO6;My%^O)cZA$$%`M#+?)oX1my;Pd1HCSbl0 zh|Yon_yS!0fJ>&-DZvC=B#PdyQIo*-y?rMkXKnNaO6G6TRpX}|=)u}sD@0Nf0~y=evqz@Gu|r-2RtWB~3<17-j|24H0x zcou*?0IUKa2;)`l0K@^fLuaTjfW8Iv2U5BN^k+d|o6@sD&jx*6N_T=@oS|of{&I$% z19~~=>r?z(&}oP*crr*6uDXs&Q=qr%b{L=w7s70pVgcr)02kwO3}4}2E)JME&TKr+ z8_kB}saX{a-$mOzsw!~bp}v|Zd?U?GZJrZwgD0Z=pw?f7pcuBA+z1EM>cJR)B590`iVb3{A`zX|@| zlI0iH4CC9WM#AgV(Q6u2K=0Hmt7AJQin0(|X?;RF7DTkWMm->LbZmAR;#bbCJ zpTQG2jum`1D&=B^q#l3&a=`(&hNNiq!qvza!V~=~0g3BKoFei5WGPSuLjRV9O~$YL!13qRkd<)X%$R>39uItDFR zhW^Q*{S4Z@6g^*~|1+?p?gyxwfr}RGEcExK=nKZZrIB3HFVIIT!$MJ-^;Oa>U$q?W zd86?`Za1-fxICF1OfpI4=MrE7OgTL1LS>4jOB>V1nBhqms<*nbi9%Aqq$FH2v`o{BbeP28T8knN#21 z>5NPhdvyEW@BQ}ed;50x_JTokFleqE)c=^IwFzJAR2U(a(*BayQdDt$#<TQ2S&75zB?g0OcI4_8rMDM4I^Pkl$H=;P^Py*o);0^t zCp{FJjfL=ROlrdGj2==JPK9vZw_xD#RZJucw#EqYVlvL+tB3x%lAV%G?0s1?3Au&+ zm3?uQD;jmPy=;+u$Sm{|_Q$5uU5#YGeR_*4pHUgnT;k)e@5RAA_!%-Fw_A$XXn%)g zD{CI~lZgB|SARPdP`71sE9$qPk1c8{N}?(g4dEzy+Cns1wRNA)f6scyszLk`dW$6y z+(V-H0O?g3!3sI|hL76Gl*$SgGNh(HPHs)m(aAWUMJ8mIZDG*_NaHH|$yPf#;2SqV zSIxKA=4PYv4qGWZAa~hT=;NHQ2^A49j*tU-6i2jvUVJ1By=ga}9J1Y39r4|qlH8uq z2O3a0VFMZT(Og5eawi>p(1!=9U%4&2taLzSw1DFNp$a>BLDvlaBD-fEn;Z0{JuPyy zgC)a}g$Cu7PuMCREe7Fcp_4I{6>Wa<`{vFM8my$phkN)!aw!8`M0&h1tKh0A?|n(kij|dD5pY5OUuwg%&XijQP-a| z;jySILW5}A)^AfEEZisFT%|7s}1Tci=|OZDOWp9>>$DVATd7~z_Cs|AbTqx zWOwzyQaNH`N&iz~9lM#N;y)7?NT=~mHa|8N2+Y*XZvzzBcIAF`^ zt4p(Q4%Fd>;_u^xUvu_VRuH^KE->uOTEu)FDqTM@}U1&~% zJj-aFW@aR|FGsqY+zTT6vT^RyZ%7xz?INWUZvejr zU>g7%4S)r}2f*D1@C*Pe0BAMu`Q4WTpvp_pttKPB%Q~B`s*rUd*6mSM!EyoZuZ_XGlWXqwjPjTFVr37$d;vZx zl!MWTT{%o2y>d})uyD7+Myn#b6^r)Fj&?_O%Wu~%lBa8zuvg^;%OzlxXtqV#(@h!u zk1Y4F0b)LZzaW+q_)9ANi%REQ%N}+wORye#2XSqD*u62qTB(datcQK~U)bN@;21pz zOoA0KWh51Y`@k?hk1t@XpMxBH?tqff1Ge>5JWRQGgn)?vn+yl=dAODg$AE}OVv?n8 zk+=|K_i*a8c+GQKB=DPt-y}aIS#NFpOS+Hn2M~nUHL8G4)+<{Q%^^P|lijVkoB~&u z;5P!lVYH{tUA8e%=gIgd1C+lpk==nll*{Tnt6#2DnV}q#|HTErBce9-Ed>zo6cH) zS8cQD+-GvQ;SoANRclN0oPsZD?o-Q!)k#aA%E=F`UFUErraq}$G51NF{QBCqg1$!W z!$SD(-Y(}iE_($fpzp#-?Q_H(esa*Nw{mt+z?SHJf_vHTo|H@@D diff --git a/src/include/globals.asm b/src/include/globals.asm index 4fb88e8..2668253 100644 --- a/src/include/globals.asm +++ b/src/include/globals.asm @@ -110,10 +110,12 @@ DEF PALETTE_LIGHTER_2 EQU %01000000 DEF PALETTE_LIGHTER_3 EQU %00000000 ; Sprite base positions. -DEF NEXT_BASE_X EQU 115 +DEF NEXT_BASE_X EQU 113 DEF NEXT_BASE_Y EQU 40 -DEF HOLD_BASE_X EQU 115 +DEF HOLD_BASE_X EQU 113 DEF HOLD_BASE_Y EQU 80 +DEF QUEUE_BASE_X EQU 150 +DEF QUEUE_BASE_Y EQU 38 DEF SCORE_BASE_X EQU 112 DEF SCORE_BASE_Y EQU 115 DEF LEVEL_BASE_X EQU 120 @@ -157,6 +159,7 @@ DEF TILE_GHOST EQU 125 DEF TILE_SELECTED EQU 193 DEF TILE_UNSELECTED EQU 194 DEF TILE_BLANK EQU 1 +DEF TILE_PIECE_SMALL_0 EQU 239 ; Button mode. DEF BUTTON_MODE_NORM EQU 0 diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr index aca7510715357bfb1a372e45da5e94e704e121da..724319c3e086db0f420ff4e106b67c76f1a13bbc 100644 GIT binary patch delta 216 zcmaF3f$8A}rVR%a7@0O7R7lF6++8Lx*||_tiU|l9fB;4#Sd-TWYKXyvAvBB!l9B;& zKzd;`#1s(8z%Y4Zpo#=c0ztziHNlb~E=UrY1{$pnb`+}75Jg~vr6*5tXWx9Ix1EdW G4krMA2O7Bm delta 33 pcmaF3f$8A}rVR%a7#TMoR7lF+oS?jpaq