From c8893c806c3fdaeed06340d496ca10fdba66641b Mon Sep 17 00:00:00 2001 From: cellos51 Date: Tue, 22 Jul 2025 01:42:31 -0400 Subject: [PATCH] Added @GreenNinja2525's replacement deck icon. Added play hand and discard buttons and changed keybindings. --- graphics/background_blind_select_gfx.png | Bin 3653 -> 3848 bytes graphics/background_gfx.png | Bin 2924 -> 3561 bytes graphics/background_shop_gfx.png | Bin 3429 -> 3623 bytes include/game.h | 7 ++ source/game.c | 123 ++++++++++++++++------- source/main.c | 2 +- 6 files changed, 97 insertions(+), 35 deletions(-) diff --git a/graphics/background_blind_select_gfx.png b/graphics/background_blind_select_gfx.png index 9f5487434fbf585bd475dda4eb3cdcb8bf15b100..d7335e565486ac8bf67a80ce52450d10917a6e47 100644 GIT binary patch delta 3632 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 delta 3460 zcmY+Gc|4SB|Ho%xM&iuajuAyDB9tE4%@m@JCCZiuBT>ihNQKF5iXvGvmXMt?WoLvL z6P1#1$j}Vo*s@F`hRHJHx$F7;ey`W>{^z>y`?{|0^}4>x=lf1L@J1mmA3#Hul>?g* zSrCYL;#rGR7jH4y;~@#sy#3wZIS+^t@v#)j;*`X@yKC*G>eQ_=mut~;XU+c}R4cc5 zeh~Ez^v?Wg zI{R)oRWcAO>@5uI+M)gKHPGCtLsiHQwF7Uso zZt^cI7()>l_@e@-+@m>|;-g&gy}+-H5Fyw2#Y0EE=b|6Y@a)Su|5nUFuL&H8(65v3 zL^65!(=Plk!*tr^bUo;TXz1va)<&Le#-hK|zT|axscj_J1mSrpUsfXh)s(}?LeVBT z_;fie>-b&PgfEo;3!%*=!782Rpw~n~y`D)MywFAA%wySk-KY8+02hzp5om%sy&w=F zyLGPKnOwU^JV$cU?&RIiaR{-oI7He2#JIa|W3%YEwhx{jd%RXJD$6{Obi#Zb=Kp{BU9K>>!N~;#lC$0FgLxl4Nz&^i6dh_Y@Tpfoo(>*L?}$*1EwW(x*_YFSgfcR zdeY!6ozaqgy8(xR3Pu!5I7EB->~A|dt8>%W;0X^nlmS*S?Vy8K1D^F!-$c>ac|u7t zjGi(qXQ>nqjd6`u>gNT07k5?oM`W~%39n9#yDprwmjK^05$E>?(fbyH27X-%yzG_u z`E1wZGv@xomyQ;wZ^$MGC|X|^-Vp5{{D<)21*>tQJ#W!}xZyTs){w)CvZL^!x($1% zjRrb*yGpf+MILi9N0yNHtymRp3#lxmNE#Dj+*MXuvUyv*WxfBv4W%LIje7^x6{v_Y z_Iiw>axj05`5KXN6u4UWets?apS?Qg>N+sne&uUPs{7e4E@VgkKPjJ<))mNz47`v2 zlxUK_bp!>adPB;n$K$BR2gbNrTI=zjQ33<=zfp>lnpEeJs*bwf+>U*3f|_~iq%r8C z@ut3HM1$0PyS|l$ylC6st4|XQr=QP`T*LaxDFX81CdvbA=g&zbvY%&qs`V$e-TtjS z?g3bFwG}nC{nn#XY}MCi3P~9ampf-x?Ck8!_HqP?q4KS|<=j{FY*(D@ZwJg~(DA($<1=^5Xqiw#wfj>d?TwTGD2urt45^bp^QM57V6u3d2ny!v_|SqiBXA(JB` zZ~Y2`!JXDT25IP~U&MpiMSmK88PMA&{>&+$Zf88WE%Z9*;8qwi{_3A$o{0Nac|*#B zCqu^P^KUvDs*%pg_qkK%+nP{U{Kb~V5>GsJw$ArnP&ElwRMJpHoa(3av#_{Wn`Gkn z9kg_X=V!7R9n*3j676(i*mlyBd7bspdGq`N*BtrvmJ~CnH80ZgiL8DS5Zy3nh+zC} zCaZ6bUSe7!QHmLZStSZTUZwU@TXJ1mI!pFBj1KC1C;nl5o~u(I5@}wKINAvFBCS{jyc1$FLQa*Y07fSYq1n(t5t$Z?sTB z*E?nr3@&kRG?TXCgHQrq{VHjU+@$)=hNu6{oQDRQ@Khw>K9`=MZ$exJ=b4PMN zUdlP}jxg5%@lz6BQ}>A9WE5WyyI=}S5Uew>u>92(h8MM{k{yneKc(qyRv26 zhliD4<`%DoR#gtSgMCykm7||fK>>C)?F}g_Sx>%|rupr#x z7^c{Q?}0-o{?ZE|QM8uT)A8~=S|Z&lARuThZ*P3Fd(t`~$*cBGmRw`t{OaAU<�C z{hRxiz7vVi+`T`LeNPmmHaR+stA`7Nd-MC6>fGUk&?MPX{^zg!JZT;v@Z*_Y(ns}j$Vih;THe%wp2q<=7O@~rAt0Kx2ogap;dO~y9>u^p_st^b(f zC(ugWjZ)3n(5DidZ=|qg(yvaGR4tzw{EQ`yTN`a>w~kwbJ(owp#z_CEa@LDhSl|=w zJM`hIiu+0a5DPmE?^RdMm+=keeLtTqH}|)varZ{gY^nWewpWf-G+TkC*)Zf{&MvGj zrHX{YKC;cU9ckLi%0P0eeNCz@&GZQPLK(Z1inMkAAg1{`JJl>b>4IhuuR|aRl8}hp zZYrMJVbzH1aVS^@t@lN7{4FrV3fWR0H!mcgP*(oSgg2cPxn#CI-8aw7&W%T}g?Fmc zTx*5@7Hu>w+t|Jyj$p)exZIk?qbl8T?6tn``Z$Oc+7pPzvAu5~m_p9O>rpn@psgpb zxK*7(m^$aHk2Gt8-B5?2jItrorLorx2cj*R))!V2{w2UD>4&7I*zA(B%7pY0uaIZ8 zjOznI?!Gat&ujmke<|JNaC7tR^x3iN&2x9(()zQSO!NIU)n+o=hjx@dgtU`&1x-3h zq7QM#S-@^ER~Lw!emSr$JEx0fMrv^dmUT9;e8-zSe!H)J#)w~?9(yA{>*M_D`nvDE znYVfFkB52dybwy@fi~MV({3{$%-=G&{pF!Xf!6p|ncH!Dy*{B}?KacOS@{6NgMU!W z4${A-^i(TTLdetm;ABGBY%|uNI;^fo)-|{d$gMXxaF{L;dLYw#A6Th}S6J~vus{o8 z#`{kmR&F&FLZd~Z%lb8K{>EKo$vFdZ^Mtl)RdcB;T3^o-t0pax8~rU{sV%1SB2Bxk zW2e!O#qQr@X%S;Uu=mUz-RIBKwtMl8BTJ#I*9;X(JxEy2`=U}gQxHmS$xjQIZU_SS ze~kCn>C({D8rLTk+ z59DvOHepe*r+g+saVR!H;(DPmjm->4H+@;rYVYzb*ga=_2ad(56on&Fh|t$6+y+M` zxk`^6v6sGLdku0A*)jq@4odVu`<{X(w6hDjuGt09Abs_E$p5g6G1&Wi&)#|vD3p~! zq^KSWPEE9CO$YO|wE8I28^!HPZv@Kxq+;M9@kHk(;!ef5vkhhbN7EERi=R{p2pP;y zIe8p^{$P@_`m8#QtMf!4F_{@&P1uN}_)if`7OQZ(^~I5MR@-hzB6QcEXKw7;k9pBu zfd_oc@+J7va$(OpF=9g}XardS`#+%gf7pj9nH{k%OzluZ&YiqQHCvgV=De>CZ$FOf zhBk-Z#w)#o9zG8N0pJ&nfB^aE=g%b>gMbla^^512@x%NRr5`Pv@JSIts!Jt)o|G(A zPe0%dmp{X;p$L49=vBqsR)6n|(>A*z7d1{6^Y6T0ClceF@D!Y}c|KQD`t5DMH+D4| z_^4g{HQ~O~zQbXcKG`wwM-b%9oFXU9@*>c6PR5nu@wY zhw;SFQmI(t0^eLrCa3h7v`6lxj&W=qV8)IJ_>4WZJDKQH9C6-lAp+6G6%Zi-;`ga{ z+?+m=B?qzSNg-ioOvfIlKCVCle@)J35E~Z@YGQXbqj5xw50}9d!Ag;LL#P2Rhg9}D4~?zW#d`f~_0Y5UdYUJi~3LhVl%;p_#dY}4BsXr6_O90YvMTH0Au IpT^($547{LYXATM diff --git a/graphics/background_gfx.png b/graphics/background_gfx.png index 3517421859e326ec2673be4f66a31365c0ef12cb..31045dbb9beba94136f864ea2d79291288d10edb 100644 GIT binary patch literal 3561 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 literal 2924 zcmai0eLR!v8-GU3`;?<~7^{BebkIpso5q9^N?wkIgi%7u<|Xeh+woSNqPJ5ShE|5; zHCeIjOeZgeSO^>2k(b6Y&5q2*Z%*f&Uw`~QpYwb^_vgC4*K^<3bKm!MJ=gcTJ*e006}oJae~_zfcZ3a`>QJ%AY0srZsP> zct@XT08rOi8z6vGut{zN$2hqh0)GH&gSG-s2M$L8fLe{yL0ixGVFAbbqJD@WnClg& z9_YCFAqUB&_xXfdYCQdYbDTCTKw!cqon-s#>^qOw?Hehy%t=q?zC8I$%=a+prLG5# zSknTSgKSU^V+oZxPDKcBdIsp+LiLHAlZpjv@(aH6ozH03SyHiniEY5 z#+nRCp>tAHiR{;3%wSr+AY-m24y0nXnLz;30YwFkHFXWh)vkugop&E`B66G6CvN_M zn8C=Tea&cH@Az=pkmr)wj##eM?kd{%PvYnGp`$ z`(jF}v6)*&xh`#$7O;#c?pF(>vueL{s|G?0M!OxB?E2E!5K1qr%{&5b$^oPIvmskD zY8vP|D68<~@FePE-t@T`z245^=N@9B>myt@?ARWyZ?w7MuCBb+u$M#y1*;(|@?OsA zeisz{+K+^(Fy*2XV;U`5iKI7fw}Bp(#z02ahJ7W(%gV^%+(KAUe_KB|Yr_JuEoF$t z>zJP&kEc~mohVc+i_Oe@fjnEX@a!QpxUh>l9$JLeS#iLa-X-ixposf8(+uVu@H%Q2i!^{wd5hZCK z$*L_HWEI_M#dNgLnVu}%ES0p4Wog?X#S@LZOffWNf3ZS3P<`S zg2%JxE<|jsQxUeTeD7jTfMu?_o~%ufAyB~hC0`x|LJ+iuOF7@j8+5!Ui6mt zu$so~#Px5@81nCBKnDT}^lC8PhZw2fT1BR9 zj+80xX!iVE55<<5tsVCAwRr7t3%yL+w3-`NplOf8F1I;Pgs%Uh{!qw&JVBPF@Z zmu7N({TG(*hi&8-h91?COyh0Nou7lL|5iDlu)V9LfgT+ce_e2CS%EmLjMOXLYCQaS zS0+u6uYt1I&*(LKt=3it%FRz3zT?RLWBcCPlFl4i-+g(0XL;c=MM;BRqm@?-9gTxz zNmFC00!S5XSt$n|W#K!NcD3P&BdzYnzWax&;l?8w-J)-fkbh#b4Huo>g&B%Jgt7G^0P0DauOn7P|>jaYV zu-Q16{hR2rzsEz9PnrlwWM+yg|N zUoW+YDha}Ct8c_lJVNNCL(#J2r}L%~21AMw`D`}?NA}K}DzI-+9&2IUG2vlM-$8?9 zsorw#vfb-XKhSHFCu9pE?G-8Y?L*UrF;$Fzd%1$*#GE2ZO*5F~3_qf~sdE7QJjPwA z+gUeaw-X1wyfEnQNzB}of-P1tHoNr*QZSK##rFGgS1TCB5Ex&U6zcW9_(=*EB89PK)gy zmc1bjk||cIsJ0Rptp_oVSE5`m9Kc%euE|-xvjV6wGNrK z>zYM?a(!tLtVpUrbPyBAe=;*U`ifL3DTXv3B;2g<88#A{&s+(2pe}jjEgk_+M%cA! z?lLEb5GXG1X-3g~LUUdrH31!-*v^#4g*@6C+UBo{juGX+WN@3&|{#@At;&&D3|vwL0jhGWXB#V|R~mvtcy^UwA64s#$zy+PZ@Z zNXKz$I90RL=a8@`FBeswi+OENAK5Eq!R$}oK0n{1;TE`7D{q<0^XH7ym;5)b-tEbQ^~`1N@5>D9-K3?>?GUo*>-8tKnYAqsDyHLb1>P@JIfK;PbbxB{ zpQC$Pk>l#1_T7v<`Bm2s^vr?}GxJNstRgDx#}$(&yBnUGOd_qq49Bx5ubfG#eDkSL zhn{7%}#Mm*)tER zeamKBEnS)_)H*IO?yL_HO!xO5W1oAWg`O7Mg-}l6iqRnSh&417`MGL6jyd$vGD$%^ zqbO$*ru_e7eoc_|@vCvdX?O3m58IPGlr#;kE2Oo#4VcWvD>%>9NSiATu5c*lc|D3F zY+WH*c)l4bjG&v~Rkm2sKBpR)B)at>uqFC;2l0oCvr@Q~OnKdr$GCNRa^lqZ%^ug4 z^TP{~BBQRG{GYeC4yrs*!%xb()SGHS;ePKlAE`H$Q;YVwkP;3MpykXs+zaKsF#!-t z6Qa)*o)^bQs^GJ9kw#@cE)a!+Xr*I(I5iLL!itX(eVVP%+`C)6V<8VUXpU-+HudBT z7Ukr^Pmx+`S#4eVjg^+9ULROymWML3(LhS=$+2-LawVZ7Mrpy@cY;Y9xzCEuxD(6I z!{hUWMun8CsO%Xlv-jFuQwhB{`mvKNXo^^J8ibBCL_}RXn|#aiL(Fv%!%faA`*Ts> zKF)Y!3DHpU;)b@w4&aBEsA75{xb*ud6r>>D5V4<(Ul~ZidYd!y1YB14VyR`C-1loJ z)+;O{YmxXBRofDX6(>+4=eU?z`8k-zb8T;iroV{=U+i}HZkDrrPds}mDIlXHML`!y z--;XS%kXV;6RBAlBL9C9?z$GJMAkUohd)^}r5em`X57$?uk+~MQ20XxIryi3bB%=TfsCNk1c z&yDz3H=&LFs>=wCAh^;S-8+Kq*AH|)v7O1!=eJ^eLl$~DtPRO36gdt|opll(@D@5Tnwi(7YHMW$b znn5$h*pqF>APh0&)BAnj^bDndZ>%Q;jJohsvQ6=^GIpR2n)@h>3pf3Qx z7i?;D)h>p{oUja#T9EGhaUda0(Gtfo@VTE!g?Iak1%-BiM7t)0vchcwy~lQyKDUYx5u9A_ALTjsR`E zIAwwQNT8q>04xse0&uAUK)gr*2Ur{cgy(Z&0w{6UA z5%b6X#H$_lA8;mE`~~0djKk#L8UMQ}Z=6>oj}GET{QqkY4~bN^VvH_!7O5c+ryGjd z93tKwdS+gLh;ZdZ$)e0p2mmU{q}t8TT)zb*6&W+|I!`S3y`LeCxp0v8a~Ih$*2QWT z6%sljT}0B|l8})uG6~WA_KI-16A(c|B$MpZ zu(VuJzjPm9z=J6bTJx$tXVYwJnXEKAN_2+9yQ<d*56u&+O7@Rilpev}Vj+UVxp4-&hPF2{^aJSA-I6bB+FcuN7qaTVU9ddlg@FEv# z1mkJ7k)353sk1W2T8x6~`*GB!oXZmae7ovJT>KV>qn#fk0ci-|lnkHP3%w#V!MKa| z<_L7a2pmg)7sdGg#)2|`vcUl@Z5mPAsSbB}B$jPnLxy1jp?r{7ZpRxIh7#MmiC-Pc z-fH)HH!im!Mg)B8|F5jO!J40ZDozh%#qI0oUM~4CI8J?RQz6`+GC59N)H*G>y$iI} zSgplP#opB>-I~O|hJ_u3my_-yU%r7=tbBt|At0+r5arLsU#cPspPWZ6z>-K1S2~XCBPE+DSLe#k~ zBq_qlP+1*c-IYbToFw==O-iYV&H70(g+>=Nt*=_4+4@lMP!7g14}>1E`M?^PNJW$I zHk924$*M16zM>NPfNn~Dmlf?ch_}}T6~)syXetF3Piy6=OR;f8Z8h<7a@?oun^a(J zT}SFf2F{pyK{H^H4aH6)V)6I9{{(T|v@atgwOBUWf1)bE5E~_m;+@`1#XC?O3`e6h zr!cecF+EF}Ge!uv9QjbU9F9cCvN&ch4_Zv?qoQ|j=21@Q6V)q6$jr;75Gp1SP(#8C zf2{^@HD!2!cwh9vaHf*&1-H&Fq9Enx3pswCkOM+`xX=90unupwQog!5hd|k@fi15lrtbHAE@Qn=dW@FPL`CMne-pud6 zRBb^i`!!ybwYR$Gb*5CUb{75pb2aiESeS zn(a|@jcI!>!qIVqn72O4V~R$<71xL*KmK^bx!%29X{5e)LqbzbVzGO#g82RC!{}Q+ ziqApQ#8Qv5f?iOsI)@ss3Hg{`L;humx@2K-t_!`UaOLMm`Cf?wAzZ3RBZ%gww@Uxf zzrr{46MT)qdqM(~49r?T4AK|g{S#RAq*!8*x?{ha3G(k6(wbkfLu#bikh48lGi9yC z>dVH}S36hU#Jnk<7ZjP+eS5{ZX!flMme#*xm--CADd=IvWs0a;Uuit7SsQ6@E$psQ z%+AU`jp^`ztiF220ZEtrd>!90m`%LLyOEr+hl|eyxfN*_r>m%?8D3>&`(68W=iIt< zil}!_@Og7b`H7tEwRtAtq`&>5jz&V!lEC!f%oM6qctUzn$wTA*%EngS2X!rMc{yZQ z#){>Er6UkXz!_E2mavOh_=_nR4&8w`MGlME9P8_kk;A)MfNnnR3W^~rOEGx+4E(um z+R#tV9xd&=f^fS6bth93(oNm-3%%rVu+4PnXPI`|i7feINq6?MMj@FU`#!H%8;UcW zcbrizoPptimqo+Ymo^jY*ZOQM)tT`QRaI)&Um$=9LLQ9922+hToRW2wz=w8}k9$Sb zDYAca>S$fl$G}*F3@FI04S$yDld9F@+PQ9?GZV<%e5sev+4L8iC7aP#c%B%n#b~}R z<56==;l7EPq|@z!P|kpOQ?|drGZr=A`O-RXWqQ8LH*`hANSQppvRnpivxTKFQdNUs zBVNVDHsdInP4f*7*Nl9Ff%j9vPoX*nW2S49wmkc|T>8N-0B|%U}U=&aHTlT=k1oUfs6?3sMl^mgFL{4?IpH`CQZn_HI+#>EwUOnHwx7KaJ zOT&5%7xmIu$x8OHi$5m|Ka6mL#tVX)@e}jQ=oWr!^L@rrfwbxQisi#6*2^K>r(#dX zT_SH08l)G|39Io;{q2i$b8@O6)HuXR=R{949t|Fpi6U>1l%v7JlX8`=*`i;wU>)}Y zOyxhVJxX(PVZ(-0R(q+|)Ff_<9=%_1w(9sTR#GHOmyr}CTP3rFEqLmnS~XcHbon4* z#Og(G>hui-M^9Voj85F_9mFfo$%^I%t_#4GPTJp$c#8BFtQjSByP#EoUF$&|wa=v` zFHt6$XY(&r?01ij*#%!k#s#wBEU@dwBDxzdvp@(txb7QY{Sw^Ln$Da}O^u?zeZ2WS1Pe3}d?O{R=I*uiD`GC(J*rXxOCoJw z!ltA~X+auY>Lg0-%C^KAlH5e4Y^1pH- zZ54AE>Z(A1%_Ic!I9FIRm%ZTEH8>=Bhp^M|VI+{8CQ-z9ZuR`eHSvHD^+wrg_wD-r zym-CO@5Jzo$!2{T#n?QomsUa?N_nWuu}5#>T%Q7{FRR6{Mw4%VjvO{r{-C!IL4GYP z0EFO$M%XWEM?N~nbF$(hq4k3kGMPV2SRg`8U2-UtGn(tPd1}PhRlR{#&F$4Y%zG1Y#|b!s5RTX>DZ!PY|7Yih=o>!0bW(7|5wvD?w u&n25IMH?e?9`XV0%KkSh{AcJW{Gk&WmOGRNza9lRT&CBojOq=%lKusV-+ABw delta 3238 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 J%S>?h{|y_UC|&>n diff --git a/include/game.h b/include/game.h index e830ecd..5e96206 100644 --- a/include/game.h +++ b/include/game.h @@ -15,6 +15,13 @@ #define BG_ID_SHOP 4 #define BG_ID_BLIND_SELECT 5 +// Input bindings +#define SELECT_CARD KEY_A +#define DESELECT_CARDS KEY_B +#define PEEK_DECK KEY_L // Not implemented +#define SORT_HAND KEY_R +#define PAUSE_GAME KEY_START // Not implemented + enum GameState { GAME_PLAYING, diff --git a/source/game.c b/source/game.c index c9c3288..67956d8 100644 --- a/source/game.c +++ b/source/game.c @@ -27,7 +27,7 @@ static uint timer = 0; // This might already exist in libtonc but idk so i'm jus static int game_speed = 1; static int background = 0; -static enum GameState game_state = GAME_SHOP; // The current game state, this is used to determine what the game is doing at any given time +static enum GameState game_state = GAME_BLIND_SELECT; // The current game state, this is used to determine what the game is doing at any given time static enum HandState hand_state = HAND_DRAW; static enum PlayState play_state = PLAY_PLAYING; @@ -64,6 +64,7 @@ static int cards_drawn = 0; static int hand_selections = 0; static int card_focused = 0; +static int selection_y = 0; static bool sort_by_suit = false; @@ -150,7 +151,7 @@ static const Rect POP_MENU_ANIM_RECT = {9, 7, 24, 31 }; static const Rect SINGLE_BLIND_SELECT_RECT = { 9, 7, 13, 32 }; -static const Rect HAND_BG_RECT_SELECTING = {9, 11, 24, 18 }; +static const Rect HAND_BG_RECT_SELECTING = {9, 11, 24, 17 }; // TODO: Currently unused, remove? //static const Rect HAND_BG_RECT_PLAYING = {9, 14, 24, 18 }; @@ -422,12 +423,10 @@ void change_background(int id) { if (background == BG_ID_CARD_PLAYING) { - for (int i = 0; i <= 2; i++) - { - main_bg_se_move_rect_1_tile_vert(HAND_BG_RECT_SELECTING, SE_UP); - } - + int offset = 12; + memcpy16(&se_mem[MAIN_BG_SBB][SE_ROW_LEN * offset], &background_gfxMap[SE_ROW_LEN * offset], SE_ROW_LEN * 8); tte_erase_rect_wrapper(HAND_SIZE_RECT_PLAYING); + REG_WIN0V = (REG_WIN0V << 8) | 0x80; } else { @@ -452,9 +451,13 @@ void change_background(int id) bg_copy_current_item_to_top_left_panel(); // This would change the palette of the background to match the blind, but the backgroun doesn't use the blind token's exact colors so a different approach is required - memset16(&pal_bg_mem[17], blind_get_color(current_blind, BLIND_BACKGROUND_MAIN_COLOR_INDEX), 1); - memset16(&pal_bg_mem[16], blind_get_color(current_blind, BLIND_BACKGROUND_SECONDARY_COLOR_INDEX), 1); - memset16(&pal_bg_mem[5], blind_get_color(current_blind, BLIND_BACKGROUND_SHADOW_COLOR_INDEX), 1); + memset16(&pal_bg_mem[19], blind_get_color(current_blind, BLIND_BACKGROUND_MAIN_COLOR_INDEX), 1); + memset16(&pal_bg_mem[5], blind_get_color(current_blind, BLIND_BACKGROUND_SECONDARY_COLOR_INDEX), 1); + memset16(&pal_bg_mem[2], blind_get_color(current_blind, BLIND_BACKGROUND_SHADOW_COLOR_INDEX), 1); + + // Copy the Play Hand and Discard button colors to their selection highlights + memcpy16(&pal_bg_mem[1], &pal_bg_mem[7], 1); + memcpy16(&pal_bg_mem[9], &pal_bg_mem[12], 1); } } else if (id == BG_ID_CARD_PLAYING) @@ -465,6 +468,8 @@ void change_background(int id) background = BG_ID_CARD_PLAYING; } + REG_WIN0V = (REG_WIN0V << 8) | 0xA0; + for (int i = 0; i <= 2; i++) { main_bg_se_move_rect_1_tile_vert(HAND_BG_RECT_SELECTING, SE_DOWN); @@ -849,6 +854,7 @@ bool hand_discard() if (hand_state != HAND_SELECT || hand_selections == 0) return false; hand_state = HAND_DISCARD; card_focused = 0; + selection_y = 0; return true; } @@ -857,6 +863,7 @@ bool hand_play() if (hand_state != HAND_SELECT || hand_selections == 0) return false; hand_state = HAND_PLAY; card_focused = 0; + selection_y = 0; return true; } @@ -1007,36 +1014,85 @@ static void game_playing_process_input_and_state() { if (key_hit(KEY_LEFT)) { - hand_set_focus(card_focused + 1); // The reason why this adds 1 is because the hand is drawn from right to left. There is no particular reason for this, it's just how I did it. + if (selection_y == 0) + { + hand_set_focus(card_focused + 1); // The reason why this adds 1 is because the hand is drawn from right to left. There is no particular reason for this, it's just how I did it. + } + else + { + card_focused = -2; // Play button + } } else if (key_hit(KEY_RIGHT)) { - hand_set_focus(card_focused - 1); + if (selection_y == 0) + { + hand_set_focus(card_focused - 1); + } + else + { + card_focused = -3; // Discard button + } + } + else if (key_hit(KEY_UP) && selection_y != 0) + { + selection_y = 0; + card_focused = 0; + } + else if (key_hit(KEY_DOWN) && selection_y != 1) + { + selection_y = 1; + + if (card_focused > hand_top / 2) + { + card_focused = -2; // Play button + } + else + { + card_focused = -3; // Discard button + } } - if (key_hit(KEY_A)) + if (card_focused == -2) // Play button logic + { + memset16(&pal_bg_mem[1], 0xFFFF, 1); + memcpy16(&pal_bg_mem[9], &pal_bg_mem[12], 1); + + if (key_hit(SELECT_CARD) && hands > 0 && hand_play() && card_focused == -2) + { + hands--; + tte_printf("#{P:%d,%d; cx:0xD000}%d", HANDS_TEXT_RECT.left, HANDS_TEXT_RECT.top, hands); + } + } + else if (card_focused == -3) // Discard button logic + { + memcpy16(&pal_bg_mem[1], &pal_bg_mem[7], 1); + memset16(&pal_bg_mem[9], 0xFFFF, 1); + + if (key_hit(SELECT_CARD) && discards > 0 && hand_discard() && card_focused == -3) + { + set_hand(); + discards--; + tte_printf("#{P:%d,%d; cx:0xE000}%d", DISCARDS_TEXT_RECT.left, DISCARDS_TEXT_RECT.top, discards); + } + } + + if (card_focused >= 0) + { + memcpy16(&pal_bg_mem[1], &pal_bg_mem[7], 1); // Play button highlight color + memcpy16(&pal_bg_mem[9], &pal_bg_mem[12], 1); // Discard button highlight color + } + + if (key_hit(SELECT_CARD)) { hand_select(); set_hand(); } - if (key_hit(KEY_B)) + if (key_hit(SORT_HAND)) { hand_change_sort(); } - - if (key_hit(KEY_SELECT) && discards > 0 && hand_discard()) - { - set_hand(); - discards--; - tte_printf("#{P:%d,%d; cx:0xE000}%d", DISCARDS_TEXT_RECT.left, DISCARDS_TEXT_RECT.top, discards); - } - - if (key_hit(KEY_START) && hands > 0 && hand_play()) - { - hands--; - tte_printf("#{P:%d,%d; cx:0xD000}%d", HANDS_TEXT_RECT.left, HANDS_TEXT_RECT.top, hands); - } } else if (play_state == PLAY_ENDING) { @@ -1938,7 +1994,7 @@ void game_round_end() } else if (timer > FRAMES(20)) { - memset16(&pal_bg_mem[17], 0x1483, 1); + memset16(&pal_bg_mem[19], 0x1483, 1); state = 6; timer = 0; } @@ -2027,7 +2083,7 @@ void game_round_end() tte_printf("#{P:%d, %d; cx:0xF000}Cash Out: $%d", CASHOUT_RECT.left, CASHOUT_RECT.top, hands + blind_get_reward(current_blind)); // Print the cash out amount } - else if (timer > FRAMES(40) && key_hit(KEY_A)) // Wait until the player presses A to cash out + else if (timer > FRAMES(40) && key_hit(SELECT_CARD)) // Wait until the player presses A to cash out { game_round_end_cashout(); @@ -2204,10 +2260,9 @@ void game_shop() // Shop selection logic if (selection_x == 0 && top_row) { - memset16(&pal_bg_mem[5], 0xFFFF, 1); - if (key_hit(KEY_A)) + if (key_hit(SELECT_CARD)) { // Go to next blind selection game state state = 2; // Go to the outro sequence state @@ -2225,7 +2280,7 @@ void game_shop() { memset16(&pal_bg_mem[7], 0xFFFF, 1); - if (key_hit(KEY_A) && money >= reroll_cost) + if (key_hit(SELECT_CARD) && money >= reroll_cost) { money -= reroll_cost; set_money(money); // Update the money display @@ -2245,7 +2300,7 @@ void game_shop() { shop_jokers[i]->ty = int2fx(61); - if (key_hit(KEY_A) && jokers_top < MAX_JOKERS_HELD_SIZE - 1 && money >= shop_jokers[i]->joker->value) + if (key_hit(SELECT_CARD) && jokers_top < MAX_JOKERS_HELD_SIZE - 1 && money >= shop_jokers[i]->joker->value) { joker_push(shop_jokers[i]); money -= shop_jokers[i]->joker->value; // Deduct the money spent on the joker @@ -2370,7 +2425,7 @@ void game_blind_select() { top_row = false; } - else if (key_hit(KEY_A)) + else if (key_hit(SELECT_CARD)) { if (top_row) // Blind selected { diff --git a/source/main.c b/source/main.c index 1cb00e2..bd7b046 100644 --- a/source/main.c +++ b/source/main.c @@ -71,7 +71,7 @@ void init() int win1_left = 72; int win1_top = 44; int win1_right = 200; - int win1_bottom = 160; + int win1_bottom = 128; int win2_left = 72; int win2_top = 0;