From 1babcd65bb5ba0a339151713c81046fb111ed109 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Mon, 9 May 2022 18:00:11 -0700 Subject: [PATCH] Added picture cards and improved the code quality --- assets/images/cards_tiles.png | Bin 4349 -> 4367 bytes assets/images/cards_tiles.pxo | Bin 5191 -> 5227 bytes src/main.c | 9 +- src/sprites/cards/spritecardsclubs.c | 125 ++++++++ src/sprites/cards/spritecardsclubs.h | 41 +++ src/sprites/cards/spritecardscommon.h | 164 ++++++++++ src/sprites/cards/spritecardsdiamonds.c | 125 ++++++++ src/sprites/cards/spritecardsdiamonds.h | 41 +++ src/sprites/cards/spritecardshearts.c | 126 ++++++++ src/sprites/cards/spritecardshearts.h | 41 +++ src/sprites/cards/spritecardsspades.c | 125 ++++++++ src/sprites/cards/spritecardsspades.h | 41 +++ src/sprites/spritecards.c | 387 +----------------------- src/sprites/spritecards.h | 178 +---------- 14 files changed, 849 insertions(+), 554 deletions(-) create mode 100644 src/sprites/cards/spritecardsclubs.c create mode 100644 src/sprites/cards/spritecardsclubs.h create mode 100644 src/sprites/cards/spritecardscommon.h create mode 100644 src/sprites/cards/spritecardsdiamonds.c create mode 100644 src/sprites/cards/spritecardsdiamonds.h create mode 100644 src/sprites/cards/spritecardshearts.c create mode 100644 src/sprites/cards/spritecardshearts.h create mode 100644 src/sprites/cards/spritecardsspades.c create mode 100644 src/sprites/cards/spritecardsspades.h diff --git a/assets/images/cards_tiles.png b/assets/images/cards_tiles.png index eec49ae73ee6244236ac800f42281b6c518a4d4a..baacfb269176ffbd0a27b0c1a33ef81caeb96a8c 100644 GIT binary patch delta 4358 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 diff --git a/assets/images/cards_tiles.pxo b/assets/images/cards_tiles.pxo index 85b7d2cbbf54326d9f0e48c266ff2244246aebcc..59fa66e15d95405ec9a3f6e2f4e66345dfb9fe51 100644 GIT binary patch delta 883 zcmV-(1C0E~DC;PYBn6-W006$RDX<2AwG05*Fk&$Oo4gM&VlWRl4=-Xbd66CuI1m4u zybu3@EvWG;bFl?RImoaZ5+EZ4sf3_QgkE?gqEJFg6c!|{0T2h`@uyDK1OC`QI`FRi za45{zo3Cx`i86)x-2;8JS1+kiFLl)UGVz}7?4bVS8xuh zAHMj>&Ht1&ps_!3es$OlgUidq8p-$Rw+~vN`0$T|88GS{9>AK%w$KlAKmX+iIB|>9 zO>{s%CacN3(*gX)S8wLD`;)U(qv_;1@QbD>_@FCo-uv+BvfsEu(TTp?gJ&0`sr`XJ zdhz=Fe=OpIvc@p6<;}+j2mNz@PY*e=mY>=&I@^S3>w1|OSifnJ11=u&b)LrV!~}!e zg8(_;uy+q^^p(8YamjO!r4i!3aNr%cp8gp0V*k?^zjrss(xAL_`#iKGlm+hh+Wl!1 zKmLo;p6#eB4zk1kO)#pfMb@7;#5d7b`~U%;;Ab2FY56Da`sWS9n>p5hO(VB*Kf59WD77#BU;q!L4FJG-kskkfkskjKI1m4uyf9)gFJdp7 zybu3@HK_3``x%i1h9O2J>k@zyAOz4vs0xon6iO(eL=s3qGU*A<3+3R0Isu=L7h$nhA{;oOnF?(&-jD~MI8?N$ivL2AGhBgOe=MRa@rfU zLFlGt(>?p2vt#T}R+Dfn{7&TMJ;V1Ua}jUmCMOSjL8AkQIVYHCuI=0f1BKfyMX!Q%epO@J0CKm6m!1E8hGhkC=KzPb$*dVge!r#=gNlO52Hake5Fc>uon z>hv@1!g+1rC_7^geD(>rJ^&@{n-{+2_RIVKoZzKDe5c+d+E20}dZAnXF+Lw?mReK$ zWqy2+$3Ajspkr+L=^f5ld>iL~dYc&7zj;w>&b&?+-@C8F0XMtCUm9_8Ij8QpeG4Yn+>u-G%RiX>#>r_P_t#>7PI`St;5}eX z23DoM{i-OnFa2Nu5A_THpm~uV|9O!f{|`71|C_upVlXdaFM%JZ@hkfofdz&kCS}zD z5`YsR1jt0l3L=Rplu$y6B#?k+8Uq==C!42k_A~tM<-GjSSO?Rm4(CQz*~l-X%^WTV z^3{LtyC1R|Up?oKcFqQWm*I?85Dj_DyHPs;bM@5!&sBXn*uf8T`zJb;F}_=?tMz9{ z3)8^QX^MlUqyOVi<#qJv2N!j0>(jvC?)&rgh_Ezrj#r*17R%Qh;A{VdZXg{~!+-x4 z_(7Ss${J|rZGwt%4>dT)^igR#f@@>NbaK}9(mCYKK4o9+roNSb&VW zJ-~Ag`r`5BzUJq?`zqb&Pko;e+}VS$e4$r7Luse?t<_jBk_~U*H~H6+x%YpT)Hc%f zA)na{1ANc#2;8|0W*Xa-%goU8vyq35egMAof6FkpLy+`0h&RnY{(%?m+oW%Q@6*RH z_O@0$+vN)lcL#Dg=;srz``w5qH$D^xb&^dECJ*6