From d74492b591bee7f8d8f1ff8be78b065c2e67dda3 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Tue, 25 May 2021 10:57:06 +0700 Subject: [PATCH] Returning Alcremie back to monkey --- graphics/pokemon/alcremie/back.png | Bin 0 -> 689 bytes graphics/pokemon/alcremie/berry/back.png | Bin 651 -> 0 bytes .../pokemon/alcremie/berry/caramel_swirl.pal | 19 --- graphics/pokemon/alcremie/berry/front.png | Bin 717 -> 0 bytes .../pokemon/alcremie/berry/lemon_cream.pal | 19 --- .../pokemon/alcremie/berry/matcha_cream.pal | 19 --- .../pokemon/alcremie/berry/mint_cream.pal | 19 --- .../pokemon/alcremie/berry/rainbow_swirl.pal | 19 --- .../pokemon/alcremie/berry/ruby_cream.pal | 19 --- .../pokemon/alcremie/berry/ruby_swirl.pal | 19 --- .../pokemon/alcremie/berry/salted_cream.pal | 19 --- graphics/pokemon/alcremie/berry/vanilla.pal | 19 --- .../pokemon/alcremie/caramel_swirl/back.png | Bin 0 -> 688 bytes .../pokemon/alcremie/caramel_swirl/front.png | Bin 0 -> 805 bytes .../normal.pal} | 20 +-- .../pokemon/alcremie/caramel_swirl/shiny.pal | 19 +++ graphics/pokemon/alcremie/clover/back.png | Bin 655 -> 0 bytes .../pokemon/alcremie/clover/caramel_swirl.pal | 19 --- graphics/pokemon/alcremie/clover/front.png | Bin 724 -> 0 bytes .../pokemon/alcremie/clover/lemon_cream.pal | 19 --- .../pokemon/alcremie/clover/matcha_cream.pal | 19 --- .../pokemon/alcremie/clover/mint_cream.pal | 19 --- .../pokemon/alcremie/clover/rainbow_swirl.pal | 19 --- .../pokemon/alcremie/clover/ruby_cream.pal | 19 --- .../pokemon/alcremie/clover/ruby_swirl.pal | 19 --- .../pokemon/alcremie/clover/salted_cream.pal | 19 --- graphics/pokemon/alcremie/clover/vanilla.pal | 19 --- graphics/pokemon/alcremie/flower/back.png | Bin 652 -> 0 bytes .../pokemon/alcremie/flower/caramel_swirl.pal | 19 --- graphics/pokemon/alcremie/flower/front.png | Bin 721 -> 0 bytes .../pokemon/alcremie/flower/lemon_cream.pal | 19 --- .../pokemon/alcremie/flower/matcha_cream.pal | 19 --- .../pokemon/alcremie/flower/mint_cream.pal | 19 --- .../pokemon/alcremie/flower/rainbow_swirl.pal | 19 --- .../pokemon/alcremie/flower/ruby_cream.pal | 19 --- .../pokemon/alcremie/flower/ruby_swirl.pal | 19 --- .../pokemon/alcremie/flower/salted_cream.pal | 19 --- graphics/pokemon/alcremie/flower/vanilla.pal | 19 --- graphics/pokemon/alcremie/front.png | Bin 0 -> 745 bytes .../pokemon/alcremie/lemon_cream/back.png | Bin 0 -> 688 bytes .../pokemon/alcremie/lemon_cream/front.png | Bin 0 -> 805 bytes .../normal.pal} | 20 +-- .../pokemon/alcremie/lemon_cream/shiny.pal | 19 +++ graphics/pokemon/alcremie/love/back.png | Bin 651 -> 0 bytes .../pokemon/alcremie/love/caramel_swirl.pal | 19 --- graphics/pokemon/alcremie/love/front.png | Bin 723 -> 0 bytes .../pokemon/alcremie/love/lemon_cream.pal | 19 --- .../pokemon/alcremie/love/matcha_cream.pal | 19 --- graphics/pokemon/alcremie/love/mint_cream.pal | 19 --- .../pokemon/alcremie/love/rainbow_swirl.pal | 19 --- graphics/pokemon/alcremie/love/ruby_cream.pal | 19 --- graphics/pokemon/alcremie/love/ruby_swirl.pal | 19 --- .../pokemon/alcremie/love/salted_cream.pal | 19 --- graphics/pokemon/alcremie/love/shiny.pal | 19 --- graphics/pokemon/alcremie/love/vanilla.pal | 19 --- .../pokemon/alcremie/matcha_cream/back.png | Bin 0 -> 747 bytes .../pokemon/alcremie/matcha_cream/front.png | Bin 0 -> 805 bytes .../normal.pal} | 18 +-- .../{clover => matcha_cream}/shiny.pal | 24 ++-- graphics/pokemon/alcremie/mint_cream/back.png | Bin 0 -> 688 bytes .../pokemon/alcremie/mint_cream/front.png | Bin 0 -> 806 bytes .../mint_cream.pal => mint_cream/normal.pal} | 20 +-- .../alcremie/{flower => mint_cream}/shiny.pal | 24 ++-- .../{strawberry/vanilla.pal => normal.pal} | 20 +-- .../pokemon/alcremie/rainbow_swirl/back.png | Bin 0 -> 755 bytes .../pokemon/alcremie/rainbow_swirl/front.png | Bin 0 -> 769 bytes .../normal.pal} | 22 ++-- .../{strawberry => rainbow_swirl}/shiny.pal | 22 ++-- graphics/pokemon/alcremie/ribbon/back.png | Bin 650 -> 0 bytes .../pokemon/alcremie/ribbon/caramel_swirl.pal | 19 --- graphics/pokemon/alcremie/ribbon/front.png | Bin 724 -> 0 bytes .../pokemon/alcremie/ribbon/lemon_cream.pal | 19 --- .../pokemon/alcremie/ribbon/matcha_cream.pal | 19 --- .../pokemon/alcremie/ribbon/mint_cream.pal | 19 --- .../pokemon/alcremie/ribbon/rainbow_swirl.pal | 19 --- .../pokemon/alcremie/ribbon/ruby_cream.pal | 19 --- .../pokemon/alcremie/ribbon/ruby_swirl.pal | 19 --- .../pokemon/alcremie/ribbon/salted_cream.pal | 19 --- graphics/pokemon/alcremie/ribbon/shiny.pal | 19 --- graphics/pokemon/alcremie/ribbon/vanilla.pal | 19 --- graphics/pokemon/alcremie/ruby_cream/back.png | Bin 0 -> 693 bytes .../pokemon/alcremie/ruby_cream/front.png | Bin 0 -> 809 bytes .../ruby_cream.pal => ruby_cream/normal.pal} | 20 +-- .../alcremie/{berry => ruby_cream}/shiny.pal | 24 ++-- graphics/pokemon/alcremie/ruby_swirl/back.png | Bin 0 -> 691 bytes .../pokemon/alcremie/ruby_swirl/front.png | Bin 0 -> 753 bytes .../ruby_swirl.pal => ruby_swirl/normal.pal} | 20 +-- .../pokemon/alcremie/ruby_swirl/shiny.pal | 19 +++ .../pokemon/alcremie/salted_cream/back.png | Bin 0 -> 688 bytes .../pokemon/alcremie/salted_cream/front.png | Bin 0 -> 804 bytes .../pokemon/alcremie/salted_cream/normal.pal | 19 +++ .../pokemon/alcremie/salted_cream/shiny.pal | 19 +++ graphics/pokemon/alcremie/shiny.pal | 19 +++ graphics/pokemon/alcremie/star/back.png | Bin 650 -> 0 bytes .../pokemon/alcremie/star/caramel_swirl.pal | 19 --- graphics/pokemon/alcremie/star/front.png | Bin 732 -> 0 bytes .../pokemon/alcremie/star/lemon_cream.pal | 19 --- .../pokemon/alcremie/star/matcha_cream.pal | 19 --- graphics/pokemon/alcremie/star/mint_cream.pal | 19 --- .../pokemon/alcremie/star/rainbow_swirl.pal | 19 --- graphics/pokemon/alcremie/star/ruby_cream.pal | 19 --- graphics/pokemon/alcremie/star/ruby_swirl.pal | 19 --- .../pokemon/alcremie/star/salted_cream.pal | 19 --- graphics/pokemon/alcremie/star/shiny.pal | 19 --- graphics/pokemon/alcremie/star/vanilla.pal | 19 --- graphics/pokemon/alcremie/strawberry/back.png | Bin 651 -> 0 bytes .../pokemon/alcremie/strawberry/front.png | Bin 723 -> 0 bytes .../alcremie/strawberry/salted_cream.pal | 19 --- include/constants/species.h | 56 -------- include/graphics.h | 92 +++---------- src/data/graphics/pokemon.h | 124 +++++------------- src/data/pokemon_graphics/back_pic_table.h | 72 ++-------- src/data/pokemon_graphics/front_pic_table.h | 72 ++-------- src/data/pokemon_graphics/palette_table.h | 56 -------- .../pokemon_graphics/shiny_palette_table.h | 72 ++-------- 115 files changed, 317 insertions(+), 1697 deletions(-) create mode 100644 graphics/pokemon/alcremie/back.png delete mode 100644 graphics/pokemon/alcremie/berry/back.png delete mode 100644 graphics/pokemon/alcremie/berry/caramel_swirl.pal delete mode 100644 graphics/pokemon/alcremie/berry/front.png delete mode 100644 graphics/pokemon/alcremie/berry/lemon_cream.pal delete mode 100644 graphics/pokemon/alcremie/berry/matcha_cream.pal delete mode 100644 graphics/pokemon/alcremie/berry/mint_cream.pal delete mode 100644 graphics/pokemon/alcremie/berry/rainbow_swirl.pal delete mode 100644 graphics/pokemon/alcremie/berry/ruby_cream.pal delete mode 100644 graphics/pokemon/alcremie/berry/ruby_swirl.pal delete mode 100644 graphics/pokemon/alcremie/berry/salted_cream.pal delete mode 100644 graphics/pokemon/alcremie/berry/vanilla.pal create mode 100644 graphics/pokemon/alcremie/caramel_swirl/back.png create mode 100644 graphics/pokemon/alcremie/caramel_swirl/front.png rename graphics/pokemon/alcremie/{strawberry/caramel_swirl.pal => caramel_swirl/normal.pal} (75%) create mode 100644 graphics/pokemon/alcremie/caramel_swirl/shiny.pal delete mode 100644 graphics/pokemon/alcremie/clover/back.png delete mode 100644 graphics/pokemon/alcremie/clover/caramel_swirl.pal delete mode 100644 graphics/pokemon/alcremie/clover/front.png delete mode 100644 graphics/pokemon/alcremie/clover/lemon_cream.pal delete mode 100644 graphics/pokemon/alcremie/clover/matcha_cream.pal delete mode 100644 graphics/pokemon/alcremie/clover/mint_cream.pal delete mode 100644 graphics/pokemon/alcremie/clover/rainbow_swirl.pal delete mode 100644 graphics/pokemon/alcremie/clover/ruby_cream.pal delete mode 100644 graphics/pokemon/alcremie/clover/ruby_swirl.pal delete mode 100644 graphics/pokemon/alcremie/clover/salted_cream.pal delete mode 100644 graphics/pokemon/alcremie/clover/vanilla.pal delete mode 100644 graphics/pokemon/alcremie/flower/back.png delete mode 100644 graphics/pokemon/alcremie/flower/caramel_swirl.pal delete mode 100644 graphics/pokemon/alcremie/flower/front.png delete mode 100644 graphics/pokemon/alcremie/flower/lemon_cream.pal delete mode 100644 graphics/pokemon/alcremie/flower/matcha_cream.pal delete mode 100644 graphics/pokemon/alcremie/flower/mint_cream.pal delete mode 100644 graphics/pokemon/alcremie/flower/rainbow_swirl.pal delete mode 100644 graphics/pokemon/alcremie/flower/ruby_cream.pal delete mode 100644 graphics/pokemon/alcremie/flower/ruby_swirl.pal delete mode 100644 graphics/pokemon/alcremie/flower/salted_cream.pal delete mode 100644 graphics/pokemon/alcremie/flower/vanilla.pal create mode 100644 graphics/pokemon/alcremie/front.png create mode 100644 graphics/pokemon/alcremie/lemon_cream/back.png create mode 100644 graphics/pokemon/alcremie/lemon_cream/front.png rename graphics/pokemon/alcremie/{strawberry/lemon_cream.pal => lemon_cream/normal.pal} (75%) create mode 100644 graphics/pokemon/alcremie/lemon_cream/shiny.pal delete mode 100644 graphics/pokemon/alcremie/love/back.png delete mode 100644 graphics/pokemon/alcremie/love/caramel_swirl.pal delete mode 100644 graphics/pokemon/alcremie/love/front.png delete mode 100644 graphics/pokemon/alcremie/love/lemon_cream.pal delete mode 100644 graphics/pokemon/alcremie/love/matcha_cream.pal delete mode 100644 graphics/pokemon/alcremie/love/mint_cream.pal delete mode 100644 graphics/pokemon/alcremie/love/rainbow_swirl.pal delete mode 100644 graphics/pokemon/alcremie/love/ruby_cream.pal delete mode 100644 graphics/pokemon/alcremie/love/ruby_swirl.pal delete mode 100644 graphics/pokemon/alcremie/love/salted_cream.pal delete mode 100644 graphics/pokemon/alcremie/love/shiny.pal delete mode 100644 graphics/pokemon/alcremie/love/vanilla.pal create mode 100644 graphics/pokemon/alcremie/matcha_cream/back.png create mode 100644 graphics/pokemon/alcremie/matcha_cream/front.png rename graphics/pokemon/alcremie/{strawberry/matcha_cream.pal => matcha_cream/normal.pal} (75%) rename graphics/pokemon/alcremie/{clover => matcha_cream}/shiny.pal (65%) create mode 100644 graphics/pokemon/alcremie/mint_cream/back.png create mode 100644 graphics/pokemon/alcremie/mint_cream/front.png rename graphics/pokemon/alcremie/{strawberry/mint_cream.pal => mint_cream/normal.pal} (75%) rename graphics/pokemon/alcremie/{flower => mint_cream}/shiny.pal (65%) rename graphics/pokemon/alcremie/{strawberry/vanilla.pal => normal.pal} (69%) create mode 100644 graphics/pokemon/alcremie/rainbow_swirl/back.png create mode 100644 graphics/pokemon/alcremie/rainbow_swirl/front.png rename graphics/pokemon/alcremie/{strawberry/rainbow_swirl.pal => rainbow_swirl/normal.pal} (95%) rename graphics/pokemon/alcremie/{strawberry => rainbow_swirl}/shiny.pal (100%) delete mode 100644 graphics/pokemon/alcremie/ribbon/back.png delete mode 100644 graphics/pokemon/alcremie/ribbon/caramel_swirl.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/front.png delete mode 100644 graphics/pokemon/alcremie/ribbon/lemon_cream.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/matcha_cream.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/mint_cream.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/rainbow_swirl.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/ruby_cream.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/ruby_swirl.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/salted_cream.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/shiny.pal delete mode 100644 graphics/pokemon/alcremie/ribbon/vanilla.pal create mode 100644 graphics/pokemon/alcremie/ruby_cream/back.png create mode 100644 graphics/pokemon/alcremie/ruby_cream/front.png rename graphics/pokemon/alcremie/{strawberry/ruby_cream.pal => ruby_cream/normal.pal} (57%) rename graphics/pokemon/alcremie/{berry => ruby_cream}/shiny.pal (72%) create mode 100644 graphics/pokemon/alcremie/ruby_swirl/back.png create mode 100644 graphics/pokemon/alcremie/ruby_swirl/front.png rename graphics/pokemon/alcremie/{strawberry/ruby_swirl.pal => ruby_swirl/normal.pal} (75%) create mode 100644 graphics/pokemon/alcremie/ruby_swirl/shiny.pal create mode 100644 graphics/pokemon/alcremie/salted_cream/back.png create mode 100644 graphics/pokemon/alcremie/salted_cream/front.png create mode 100644 graphics/pokemon/alcremie/salted_cream/normal.pal create mode 100644 graphics/pokemon/alcremie/salted_cream/shiny.pal create mode 100644 graphics/pokemon/alcremie/shiny.pal delete mode 100644 graphics/pokemon/alcremie/star/back.png delete mode 100644 graphics/pokemon/alcremie/star/caramel_swirl.pal delete mode 100644 graphics/pokemon/alcremie/star/front.png delete mode 100644 graphics/pokemon/alcremie/star/lemon_cream.pal delete mode 100644 graphics/pokemon/alcremie/star/matcha_cream.pal delete mode 100644 graphics/pokemon/alcremie/star/mint_cream.pal delete mode 100644 graphics/pokemon/alcremie/star/rainbow_swirl.pal delete mode 100644 graphics/pokemon/alcremie/star/ruby_cream.pal delete mode 100644 graphics/pokemon/alcremie/star/ruby_swirl.pal delete mode 100644 graphics/pokemon/alcremie/star/salted_cream.pal delete mode 100644 graphics/pokemon/alcremie/star/shiny.pal delete mode 100644 graphics/pokemon/alcremie/star/vanilla.pal delete mode 100644 graphics/pokemon/alcremie/strawberry/back.png delete mode 100644 graphics/pokemon/alcremie/strawberry/front.png delete mode 100644 graphics/pokemon/alcremie/strawberry/salted_cream.pal diff --git a/graphics/pokemon/alcremie/back.png b/graphics/pokemon/alcremie/back.png new file mode 100644 index 0000000000000000000000000000000000000000..056eca0ab894a717a94f901d62671d9ce8fccff4 GIT binary patch literal 689 zcmV;i0#5yjP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_NKi=l`1n{@V1R&t5D*ZUn3&ku*oYuF z_*ihjFi5DdumAu600000000000AEa7IRF3v32;bRa{vGi!vFvd!vV){sAK>D0t!h) zK~zY`?Ub>O+CUJ7p`f>w1u3FB+N+{9G&FHMUMac;l=T%!WwhDnNRh(1K2m)BNr}5a zTA(nk8TaH%+hDj01($60|3$mFb^OBgjPxctOxZe11uo`lFiO@!nwE@oMYGl zk z0Si_B`f&?HozFtQFU#FEkhp+)9soKWnAWeKU4S(saDg{J-3(JV0y^P(ZRXdL>>}W| z1icA-07a3wH~m+}E*beCATL1F0Fd@V<{e;9+M`boSbSz3fS**nih96QC$a@7!UvIG z1AN_ffzK2ZhRhx0qv9YNfSzHp(Tm0J5mb zn9}vqz3u;WGJjCW_7<2ow?nH7us7ypa5`~DMLmOp03e^Ls(Q&X2`M(kZ-5zmtO|0Vg+dG75Ba~wYclx@ X;GhtzVEAm%P>=v9Xb=z(mz1&|0006O zNkltq*t#4p8`GN1naXLdXq{d*d(NQ+>7_2C`qZHPG3k?_|m z#?Ea0a__BA1hd3dpguB;bawSVP`3uCk1s<84FJiffB^v21*iaE00iTl1I)eku>zD3 z0P)nDVFInB@Xm470U3(|5gNrAV;+kpf(5V{k3}CL#&Pf`f67SXI6cG3D9|EVl(&J5 zkO9XK(W|dPfE*&0-0VF-Y#oq*B`iv+@*(U4Y-*o&sGR6l1RkF;z1H7kIvN zfw3C_op8OTZ;mI~MZmWKHeG}OiehkYhF7NgjM5939>^L1(m}|m1MEo^`V4^OW7Prp zOT~+90E}5|T7V)vi0BxQ^R^3orkHT0+}pb65=;Zoa}`h7GIHl|kAJ61wg9qB3|80B z`L#S`OcY4Q2b*aDsIw+xN}m@SZ2!-V{(^y7K>(6`ljLj@>_k|qvOkb}Z04-*DdAO`pfwppISzpL} zTSECgmXMh9nFVt9J~4f)LZO8mhWxL;={N6;CR*;!J~;pY002ovPDHLkV1lWgE1>`Y diff --git a/graphics/pokemon/alcremie/berry/caramel_swirl.pal b/graphics/pokemon/alcremie/berry/caramel_swirl.pal deleted file mode 100644 index 5a19b7c4c..000000000 --- a/graphics/pokemon/alcremie/berry/caramel_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 232 184 -200 168 120 -232 168 96 -144 112 72 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/berry/front.png b/graphics/pokemon/alcremie/berry/front.png deleted file mode 100644 index 4bbc456c3eb1b798ccebbea99cdb69f76b295279..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 717 zcmV;;0y6!HP)m%P>=v9XaE2JRX3E%00075 zNklem}nV-lwN4mHt<*EQz%VIPPJ| z*Bcz#dq_CnHxQ?Ly?5YlYQlTqkqs8dryfvZwy+o=;28l+R1g6Ez|_O9K~i+L7_ek2 zL*0;;^>*&0z)=;Th!Be>TLN{0Q|!$1aazmeT?(`~!0aXuJp4Ml<}pqvsJFAYv-7~? z`&%yt$^|qRw^uqpf_7ulz!unMc70g@ctG4_3A+I==gWMUesh<_>6$Cf8Ouji_M6xP z8U$RQv2MYdwq`3yL|r(p*38MzKsk{@5~nT+XAQ_&Sin6do&yoM21bjod_HV@jNuq- zj)2MlN=bgvu2t}2T3vpCd}fXH1f+11d*Hq!rBW)hMOmZh`lvhD1lB5lF&c<38E4%U z0y?iF@uLBb)L`pEIoUOt0KXG8{hFeh>Ofx^fTQ#~ql*EsYU!mQV0dDz_mCP;J}3st zK|cYW_FsesVAKzi;sXO9J3P_*`{A(o0SSif5Q~Sh6BNC+wL8)o)vtIC4z00000NkvXXu0mjf#|=k5 diff --git a/graphics/pokemon/alcremie/berry/lemon_cream.pal b/graphics/pokemon/alcremie/berry/lemon_cream.pal deleted file mode 100644 index 17fd451a8..000000000 --- a/graphics/pokemon/alcremie/berry/lemon_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 248 152 -208 184 72 -232 224 0 -112 120 24 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/berry/matcha_cream.pal b/graphics/pokemon/alcremie/berry/matcha_cream.pal deleted file mode 100644 index edb69b688..000000000 --- a/graphics/pokemon/alcremie/berry/matcha_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -232 248 208 -176 208 152 -192 224 96 -104 128 80 -232 248 200 -176 208 152 -232 248 200 -176 208 152 -232 248 200 -176 208 152 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/berry/mint_cream.pal b/graphics/pokemon/alcremie/berry/mint_cream.pal deleted file mode 100644 index 3a21681b2..000000000 --- a/graphics/pokemon/alcremie/berry/mint_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -208 240 232 -152 168 176 -112 208 200 -72 112 128 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/berry/rainbow_swirl.pal b/graphics/pokemon/alcremie/berry/rainbow_swirl.pal deleted file mode 100644 index 37a0a4049..000000000 --- a/graphics/pokemon/alcremie/berry/rainbow_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 248 184 -208 192 120 -216 144 88 -120 88 64 -240 160 168 -208 128 136 -176 232 224 -128 160 168 -248 248 112 -216 192 40 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/berry/ruby_cream.pal b/graphics/pokemon/alcremie/berry/ruby_cream.pal deleted file mode 100644 index 350cfeb22..000000000 --- a/graphics/pokemon/alcremie/berry/ruby_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 208 208 -200 152 184 -232 112 192 -128 80 112 -248 208 208 -200 152 184 -248 208 208 -200 152 184 -248 208 208 -200 152 184 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/berry/ruby_swirl.pal b/graphics/pokemon/alcremie/berry/ruby_swirl.pal deleted file mode 100644 index e0c66e7fc..000000000 --- a/graphics/pokemon/alcremie/berry/ruby_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 240 208 -208 184 160 -240 192 128 -128 96 80 -248 176 192 -224 120 128 -248 176 192 -224 120 128 -248 176 192 -224 120 128 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/berry/salted_cream.pal b/graphics/pokemon/alcremie/berry/salted_cream.pal deleted file mode 100644 index eca511097..000000000 --- a/graphics/pokemon/alcremie/berry/salted_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -232 232 248 -176 176 184 -112 208 200 -88 88 96 -232 232 248 -176 176 184 -232 232 248 -176 176 184 -232 232 248 -176 176 184 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/berry/vanilla.pal b/graphics/pokemon/alcremie/berry/vanilla.pal deleted file mode 100644 index 118df4edd..000000000 --- a/graphics/pokemon/alcremie/berry/vanilla.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 224 208 -208 160 168 -240 136 144 -128 80 88 -248 224 200 -208 128 136 -248 224 200 -208 160 168 -248 224 200 -208 160 168 -0 120 200 -0 80 144 -0 40 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/caramel_swirl/back.png b/graphics/pokemon/alcremie/caramel_swirl/back.png new file mode 100644 index 0000000000000000000000000000000000000000..d5a073b54b918a1f73ac28114ef8ecbd4de5db82 GIT binary patch literal 688 zcmV;h0#E&kP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_NKi=l`1n{@V1R&t5D*ZUn3#wlIQUp_ zz%WRtu&~(J*Z=?k000000000001;arsQ>@~32;bRa{vGi!vFvd!vV){sAK>D0trb( zK~zY`?Ub>O+CUJ7p`f>w1x0j6d0n)If+~*3tLQ3F)+Z&M(Prxuk(_&gD82_cB`yPT zvrn0sH8yMT`T?Shgpv3^{rk^&mdQU@(~v6g>fv!kbr+25NDS+Htq)e8?*{dm(3ZIO z=o6`_4)?!3x;4NuOP@glKwNta07w_WJb(lcS}6sv9@M7{u!I0eHapJ==i*{;j$sEx zI`>3qDv7iXd=V^w&E#Vd5*&wmJC>2g5sYONXb}hAj1Yms5P9GS$RXEpQGB@t66=5j zEL8dH$1MXF0GfdqG=!EOFnO{$`i-6w} z^d|5D6h-3R^j{gfWaNW@yZ})HK-vqLcYr-H$-o$QGaoA4Gl) z@O9e-K2uB>GIx-Vii2zbdWOkHFM2ESh(D){w*azQ^j25W`58ZFj2UpPdYfqh$f71= zO4m#Gw*S+~{6QhxTVUSY4y`W0-k6iY>BJco0TEsGOCK`=OuMh}7r zDeJ>=b+>cRIBn~8U&z61&2i-bXtAw}^UF#Z7+dZvvn8*~0*bE*hgd#rEztY7!t_;{ zmEWn&Jw?6-@R+CSTlIpvOpW0KfPAW|>Ltr0q}UX{0cP;AD#(Er3N3g)cAu WiV4pYsO)|K0000RSHO5TLS6_ z2p%D2xiu24#Fy)HmNL{Ybg%lX|DXQP>s_n$KPur6jB`MnVUQPR96CcJqIYKqf5`ff zoJ+zPg!+s{+YdqMW(!9E0%0TI&=Uf{MNRUm)hVG4>i-sRGS{U1<_+7W{~#6jmT63a*Xm{RudX z8N;KDg6>KcvX>+{lz_mP5mf^sMHbulRRUZzcpP;?A+U@oN5GT-V+h}M<|n+EL6;Aa zFSRi}0HKk+2ku3L7-LFZxDv(0Lp{PIFg3DO4hh;Lf{X410a?|Nct3`SNXTTZY);9uH>Ahvep{EZUC%u7kuj{kO1Wp&!R*To!(R00000NkvXXu0mjfQTb0h literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/strawberry/caramel_swirl.pal b/graphics/pokemon/alcremie/caramel_swirl/normal.pal similarity index 75% rename from graphics/pokemon/alcremie/strawberry/caramel_swirl.pal rename to graphics/pokemon/alcremie/caramel_swirl/normal.pal index 78cea9164..7e2e4cb99 100644 --- a/graphics/pokemon/alcremie/strawberry/caramel_swirl.pal +++ b/graphics/pokemon/alcremie/caramel_swirl/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -248 248 248 -248 232 184 -200 168 120 -232 168 96 144 112 72 248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 +232 168 96 +200 168 120 +16 16 16 +248 232 184 +136 32 56 248 88 112 192 48 72 -136 32 56 +168 176 176 +248 248 248 +0 0 0 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/alcremie/caramel_swirl/shiny.pal b/graphics/pokemon/alcremie/caramel_swirl/shiny.pal new file mode 100644 index 000000000..d19dc335d --- /dev/null +++ b/graphics/pokemon/alcremie/caramel_swirl/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +72 80 72 +248 248 248 +88 88 96 +128 128 128 +16 16 16 +152 152 152 +136 32 56 +248 88 112 +192 48 72 +168 176 176 +216 216 216 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/clover/back.png b/graphics/pokemon/alcremie/clover/back.png deleted file mode 100644 index 8a8efe5677cd07659a87157e48a53fc0607c47c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 655 zcmV;A0&x9_P)v$b{#7JjL_ka55pWX3n_V1OqraGC_*Y7T=E~bcsj)YsU z7&|ih`QEAfAv46)gg(=Z>gek2gl-J5-oKeLXaI;mOc(%=9)g?zG(gBW=KxEm?n%H3 zLx5=R%-};?B6ObPx&u-cOhjlZN*QxlG!YDd!#FJZ2oW9!fBslTI*xG zXGTbYV~F77N&aO5Acug(I~Ncc2P9y{Z}V?sAnkls?B(bE2#9Qe{~U*mIvpfqXM+~9 zIRYDaRoFc|I|4f4dd<&lz_%mdTf-v&MbWr7!z+`0M&Sf>52OtMiLHA<2bfM3`V4^8 zGuZ+7OTyRb0Pt9(TYw_mhrvTYEZZsYnP9@Tw5Pn|0(1k=a~;juDzMk;4*yQ1XaQtd zI9Odx{cCZ^7)ub04>r>PP^V4Cgg!4e*#2Kz^$CT#GQfHBbuiuol~P-UrxVvy1f=w- z_jC9JsCIJ`GwjpN3kx_!Ad?4RNm-AtHy`(QkL@CB_k|qPLS1hx04)|-dAO`Zf-+^F zWqm5LyoB;cBp}wu3j<{KePa3|uk)`oW<`-70@!9(+!i;e>qIHx0Q9aXikrIDkl;{a p1o-f~D9M2q3N6GiK4Fp3)1tn3QXsVErCAqVJBI>`)maEIPA=Crxn0T(l0#24h8jVfsOg{ zy`KT)0=iC`EGj*mC(9XeumqObnI`i}f=GdQ`4F}P{5DxsfS|j}vSQ2?=j>5+%x2K_ zG6D_(FJP=+-5Sf*Y$b{42-nk^xfMWAPNa~;?MT9z1LX({xX;8xAOgqW*hvLw`M|Od zGk}kxMe)wt-+mwxaMrsb_xzRvatEU0VR@YwE|Z<#ZQ84hyb{@`(B0ImjME@|5TP;2;{+ez#UQ>P09X$u=rnrC527fn z?^0idc|vp*zA_y3kDIt>1x!GIVLdla>aB0E?YG*f1+}2!c#)o*?Pir|IIgo}xid zLbyO@t43H&MWNhLmPE-^x)(jb65#*Ce?L#h+3eq|AfsAO>e>A#s*h8|Nk_u3SBza) z{pRS^=Ym<{c0!*SMs;y}H=$bttj`~&3>pC9FB1j;qzh0JfB_JUa}Kcb>VX0*ApoL< zH^Us-lEOR3tOHUOPDE%bN*VK5G!ZO-hw)hS5h5H1fBjrW8pnALC!;`%cs+Yj`ZGcb z97BZbgZ@4NkVD8~FA!M=Bw)j}F3U3@?R+-ut=9TD0wNdSKA_Vb0w8hqAnX9!sY0Ituz96A z0Dp;ipALY4MWzKP!Y>hy0l8{VfzJdJX39OpBbQ(rfSy^jV4Kigt4I7hQL+V)Wn!?p zhWgj?lrdHy86Rw>1)xrwj0s&YHrW2(yZjppb!CB@=5{dN167{ya-2?FQxTBTRqxL+ zCm?S(H?fC(xqagRR|pj91gt3Q<-_*t(e1HY7VW-}L%z%(whn+6%c4AetVBU>%bjI? zB@10b`6H4Lo6DsI3io?rdaY}{r(;$Wc?@8igFfgz>L$r^=>g0E@5;We4J3Fdc?Qhk mk1ol9778uoFy#OGTRj0_A~QV21hz;30000K`ir diff --git a/graphics/pokemon/alcremie/flower/caramel_swirl.pal b/graphics/pokemon/alcremie/flower/caramel_swirl.pal deleted file mode 100644 index 33bc209d7..000000000 --- a/graphics/pokemon/alcremie/flower/caramel_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 232 184 -200 168 120 -232 168 96 -144 112 72 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/front.png b/graphics/pokemon/alcremie/flower/front.png deleted file mode 100644 index 20c9af2f46ff7d25e657c26d72076f8a33276817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 721 zcmV;?0xtcDP){kYTBYX4P`AyM0a(*a68 z*^7C%@PLx)2!jCvUL|0NIs(91RSmxhsc5GZSnb?q zHnimV?W*YS#LI<~0Vj>+BK}kih~w3+K%aQ9#P4Fjhqv)f3heXy@te31@e4?>LqQ*v z0cnXFF9FI0*kvVZ=kaGCZ7h+NS;k)qfLH->(;=)j@Xo5ZOyBOXBpY+hIV;(v>Dz8X zpiRK_8S58sjbUlFmPE9K<7&;EVh@xPDI{@Pl5p0Be1rkqW8wi2fn#v&qyRKLV9C2V zzg?map{Sz>vNGa}E0!Uv|FM1`Xvm7v0>R8ZyshMRTMNyOkObmE^-1Qj4 zHZ~jql>?NL{JPt$tor*%V-F*(t5$95nnu6E{axoT{=cf9SzZe4S2S_800000NkvXXu0mjf D{0mY) diff --git a/graphics/pokemon/alcremie/flower/lemon_cream.pal b/graphics/pokemon/alcremie/flower/lemon_cream.pal deleted file mode 100644 index df85ea6b8..000000000 --- a/graphics/pokemon/alcremie/flower/lemon_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 248 152 -208 184 72 -232 224 0 -112 120 24 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/matcha_cream.pal b/graphics/pokemon/alcremie/flower/matcha_cream.pal deleted file mode 100644 index f3b35677c..000000000 --- a/graphics/pokemon/alcremie/flower/matcha_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -232 248 208 -176 208 152 -192 224 96 -104 128 80 -232 248 200 -176 208 152 -232 248 200 -176 208 152 -232 248 200 -176 208 152 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/mint_cream.pal b/graphics/pokemon/alcremie/flower/mint_cream.pal deleted file mode 100644 index b32cc3bb2..000000000 --- a/graphics/pokemon/alcremie/flower/mint_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -208 240 232 -152 168 176 -112 208 200 -72 112 128 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/rainbow_swirl.pal b/graphics/pokemon/alcremie/flower/rainbow_swirl.pal deleted file mode 100644 index 2b7736025..000000000 --- a/graphics/pokemon/alcremie/flower/rainbow_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 248 184 -208 192 120 -216 144 88 -120 88 64 -240 160 168 -208 128 136 -176 232 224 -128 160 168 -248 248 112 -216 192 40 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/ruby_cream.pal b/graphics/pokemon/alcremie/flower/ruby_cream.pal deleted file mode 100644 index 6de39b5a3..000000000 --- a/graphics/pokemon/alcremie/flower/ruby_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 208 208 -200 152 184 -232 112 192 -128 80 112 -248 208 208 -200 152 184 -248 208 208 -200 152 184 -248 208 208 -200 152 184 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/ruby_swirl.pal b/graphics/pokemon/alcremie/flower/ruby_swirl.pal deleted file mode 100644 index fce8994be..000000000 --- a/graphics/pokemon/alcremie/flower/ruby_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 240 208 -208 184 160 -240 192 128 -128 96 80 -248 176 192 -224 120 128 -248 176 192 -224 120 128 -248 176 192 -224 120 128 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/salted_cream.pal b/graphics/pokemon/alcremie/flower/salted_cream.pal deleted file mode 100644 index a9c50d230..000000000 --- a/graphics/pokemon/alcremie/flower/salted_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -232 232 248 -176 176 184 -112 208 200 -88 88 96 -232 232 248 -176 176 184 -232 232 248 -176 176 184 -232 232 248 -176 176 184 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/vanilla.pal b/graphics/pokemon/alcremie/flower/vanilla.pal deleted file mode 100644 index a3184e016..000000000 --- a/graphics/pokemon/alcremie/flower/vanilla.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 224 208 -208 160 168 -240 136 144 -128 80 88 -248 224 200 -208 128 136 -248 224 200 -208 160 168 -248 224 200 -208 160 168 -248 248 0 -248 104 40 -152 56 24 -0 0 0 diff --git a/graphics/pokemon/alcremie/front.png b/graphics/pokemon/alcremie/front.png new file mode 100644 index 0000000000000000000000000000000000000000..e1daa350c5823898cdea0c52942b282358591211 GIT binary patch literal 745 zcmVPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_fKXWY;K=ZZkkFv85D*af;L!N^_=q4l z_*ihjFi6m#r~m)}00000000000F$i^IRF3v32;bRa{vGi!vFvd!vV){sAK>D0zyed zK~zY`?UcKY8Zi`xX9}d07zS@a6^}$S6*w8KL}lR_C0!EXks>PA=Af-tf~3nT(gym3 zEIh$N2OBECT#l#9Tu2|~wEw67Ty5`vl*1<&mw*<-Ak7O7?EwW6-AF!k2(RTnqSgi2!g}mm`>i3w^z+QdjpRmtjiQyDw$^#rE+*!ulz>GHGW)p!_)ZrZcU~L>y#ph&9~-#+oFT9% z0j(YaVu!#-Y?d$Cxd0H>lcPie-0m|ChDFE1Bw8%`H4+(YK#n!sSlj&*@ENm~ix~ye zQ95QXNpvm%k+nmr`$Wmv$i1%u&_ILdVLO%*%b0KkYyq&A@MC+v#Ea>7_yGAr8n{Z%jfK%xHNyeiZfOOrGSU9xD z%J0@^$2P9Oa!b0bSy=)*cI`7CTFa`dR43*f?1`OgM*SgD?v#|O8+Ai@3U%*dsK4m{ bW_aFjU(nIx-Q$_M00000NkvXXu0mjfY9~Xl literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/lemon_cream/back.png b/graphics/pokemon/alcremie/lemon_cream/back.png new file mode 100644 index 0000000000000000000000000000000000000000..d5a073b54b918a1f73ac28114ef8ecbd4de5db82 GIT binary patch literal 688 zcmV;h0#E&kP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_NKi=l`1n{@V1R&t5D*ZUn3#wlIQUp_ zz%WRtu&~(J*Z=?k000000000001;arsQ>@~32;bRa{vGi!vFvd!vV){sAK>D0trb( zK~zY`?Ub>O+CUJ7p`f>w1x0j6d0n)If+~*3tLQ3F)+Z&M(Prxuk(_&gD82_cB`yPT zvrn0sH8yMT`T?Shgpv3^{rk^&mdQU@(~v6g>fv!kbr+25NDS+Htq)e8?*{dm(3ZIO z=o6`_4)?!3x;4NuOP@glKwNta07w_WJb(lcS}6sv9@M7{u!I0eHapJ==i*{;j$sEx zI`>3qDv7iXd=V^w&E#Vd5*&wmJC>2g5sYONXb}hAj1Yms5P9GS$RXEpQGB@t66=5j zEL8dH$1MXF0GfdqG=!EOFnO{$`i-6w} z^d|5D6h-3R^j{gfWaNW@yZ})HK-vqLcYr-H$-o$QGaoA4Gl) z@O9e-K2uB>GIx-Vii2zbdWOkHFM2ESh(D){w*azQ^j25W`58ZFj2UpPdYfqh$f71= zO4m#Gw*S+~{6QhxTVUSY4y`W0-k6iY>BJco0TEsGOCK`=OuMh}7r zDeJ>=b+>cRIBn~8U&z61&2i-bXtAw}^UF#Z7+dZvvn8*~0*bE*hgd#rEztY7!t_;{ zmEWn&Jw?6-@R+CSTlIpvOpW0KfPAW|>Ltr0q}UX{0cP;AD#(Er3N3g)cAu WiV4pYsO)|K0000RSHO5TLS6_ z2p%D2xiu24#Fy)HmNL{Ybg%lX|DXQP>s_n$KPur6jB`MnVUQPR96CcJqIYKqf5`ff zoJ+zPg!+s{+YdqMW(!9E0%0TI&=Uf{MNRUm)hVG4>i-sRGS{U1<_+7W{~#6jmT63a*Xm{RudX z8N;KDg6>KcvX>+{lz_mP5mf^sMHbulRRUZzcpP;?A+U@oN5GT-V+h}M<|n+EL6;Aa zFSRi}0HKk+2ku3L7-LFZxDv(0Lp{PIFg3DO4hh;Lf{X410a?|Nct3`SNXTTZY);9uH>Ahvep{EZUC%u7kuj{kO1Wp&!R*To!(R00000NkvXXu0mjfkn2!# literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/strawberry/lemon_cream.pal b/graphics/pokemon/alcremie/lemon_cream/normal.pal similarity index 75% rename from graphics/pokemon/alcremie/strawberry/lemon_cream.pal rename to graphics/pokemon/alcremie/lemon_cream/normal.pal index 0cbfae8ee..c69c0376e 100644 --- a/graphics/pokemon/alcremie/strawberry/lemon_cream.pal +++ b/graphics/pokemon/alcremie/lemon_cream/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -248 248 248 -248 248 152 -208 184 72 -232 224 0 112 120 24 248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 +232 224 0 +208 184 72 +16 16 16 +248 248 152 +136 32 56 248 88 112 192 48 72 -136 32 56 +168 176 176 +248 248 248 +0 0 0 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/alcremie/lemon_cream/shiny.pal b/graphics/pokemon/alcremie/lemon_cream/shiny.pal new file mode 100644 index 000000000..d19dc335d --- /dev/null +++ b/graphics/pokemon/alcremie/lemon_cream/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +72 80 72 +248 248 248 +88 88 96 +128 128 128 +16 16 16 +152 152 152 +136 32 56 +248 88 112 +192 48 72 +168 176 176 +216 216 216 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/love/back.png b/graphics/pokemon/alcremie/love/back.png deleted file mode 100644 index 6c3dd9436319b795e198c32a4ffd1934ceb75c21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmV;60(AX}P)ge*rgl-J5KE0VTXaPt+PZ$7@9)p+wG(gP4Fa%h6^|=77 zI0i@--V6bB#bfUriyp{XG!db#BxlTH(MB);Hsi4vA|yDD@WoRZX&mD-tc)>Qq^H&0 zL`KLV#1PTj>q&qdB9^MX2S|(q60i={@4GRO_daWOvb!Dui4BD6W(@Q?2*%zyfM`cx z1FxKvb2|b$;d(8cX$5u!d~0|DpeP#m#=SBzWaM5z4?x}mkU1fv9xx}>=;HwE=b{Jj zm&LDh2bi-&cK}8B5l4>!zUsQbXNCz2VGrsd&TwN1OA-}-T}z6*jZgo z=QsS2F%`gB=xn9|pvl{e8GT;N+5Vqf`4xqxHo$rNb+B*%YALr8r;|2R1myIo4}Am# z$Zm5p)9ka&OA9zdpcDsSMOlxpHedGk8QW#q?F%``rM%i$09q`|>Tp?^0BOpeWpl>M zT?N&*ghQ&2mj)>9`^5BW*X(Yn&6*-V2Jo1B^^Fe*jZ1C+Kt=wGIFP002ovPDHLkV1frmFjN2l diff --git a/graphics/pokemon/alcremie/love/caramel_swirl.pal b/graphics/pokemon/alcremie/love/caramel_swirl.pal deleted file mode 100644 index 86f59a8d6..000000000 --- a/graphics/pokemon/alcremie/love/caramel_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 232 184 -200 168 120 -232 168 96 -144 112 72 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/love/front.png b/graphics/pokemon/alcremie/love/front.png deleted file mode 100644 index 36cef02d8b5af7848ed086c703872b36c436bf7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 723 zcmV;^0xbQBP);DUh!6vr>`@lBlVV#?JDVxA9s*MGhe!^ayMgRU zD0tZ%wWm4cABckKwP~ez%_cr{2w_lki?rZ&_K z+uB*&*(q>bg{Xkoi554z0)67bqs3i*oy*1SH_+kGSVW)m!1e5k$Jn8u?sB%c&6l{I zeQ{%;TtIs{`;Z4j6uG2@C9uqL_VH^TaDh0<5X}}mjiUTAz4ji9(=k_^vw~fgy|xn* zXc2Hc#(McNt)^xxNkm=Pj@Hc1_dq$3LK3?!31=;hr&?Hn5SV+5)>;Oqhc`v!rZI4rM((|enM3@=#QVE~O~Oo4=x%giRu z!pXa~9m5>hio!#sUTgwZ7%Ii>rU25@)D7Rt$ut8@lsXc$BQU;KYnzW_w}|6>6#L}vg1002ovPDHLk FV1lP#S>pfz diff --git a/graphics/pokemon/alcremie/love/lemon_cream.pal b/graphics/pokemon/alcremie/love/lemon_cream.pal deleted file mode 100644 index 34d9c0dfe..000000000 --- a/graphics/pokemon/alcremie/love/lemon_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 248 152 -208 184 72 -232 224 0 -112 120 24 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/love/matcha_cream.pal b/graphics/pokemon/alcremie/love/matcha_cream.pal deleted file mode 100644 index 3d33c04ab..000000000 --- a/graphics/pokemon/alcremie/love/matcha_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -232 248 208 -176 208 152 -192 224 96 -104 128 80 -232 248 200 -176 208 152 -232 248 200 -176 208 152 -232 248 200 -176 208 152 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/love/mint_cream.pal b/graphics/pokemon/alcremie/love/mint_cream.pal deleted file mode 100644 index 2344ddcf8..000000000 --- a/graphics/pokemon/alcremie/love/mint_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -208 240 232 -152 168 176 -112 208 200 -72 112 128 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/love/rainbow_swirl.pal b/graphics/pokemon/alcremie/love/rainbow_swirl.pal deleted file mode 100644 index 3bb1f61ee..000000000 --- a/graphics/pokemon/alcremie/love/rainbow_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 248 184 -208 192 120 -216 144 88 -120 88 64 -240 160 168 -208 128 136 -176 232 224 -128 160 168 -248 248 112 -216 192 40 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/love/ruby_cream.pal b/graphics/pokemon/alcremie/love/ruby_cream.pal deleted file mode 100644 index 0d37782db..000000000 --- a/graphics/pokemon/alcremie/love/ruby_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 208 208 -200 152 184 -232 112 192 -128 80 112 -248 208 208 -200 152 184 -248 208 208 -200 152 184 -248 208 208 -200 152 184 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/love/ruby_swirl.pal b/graphics/pokemon/alcremie/love/ruby_swirl.pal deleted file mode 100644 index ad18466c8..000000000 --- a/graphics/pokemon/alcremie/love/ruby_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 240 208 -208 184 160 -240 192 128 -128 96 80 -248 176 192 -224 120 128 -248 176 192 -224 120 128 -248 176 192 -224 120 128 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/love/salted_cream.pal b/graphics/pokemon/alcremie/love/salted_cream.pal deleted file mode 100644 index 9bb17bbcf..000000000 --- a/graphics/pokemon/alcremie/love/salted_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -232 232 248 -176 176 184 -112 208 200 -88 88 96 -232 232 248 -176 176 184 -232 232 248 -176 176 184 -232 232 248 -176 176 184 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/love/shiny.pal b/graphics/pokemon/alcremie/love/shiny.pal deleted file mode 100644 index 848904393..000000000 --- a/graphics/pokemon/alcremie/love/shiny.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -216 216 216 -152 152 152 -128 128 128 -88 88 96 -72 80 72 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 152 200 -248 112 120 -216 56 104 -16 16 16 diff --git a/graphics/pokemon/alcremie/love/vanilla.pal b/graphics/pokemon/alcremie/love/vanilla.pal deleted file mode 100644 index 9f965e53b..000000000 --- a/graphics/pokemon/alcremie/love/vanilla.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 224 208 -208 160 168 -240 136 144 -128 80 88 -248 224 200 -208 128 136 -248 224 200 -208 160 168 -248 224 200 -208 160 168 -248 152 200 -248 112 120 -216 56 104 -0 0 0 diff --git a/graphics/pokemon/alcremie/matcha_cream/back.png b/graphics/pokemon/alcremie/matcha_cream/back.png new file mode 100644 index 0000000000000000000000000000000000000000..8f93ef92ef5658067c721151d77c9f08554ee387 GIT binary patch literal 747 zcmVumAu600000008SeBUS(a00Cl4M@0Xn2lB-L00Iw5 zL_t(|ob8mqj?+L8#*-rbS!^O9rMcACpmkEEz<9h8(iMqVUx8>GE&Ci46y|y)eEmt_ zw;;jYJ`^+S*xvOY=n*5uk@EfY?Kk7u%x3>y%>$~NNj*4ksBWi-tB%CDe$@J8_2pqy zUkGi9y9s?JHPz|v=Y(zzu*`bOpavkSCJX>b7r-U}2_Upm3Sc{`&lz9|0TAy-Gc2Gf zE=K1Vv_Pn{i3oMYq1Gc7bp#7wGb0vVgc!%6UjHd0jbnI*lTn~WG$3RLfWi=2pOC&o zrlUOnGz4PnfCQ{m@#EVN2wR_(ep?iWJ`lTrdKv**9hlZHpIm^|BXEIN-`xyzHv&50 zdhM3|NwyL2TY}!*OaT-{;@8kXZ}ZlaA=)0jrO!1@M!I7oi8t zbu1fzBD@n>AK=@j3w$P+FktQ=9~1{!1N02yonCn>@qj-kj5h$XT6n7~>HL&mGe!)! zR^Db>0Mf9|n9%jo-u8dEm|rNQM++?L+o4ql9F4gcoKBQd5fIW<@A_B}V4BTMY_q4$ z8wXe;P&LV6*utjDO>;m002ovPDHLkV1m0GHoyP? literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/matcha_cream/front.png b/graphics/pokemon/alcremie/matcha_cream/front.png new file mode 100644 index 0000000000000000000000000000000000000000..39c3ab855a7ebbc1c07ab2a63f8df455198fff58 GIT binary patch literal 805 zcmV+=1KRwFP)aN*O^x9e^kOD80UaC!yqrtICO?cMDNZJ{*d({ zIhTYp2=y6@wjYAh%@&RT1j0tZp-TjSi>4gj9BinoRh_!JBZUkzvfh2E>KEIG`=|ge zKW+278eqSBxTUD;aJ}E%SI2p=-98q;fUmcCEs%fXDOO0;Ri1y%szCn8!xR*!5WiWe zDnM6b&|^$t(}XqqpdskQHj#~ihoTC2@hg!QZB95BHM4ZRI7u~(H6)%8-D($3CdGtk zI-^k{rHHCED6R=5I+_v9#Td#Kj;)No1x>LHj+In^MF=AOxdHf27YcV?9t6DwEz%zw zxcQtSu&4m-J_6AWfsfcMU$RpPAgnLqL;&3EQw5p@htee4Ecg{iDQrMY6kHqA`x9^& zGloYQ1>Kb@WG_i@Dgl8pBdP{OiY&J8s|2`c@HFa#LSPwFj({lv#t?q!%$ImEgDxK; zUut7|0zxBu58R6gF~*d-a3zX~hkArbU}|Km91^rg1Q*>20uk&ww++4gEH zz&)v^r%4xu4(fFSa9QjbT^ayqUR(+S4PT7Yhr&SdpdN6UZ-HxnSRT?daP;jz$#~EJ zke*!<^GD`T``tS1(7_cLZb*;S{kAS+hn{)jBV$;7mGa1}gE_KO!>B(5(w>r(O`~>Y jOQPPOKIi$1{;$Sw5$DxPj%KPQ00000NkvXXu0mjf$^1_S literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/strawberry/matcha_cream.pal b/graphics/pokemon/alcremie/matcha_cream/normal.pal similarity index 75% rename from graphics/pokemon/alcremie/strawberry/matcha_cream.pal rename to graphics/pokemon/alcremie/matcha_cream/normal.pal index 918955f1a..a5bbc02bc 100644 --- a/graphics/pokemon/alcremie/strawberry/matcha_cream.pal +++ b/graphics/pokemon/alcremie/matcha_cream/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -248 248 248 -232 248 208 -176 208 152 -192 224 96 104 128 80 232 248 200 +192 224 96 176 208 152 -232 248 200 -176 208 152 -232 248 200 -176 208 152 +16 16 16 +232 248 208 +248 248 248 +136 32 56 248 88 112 192 48 72 -136 32 56 +224 248 200 +176 208 152 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/alcremie/clover/shiny.pal b/graphics/pokemon/alcremie/matcha_cream/shiny.pal similarity index 65% rename from graphics/pokemon/alcremie/clover/shiny.pal rename to graphics/pokemon/alcremie/matcha_cream/shiny.pal index 6329ca1ec..eb171da47 100644 --- a/graphics/pokemon/alcremie/clover/shiny.pal +++ b/graphics/pokemon/alcremie/matcha_cream/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -216 216 216 -152 152 152 -128 128 128 -88 88 96 72 80 72 248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -136 216 64 -24 144 36 -24 80 36 +88 88 96 +128 128 128 16 16 16 +152 152 152 +216 216 216 +136 32 56 +248 88 112 +192 48 72 +248 248 248 +168 176 176 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/mint_cream/back.png b/graphics/pokemon/alcremie/mint_cream/back.png new file mode 100644 index 0000000000000000000000000000000000000000..481ce9c78cff8ecc5e29aa50f6b6a90d712c5c06 GIT binary patch literal 688 zcmV;h0#E&kP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_NKi=l`1n{@V1R&t5D*ZUn3#wlIQUp_ zz%WRtu&}7Gu-Mqx00000000000AHEecmMzZ32;bRa{vGi!vFvd!vV){sAK>D0trb( zK~zY`?Ub>O+CUJ7p`f>w1x0j6d0n)If+~*3tLQ3F)+Z&M(Prxuk(_&gD82_cB`yPT zvrn0sH8yMT`T?Shgpv3^{rk^&mdQU@(~v6g>fv!kbr+25NDS+Htq)e8?*{dm(3ZIO z=o6`_4)?!3x;4NuOP@glKwNta07w_WJb(lcS}6sv9@M7{u!I0eHapJ==i*{;j$sEx zI`>3qDv7iXd=V^w&E#Vd5*&wmJC>2g5sYONXb}hAj1Yms5P9GS$RXEpQGB@t66=5j zEL8dH$1MXF0GfdqG=!EOFnO{$`i-6w} z^d|5D6h-3R^j{gfWaNW@yZ})HK-vqLcYr-H$-o$QGaoA4Gl) z@O9e-K2uB>GIx-Vii2zbdWOkHFM2ESh(D){w*azQ^j25W`58ZFj2UpPdYfqh$f71= zO4m#Gw*S+~{6QhxTVUSY4y`W0-k6iY>BJco0TEsGOCK`=OuMh}7r zDeJ>=b+>cRIBn~8U&z61&2i-bXtAw}^UF#Z7+dZvvn8*~0*bE*hgd#rEztY7!t_;{ zmEWn&Jw?6-@R+CSTlIpvOpW0KfPAW|>Ltr0q}UX{0cP;AD#(Er3N3g)cAu WiV4pYsO)|K00001KIqEP);I?!^Lp26{f|mG1mhggW*Fqf8HdggiRj%K!XL6e zBiGpimdVc~A zW5)0(qoBJ|h3q8>4kaKkW<=G1NRh?%eU$(g4IW3GPzWqz$`LRnz!<`Jo%snbX3*tB z4UNRm5$PC7-~a#s07*qoM6N<$g5{rF)&Kwi literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/strawberry/mint_cream.pal b/graphics/pokemon/alcremie/mint_cream/normal.pal similarity index 75% rename from graphics/pokemon/alcremie/strawberry/mint_cream.pal rename to graphics/pokemon/alcremie/mint_cream/normal.pal index 3978acb21..7b56dfdc3 100644 --- a/graphics/pokemon/alcremie/strawberry/mint_cream.pal +++ b/graphics/pokemon/alcremie/mint_cream/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -248 248 248 -208 240 232 -152 168 176 -112 208 200 72 112 128 248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 +112 208 200 +152 168 176 +16 16 16 +208 240 232 +136 32 56 248 88 112 192 48 72 -136 32 56 +168 176 176 +176 176 176 +248 248 248 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/alcremie/flower/shiny.pal b/graphics/pokemon/alcremie/mint_cream/shiny.pal similarity index 65% rename from graphics/pokemon/alcremie/flower/shiny.pal rename to graphics/pokemon/alcremie/mint_cream/shiny.pal index ee7ae0fba..f71c66c01 100644 --- a/graphics/pokemon/alcremie/flower/shiny.pal +++ b/graphics/pokemon/alcremie/mint_cream/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -216 216 216 -152 152 152 -128 128 128 -88 88 96 72 80 72 248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 0 -248 104 40 -152 56 24 +88 88 96 +128 128 128 16 16 16 +152 152 152 +136 32 56 +248 88 112 +192 48 72 +168 176 176 +168 176 176 +216 216 216 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/strawberry/vanilla.pal b/graphics/pokemon/alcremie/normal.pal similarity index 69% rename from graphics/pokemon/alcremie/strawberry/vanilla.pal rename to graphics/pokemon/alcremie/normal.pal index b9cb001f7..db4dca6f9 100644 --- a/graphics/pokemon/alcremie/strawberry/vanilla.pal +++ b/graphics/pokemon/alcremie/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -248 248 248 -248 224 208 -208 160 168 -240 136 144 128 80 88 248 224 200 -208 128 136 -248 224 200 -208 160 168 -248 224 200 -208 160 168 +240 136 144 +208 160 176 +16 16 16 +248 224 208 +248 248 248 +136 32 56 248 88 112 192 48 72 -136 32 56 +208 160 168 +0 0 0 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/alcremie/rainbow_swirl/back.png b/graphics/pokemon/alcremie/rainbow_swirl/back.png new file mode 100644 index 0000000000000000000000000000000000000000..e7f558454d9320a913d5757a44a270badd02f476 GIT binary patch literal 755 zcmVu=x1+sIai8u&}*2{d52T00Cl4M@0Xn2lB-L00I|D zL_t(|ob8jbj?+L8hLa-wS!^O9orK^8PH3G}DX=`Ygt#IW>njkAPs=vE1O4vySaudksC}mtsqqPyhZio}JD9J{V5}jV|<2{F-41LM2H>$ zi6M$1AzX(-MP>PJ48+C(30TSM%cn6Ac0MchysCCXAhrQ{>jAntFr^;e+5l@tU;|G- z+ZpC|1a!jn+AN2Y>>}V>fZCi*0Te~x-ngHP^%=Pr5Iqn!03=Sxq65rH8TvTD>J94v z{3Ypw&;jNu7A-&#UZ%wm;On*vd?uJMVD=!dBnQy|^bF#SS~)9mg?}fEw*ay#byio< z`8hvjj2Lhwoy{}={Hp23R(?L&+YifL~pvCrBo<3H>KpWY!%+L9; zDxrKIbBM&{)&NKQdt&;!%BzpmW=4^R03LHwf2i-UE)uP|2M{-PUEk%ofCQW3BVYlq l>XIC2q0oZ6A^+=d`VBQ!7~-YpNG|{Y002ovPDHLkV1n%nMJxaS literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/rainbow_swirl/front.png b/graphics/pokemon/alcremie/rainbow_swirl/front.png new file mode 100644 index 0000000000000000000000000000000000000000..4337e257a4640cf5818e938062662e1213148271 GIT binary patch literal 769 zcmV+c1OEJpP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_cvwL2ps3i8SkSD0$NE# zK~zY`?UcQ1+dvq`t-;XI7t5C+#e)OgoohuPX+Zd7+N}kjpx_SXPOk~2Q^0PwhC*uZ zsT=z*h_!XeA}^u!cAKG_45oCn{)WENR(-g8>9amRp7-md(tl-T5Y#SUuYn?!9SPMV zB_gUnFul356JY<{)W6ID=Chj%ioUYO^VwA;Ct-S<08KWY`niDriMiMzmB+sS(aQq< zEwfyZj6&<#NM->#YJ+NHiMWiFa}R2Pa^fMpHZY540kid(yUCax#(2&y%Vx`Q6|@yN zCg-*66ow~whbY>kwj%_$vpqjp?s&`L0Oxa8f(jP*sZAUNi|;Ml zg$eMEgg070{1Y&OKx<}u6jV(}EBHzl%M`HC`jpBh5!`E?1VNAj${6tNv}$pVZFCs| zIt6G=*nPD>#23@7u@mG|V|155s2#rtX4-^kty5E!1)7eDzKunot3@d-0m>wt@mdD~ zk@b;y*#?^k@It-35q0{zlXiNE;&rb?yX0`L9iaeRQf00000NkvXXu0mjf2-{Vh literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/strawberry/rainbow_swirl.pal b/graphics/pokemon/alcremie/rainbow_swirl/normal.pal similarity index 95% rename from graphics/pokemon/alcremie/strawberry/rainbow_swirl.pal rename to graphics/pokemon/alcremie/rainbow_swirl/normal.pal index 10bfc24d1..3a02c0dd4 100644 --- a/graphics/pokemon/alcremie/strawberry/rainbow_swirl.pal +++ b/graphics/pokemon/alcremie/rainbow_swirl/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -248 248 248 -248 248 184 -208 192 120 -216 144 88 120 88 64 240 160 168 -208 128 136 -176 232 224 -128 160 168 -248 248 112 -216 192 40 +216 144 88 +208 192 120 +16 16 16 +248 248 184 +248 248 248 +136 32 56 248 88 112 192 48 72 -136 32 56 -0 0 0 +248 248 112 +216 192 40 +176 232 224 +128 160 168 +208 128 136 diff --git a/graphics/pokemon/alcremie/strawberry/shiny.pal b/graphics/pokemon/alcremie/rainbow_swirl/shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/shiny.pal rename to graphics/pokemon/alcremie/rainbow_swirl/shiny.pal index 6ae9aa96a..e7e9c558f 100644 --- a/graphics/pokemon/alcremie/strawberry/shiny.pal +++ b/graphics/pokemon/alcremie/rainbow_swirl/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -216 216 216 -152 152 152 -128 128 128 -88 88 96 72 80 72 248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 +88 88 96 +128 128 128 +16 16 16 +152 152 152 +216 216 216 +136 32 56 248 88 112 192 48 72 -136 32 56 -16 16 16 +248 248 248 +168 176 176 +248 248 248 +168 176 176 +168 176 176 diff --git a/graphics/pokemon/alcremie/ribbon/back.png b/graphics/pokemon/alcremie/ribbon/back.png deleted file mode 100644 index 3b595ebb62e1a05e454fd384c4cd15131a5e612c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 650 zcmV;50(Jd~P)`;+oKPybCjd&Gh9)hkZVSIa z1W#asM0;nQZgF)&W@a7R>v#=4Vx-to{!jn@GdrHm{=Et^s*6cId;gZ|%@lFek?`vk zV`o<1+C5K z0yhFW;d(7Lr<3d=;M)LOTucEJ#o*oyuT1qBr57+gkTw7$t{#LPU{9*hX8^39s1Cqi zB3`BgAYhSc0gCWbgr|U9wO!yd!GxJ|=XB2{m(^b diff --git a/graphics/pokemon/alcremie/ribbon/caramel_swirl.pal b/graphics/pokemon/alcremie/ribbon/caramel_swirl.pal deleted file mode 100644 index c4fce2c7c..000000000 --- a/graphics/pokemon/alcremie/ribbon/caramel_swirl.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -248 232 184 -200 168 120 -232 168 96 -144 112 72 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ribbon/front.png b/graphics/pokemon/alcremie/ribbon/front.png deleted file mode 100644 index 2f1b913cb7a9e64ccc16ab5f1833d57d44816f17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 724 zcmV;_0xSKAP)51V$R8ppHobvt zB^=mnO1)}|U~D%LtaBoG*TpCs1R=us?t+E;5qt41_xbU>pF2A{|05HI#MlO$_Aum= zEe`DiB&=^+h>L^XGqATM;XQE37K_sh2Pi4FFc=`<6at1QApo2eogD?!|8DNQDZz8Nv&{nv} z1?FFz2q+iOSS>z&&6aRI2U5orahl~^X8_UqKi5GZGWvr7c583I4CSzZbzDL@97tYI^Ny+uTU1mmmJ zB+i2I>xLD<6xf==eWjlM2^c}36t`*uNLN!QcqPY^6fjomSkR`_tkyURf*=K$Xz=E^ z?J$OAY&Zfc1t=x?Rl8Eci)nWG5%Q@vHWQG-itmBDmXu1VR2Qa3(RNX{FbQl__F^;; zS2E7JYXo#wN8)=OEUBTUbLF_#xB}c0E&4S@InjYWE&xuFJ)=tjU{sPzL7?D?F`h$W zK=~jaFui^Z-0MH`3xHAIi-Qje0NLTO-aqt*xzDZP4ck5j_hrY+du>h68+QB`{LuHk z{3`Xxiyi!t_p)HrKL#3W7-(HIYE$oM)C<(#dH$mRtMLmE3<210ttNy30000Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_NKi=l`1n{@V1R&t5D*a9*w~05IQUp_ zz%WSo`1q)>u&A)Gn3$LV000000CVB|H2?qr32;bRa{vGi!vFvd!vV){sAK>D0uD(; zK~zY`?Ucca+b|G@lSA${RiF@Z*j)Ei=|CLF|MBae@hFpju%;nZ;MK#!is~*H*O3_3_gbHfKHm-M zvrHS}-lI>1raImK^616@OD=o{EdX)tF#sSv1Lgq)K&F*a0P8`0$^a|N0Fv#_bHcfJ zHaN$y2O`~gBD9r6S_i%e2Eb;Tu?Pu{L%ki#NaF~`GG=HI2i}Yjfx-|?;0MT|(Q#3H zz6BEFfCMa6`SbfN5cNJw{k|-B*Fa(e>UjX@bzoY*ezpPDj=%=q{ID}j?Fi_E>$RO< zPqL4I-vabD@BtJ>;NG~ej9oJFK|ox9s0AQ(LN+~MPTHf711$fr9>7nUy^0)QsuR%x z6yZbGTmyXFb%D0rpZJB~B;KsR)SZs$cq;5g@zGO--|>)jJDV zAW(PLZ%tVr4y(JJea3N9cl$yPaw88b3qXraU7TN5%0Qa3XPGZ}T^3M$NjSvfVPgR2 z-wM-LWnO-xHun_y8o*LQhr4*=q+s;ZYf7m#98{05l8$EqL)S}3&OZpi;N bUX#gRv>!W_dkrV}00000NkvXXu0mjfdL%El literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/ruby_cream/front.png b/graphics/pokemon/alcremie/ruby_cream/front.png new file mode 100644 index 0000000000000000000000000000000000000000..7196c7054bf2a69d073957e04cb1f239c94b7f90 GIT binary patch literal 809 zcmV+^1J?YBP)khsX0!0^b>00000002%nL7@Nu00Cl4M@0Xn2lB-L00K=( zL_t(|ob8mmirYXGhOI(uo3Z6>%oG`w!i7BvTNo8WBa%jt1P=s^ss$&FAxj{3vt5$4 z3)gEuhP`n$PvM=B+2*`U&Iq=ME>0hE+W+G}*O^x9e^kOD80UaC!yqrtICO?cMDNZJ z{*d({IhTYp2+bLbwjY8v%@&RT1j0tZp;H8ai>4gj32f-Ad7V1HA%zS_vRHko>KDtq z+o%98KP|U6HNa+dcTG_@;bOD8t&a0zxx6oc0beY)wZQfp&#*$OueRH-c@@~+^DqO= zDa3E)x(d*F3MR!AHceQw4;q3=Y!i73JQP*Hi(iSXXmiZDsF|hf#Ytu$HIR5hbgNxB zxfEk!=#fT=lp?Cupt&KGnCM6h7b%o299tQE3x;AF94n~+vk*k~a}DsF&NS}4JP3LX zMr1$M@bo!DU{(RzeFUNv0w1wiK4pgzKv-YIi2!)oWEu<$cBM(QS@0{4GFXEcYj{+u z_b1>mrWB8I3Z^S{$X=4*Pyzy_MpO@o6nSjlR|#;@;9=AWg}^c<9064Vlp=iBIZg3m z23z(mPbIV2d52rjx~1Y}i5;(ZDck&w$; z+4gEHz&+`vr%7jp4*GQia9QjbT^a!AR9p%I4PT7Yhr&SfpdN6UZ-GaDSRT?du=njh z$#~EJke*!<^G9k|``tQh*TEGiu1Js7{kAS+yPkUBBc)hB(5(w>r( nO`~>YOQPPOKIi$1{;$Sw4wof_k!PFg00000NkvXXu0mjf@!?S% literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/strawberry/ruby_cream.pal b/graphics/pokemon/alcremie/ruby_cream/normal.pal similarity index 57% rename from graphics/pokemon/alcremie/strawberry/ruby_cream.pal rename to graphics/pokemon/alcremie/ruby_cream/normal.pal index e95929cab..873d673e1 100644 --- a/graphics/pokemon/alcremie/strawberry/ruby_cream.pal +++ b/graphics/pokemon/alcremie/ruby_cream/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -248 248 248 -248 208 208 -200 152 184 -232 112 192 128 80 112 -248 208 208 -200 152 184 -248 208 208 -200 152 184 -248 208 208 +240 200 208 +232 112 192 200 152 184 +16 16 16 +248 248 248 +136 32 56 248 88 112 192 48 72 -136 32 56 +240 200 200 +200 144 184 +200 152 192 +240 200 208 +0 0 0 0 0 0 diff --git a/graphics/pokemon/alcremie/berry/shiny.pal b/graphics/pokemon/alcremie/ruby_cream/shiny.pal similarity index 72% rename from graphics/pokemon/alcremie/berry/shiny.pal rename to graphics/pokemon/alcremie/ruby_cream/shiny.pal index 1fb826a87..454ec33ff 100644 --- a/graphics/pokemon/alcremie/berry/shiny.pal +++ b/graphics/pokemon/alcremie/ruby_cream/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -216 216 216 -152 152 152 -128 128 128 -88 88 96 72 80 72 248 248 248 -168 176 176 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -0 120 200 -0 80 144 -0 40 104 +88 88 96 +128 128 128 16 16 16 +216 216 216 +136 32 56 +248 88 112 +192 48 72 +248 248 248 +168 176 176 +168 176 176 +152 152 152 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/ruby_swirl/back.png b/graphics/pokemon/alcremie/ruby_swirl/back.png new file mode 100644 index 0000000000000000000000000000000000000000..ae275b897dad76b2230070b90df594b451f7af00 GIT binary patch literal 691 zcmV;k0!;mhP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_NKi=l`1n{@V1R&t5D*ZUn3&ku*oYuF z_*ihjFi80L_^7b300000000000P8#>RsaA132;bRa{vGi!vFvd!vV){sAK>D0t`t+ zK~zY`?Ub>O+CUJ7p`f>w1t}8EQC}0Sp`wW6@k)`d0A+nel*VYY&yga9bA6=v`jZmB zMIi3>p)#|^W({6HK$MX%691=v{~6CR`3GwnQUzW;Jg%tjf^i**VSTUl!Rqtfpgt4Y z689c`A~n_F{nJskN`p}r2y80`ji2d5CF+$=Q-hATnx@J z?0`t;o(N4Pk=B7Pf(5Xdd@MqO<4|wMGSWDLv5W#O;=r2`B2XA25BvZ*EaJ@G3>q&MI z@LPi31U`VGNZgzLD`S_8d=QWqAZh?edm-}Pk94#~zC}evJ%$wVx)dkoab22!cIHMvUqN{%CV@7~!H#fD-9#-!hV2ME8 zUcWVEeK@Y}cJ3LcZQbq*Ihd_Et{ea@wsmoSSt$c!%bjJm!N3002ovPDHLkV1mE;Cq@7O literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/ruby_swirl/front.png b/graphics/pokemon/alcremie/ruby_swirl/front.png new file mode 100644 index 0000000000000000000000000000000000000000..cb99b49fa25fa85fcf1e37707ae94c4f200ddc1a GIT binary patch literal 753 zcmVPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_fM8Jgu)y%ZfY7+05D*af@X+}9_=q4l z_*ihjFi7~YxZrqz00000000000PC8)!~g&Q32;bRa{vGi!vFvd!vV){sAK>D0!m3l zK~zY`?UcQ1+dvq`rNPkA7t5C+o)YNpTq^?hB6KqC)`Cw^>c!mYH6dfbZnuU)YVWNR z`!9&K6@!=4Vp31OKdP^^RbSmppY{3iyk93-|5cPtP<6n`If^uE5?Yr?c<*Y6i_7zu z5Y!c6=isWEh?5H!q^gdvIUwLx0ydo?0E}1Fa3+vSUd_wg`5nn@7?Z{NOVNL^dc5~C z;PlffzAFJX>&IJ)zH%3v^?kD>VfB;&UA9=or9k|Rh1emLS8@C`DgyBnb3>4fg8ybN zivXPuKn<`&TE;E82X#RO=@8KXn9GZR^$=~Uv)^NXOjpm_LW z3D=)P1f~VxY=?liM&JVu%VzqJ1Bl*nKi~k@n^1z%$v(GHG=U zS{uW>h=OVh>FS>(Ipl!Em_C(VB6#HYwAMMGfdS9`mdiP|F=7aq9AFG#`_^QJFQ(gO zJ>+v^j1EAkm%az)c!U^Za#J(}nt_A9hecpygq4>7k8mByECR#0QMw%DF{^jV(cAc0g@%cv$O@h@0e%SH%6CtDULc#Fh_l;SoOz5q)$nRs#Q0H jCD6BOCH~_7o3gCmELHY;isX6400000NkvXXu0mjfPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_NKi=l`1n{@V1R&t5D*ZEAUOC~aKJD~ zsIah@n3&ku*Z=?k000000000004Oi?AOHXW32;bRa{vGi!vFvd!vV){sAK>D0trb( zK~zY`?Ub>O+CUJ7p`f>wMGjB_kgM#07|208%Gp(*x$DJ^DDn@(=3){G{2d$N{E05gkAgK4i@` zz}HwRM5r0k@?*L?V=B%!u^K*XA7&G8nIh$z!$fGu6 zO4my}+yCh(f1{A^4KQzShgKJ0FXd6f_vfJF$G<#aTvw#Hxb$9*N zl=b1Ty4%@j95;2hFXSLM^02Z1wAj?e`DLXHq$zur`GVJF0mYYuLo6OP25|nZFnv|# z`6WRB literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alcremie/salted_cream/front.png b/graphics/pokemon/alcremie/salted_cream/front.png new file mode 100644 index 0000000000000000000000000000000000000000..08a75d2e8eb33146d4343a1a43edd6fea7a301e0 GIT binary patch literal 804 zcmV+<1Ka$GP)Sr9+-j4)bnIExHb~rET3D+Q(JMW@YJXhNa@-JMEBqoQidDJ zofYY2jMPf-&-Fb^8R`$ZSAEy#r|12=YqkDIB^-ir4(Kop^5Tp`cZ5Xv?hN6L*Z|^l zNjQVRoU!P50cg`~;Rrw=XapR3LIAjE%HbZshQ6BBsk3WR$gn5#<)^BCvADen3*hqS zBD<~u*2~)`in
*Y;#oEMA5T>%XFe38`x*%zK-g;ZZ<+2_0pWOqDBL30Yxo0+Zx zbe4cgFojJM)a-)>U}D=uo&XO-6>y_hA}!jSa4u?Q*>!uRDfduBK^Js_)3o&cU~R@eF7uWZ!38G zl_GGg0G$B>;Szz5*epM>T?rs;Afi|RJg!p>hWVS)Bs$Fh5rrwNKuk0|DAoTHa2QjH zhdBk)lR988iN7lWzEWeVheV1zvhS+|w9(*x+zo`lGNv2>RRWYEeA7Lg@M4BNK0?0K z#&idShV~w~8xo?FDs|D8D8?@8Atr&TlC5$`FfI{X^d<<%s*c3_1VSPqm$kC()mDIe z(oIj39t$1x>jvPm*fY8`0M4Pf6a*T+7-s;5f#!Za&}N#$81SD?5eeOC9|wi(;>)jc08#pJ931p1{?2Qvb_9L)? zmrlsJ9RZziy%x^2B0B=UH9P`P6pef1UYVRS3NN51py&a}osh{0n3MMC;{fZYas=>~ z^H+rf%vq`jfFk_h$wNS_hA!}#W5QC}le~`w=pLYFnJ(BmvFC7)f9FyR0J4lbtE=h! zP8>335(JB#%`^aXMV~RJ&x<+R|8uLpqR{OPaM6DqES`Y9Qd@=7$vP?m3i{NiJ|Y6t zu(`Qu_Q~eC1)L*L$pf&WtfyC-FFX5;?Xnv7g&fpUU2QA?EtXY#xU5`)GG))QI~P^m zLi;Thkm=K<0V?}GF?~~a^)VH zIuBUhb{2_WTX*JndBAKnOMp(e3clndEW=>N(I-!Xd9co|a}@-^O$;2eC4Ocz;$Lqf z?2zx{SNJs>u?lYO2n@y{_#Ce58G!GH3(~*{jKOZRyW%zwD;}cW0Jfl6z-b=PC>e9Z z7|q$G?li54K!bqgP}(nOB{qa@Pj9?0MW56RRU;YVbzAq&+>l{c|8MgmUj3+5zEafRT4uzui=85n7 zDL}^p?@wDcrP#)nAs|zLl!9His%5+}hh27pd}@sC1OzwZ`@kGi2q|T13SFUTIp~`h z0$Zs{X(=F%pp14m2&k-&#PuXR{)IqZY(w^07RR`e*f4T=03NYJ8XF<=83kO_uA^N zJ8XMz*sHJ!pGR6`FU(sFXS=oK9R*5s=cS-uJN} zK((8jm}VdBA6vjB0+~DkYsz|ly?=kS&p52Ic3;RrtAS002ovPDHLkV1gjpD}(?5 diff --git a/graphics/pokemon/alcremie/strawberry/front.png b/graphics/pokemon/alcremie/strawberry/front.png deleted file mode 100644 index fe7872d2d35ab8fe130199cc718072ac92523d32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 723 zcmV;^0xbQBP)N*>LDN{e~9F;xf{ry zgo2mNQG1$0FkX}T4`hoLdkaA}2ttJM-31TsN4$&A_4)C~&cXcOI z8}{UK{yFdO%&u?k6ga&lLxKZRjxww6Tf3ER<{+4&wQCsIga?@7X06S5IT(wTS!MBo@4JIMic7g+pZ z3h+_XDV}+D5n>kzi$6_a|6YthJqMg$B4E!E_=&^vS~$r7GQ4D#!vOXdF$EHiuQHoB z56AB;JBBH+HHC*tz4#L_!cZx0n*vBzQ#X7o$CC^&R_a*LmekC&j>0g^096clf82H% z!!|Y?0hIxilKiUOsNs!ib@>tUnK3pKkit&x1NUqxl~S20sv1qlL*K?Cuu-~_l?LKT z##wibfX@3!d~bp+HJG~4PG(Iyz;mKyPgB%WALz3Z;50pFOeq13MtV~aDEVTHSC9r! zJ}3sNem?;o^q&SLz^Lyh;)4=Ec6j3V4})RhcWd~=c7Wo6?D$2$ZPoXOo!~V;3qDOvT8fyN#NT9>W5sw*1(68CqVzxe;EegVq<`_3(xUl0HQ002ovPDHLk FV1hdrO!fc( diff --git a/graphics/pokemon/alcremie/strawberry/salted_cream.pal b/graphics/pokemon/alcremie/strawberry/salted_cream.pal deleted file mode 100644 index af57499a4..000000000 --- a/graphics/pokemon/alcremie/strawberry/salted_cream.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -248 248 248 -232 232 248 -176 176 184 -112 208 200 -88 88 96 -232 232 248 -176 176 184 -232 232 248 -176 176 184 -232 232 248 -176 176 184 -248 88 112 -192 48 72 -136 32 56 -0 0 0 diff --git a/include/constants/species.h b/include/constants/species.h index 1214538fc..5a410aa5b 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1312,62 +1312,6 @@ #define SPECIES_ALCREMIE_RUBY_SWIRL FORMS_START + 296 #define SPECIES_ALCREMIE_CARAMEL_SWIRL FORMS_START + 297 #define SPECIES_ALCREMIE_RAINBOW_SWIRL FORMS_START + 298 -/* -#define SPECIES_ALCREMIE_BERRY_VANILLA FORMS_START + 299 -#define SPECIES_ALCREMIE_BERRY_RUBY_CREAM FORMS_START + 300 -#define SPECIES_ALCREMIE_BERRY_MATCHA_CREAM FORMS_START + 301 -#define SPECIES_ALCREMIE_BERRY_MINT_CREAM FORMS_START + 302 -#define SPECIES_ALCREMIE_BERRY_LEMON_CREAM FORMS_START + 303 -#define SPECIES_ALCREMIE_BERRY_SALTED_CREAM FORMS_START + 304 -#define SPECIES_ALCREMIE_BERRY_RUBY_SWIRL FORMS_START + 305 -#define SPECIES_ALCREMIE_BERRY_CARAMEL_SWIRL FORMS_START + 306 -#define SPECIES_ALCREMIE_BERRY_RAINBOW_SWIRL FORMS_START + 307 -#define SPECIES_ALCREMIE_CLOVER_VANILLA FORMS_START + 308 -#define SPECIES_ALCREMIE_CLOVER_RUBY_CREAM FORMS_START + 309 -#define SPECIES_ALCREMIE_CLOVER_MATCHA_CREAM FORMS_START + 310 -#define SPECIES_ALCREMIE_CLOVER_MINT_CREAM FORMS_START + 311 -#define SPECIES_ALCREMIE_CLOVER_LEMON_CREAM FORMS_START + 312 -#define SPECIES_ALCREMIE_CLOVER_SALTED_CREAM FORMS_START + 313 -#define SPECIES_ALCREMIE_CLOVER_RUBY_SWIRL FORMS_START + 314 -#define SPECIES_ALCREMIE_CLOVER_CARAMEL_SWIRL FORMS_START + 315 -#define SPECIES_ALCREMIE_CLOVER_RAINBOW_SWIRL FORMS_START + 316 -#define SPECIES_ALCREMIE_FLOWER_VANILLA FORMS_START + 317 -#define SPECIES_ALCREMIE_FLOWER_RUBY_CREAM FORMS_START + 318 -#define SPECIES_ALCREMIE_FLOWER_MATCHA_CREAM FORMS_START + 319 -#define SPECIES_ALCREMIE_FLOWER_MINT_CREAM FORMS_START + 320 -#define SPECIES_ALCREMIE_FLOWER_LEMON_CREAM FORMS_START + 321 -#define SPECIES_ALCREMIE_FLOWER_SALTED_CREAM FORMS_START + 322 -#define SPECIES_ALCREMIE_FLOWER_RUBY_SWIRL FORMS_START + 323 -#define SPECIES_ALCREMIE_FLOWER_CARAMEL_SWIRL FORMS_START + 324 -#define SPECIES_ALCREMIE_FLOWER_RAINBOW_SWIRL FORMS_START + 325 -#define SPECIES_ALCREMIE_LOVE_VANILLA FORMS_START + 326 -#define SPECIES_ALCREMIE_LOVE_RUBY_CREAM FORMS_START + 327 -#define SPECIES_ALCREMIE_LOVE_MATCHA_CREAM FORMS_START + 328 -#define SPECIES_ALCREMIE_LOVE_MINT_CREAM FORMS_START + 329 -#define SPECIES_ALCREMIE_LOVE_LEMON_CREAM FORMS_START + 330 -#define SPECIES_ALCREMIE_LOVE_SALTED_CREAM FORMS_START + 331 -#define SPECIES_ALCREMIE_LOVE_RUBY_SWIRL FORMS_START + 332 -#define SPECIES_ALCREMIE_LOVE_CARAMEL_SWIRL FORMS_START + 333 -#define SPECIES_ALCREMIE_LOVE_RAINBOW_SWIRL FORMS_START + 334 -#define SPECIES_ALCREMIE_RIBBON_VANILLA FORMS_START + 335 -#define SPECIES_ALCREMIE_RIBBON_RUBY_CREAM FORMS_START + 336 -#define SPECIES_ALCREMIE_RIBBON_MATCHA_CREAM FORMS_START + 337 -#define SPECIES_ALCREMIE_RIBBON_MINT_CREAM FORMS_START + 338 -#define SPECIES_ALCREMIE_RIBBON_LEMON_CREAM FORMS_START + 339 -#define SPECIES_ALCREMIE_RIBBON_SALTED_CREAM FORMS_START + 340 -#define SPECIES_ALCREMIE_RIBBON_RUBY_SWIRL FORMS_START + 341 -#define SPECIES_ALCREMIE_RIBBON_CARAMEL_SWIRL FORMS_START + 342 -#define SPECIES_ALCREMIE_RIBBON_RAINBOW_SWIRL FORMS_START + 343 -#define SPECIES_ALCREMIE_STAR_VANILLA FORMS_START + 317 -#define SPECIES_ALCREMIE_STAR_RUBY_CREAM FORMS_START + 318 -#define SPECIES_ALCREMIE_STAR_MATCHA_CREAM FORMS_START + 319 -#define SPECIES_ALCREMIE_STAR_MINT_CREAM FORMS_START + 320 -#define SPECIES_ALCREMIE_STAR_LEMON_CREAM FORMS_START + 321 -#define SPECIES_ALCREMIE_STAR_SALTED_CREAM FORMS_START + 322 -#define SPECIES_ALCREMIE_STAR_RUBY_SWIRL FORMS_START + 323 -#define SPECIES_ALCREMIE_STAR_CARAMEL_SWIRL FORMS_START + 324 -#define SPECIES_ALCREMIE_STAR_RAINBOW_SWIRL FORMS_START + 325 -*/ // Eiscue #define SPECIES_EISCUE_NOICE_FACE FORMS_START + 299 diff --git a/include/graphics.h b/include/graphics.h index 8e13b8464..520df674f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -1155,12 +1155,14 @@ extern const u32 gMonFrontPic_MagearnaOriginalColor[]; extern const u32 gMonFrontPic_CramorantGulping[]; extern const u32 gMonFrontPic_CramorantGorging[]; extern const u32 gMonFrontPic_ToxtricityLowKey[]; -//extern const u32 gMonFrontPic_AlcremieBerry[]; -//extern const u32 gMonFrontPic_AlcremieClover[]; -//extern const u32 gMonFrontPic_AlcremieFlower[]; -//extern const u32 gMonFrontPic_AlcremieLove[]; -//extern const u32 gMonFrontPic_AlcremieRibbon[]; -//extern const u32 gMonFrontPic_AlcremieStar[]; +extern const u32 gMonFrontPic_AlcremieRubyCream[]; +extern const u32 gMonFrontPic_AlcremieMatchaCream[]; +extern const u32 gMonFrontPic_AlcremieMintCream[]; +extern const u32 gMonFrontPic_AlcremieLemonCream[]; +extern const u32 gMonFrontPic_AlcremieSaltedCream[]; +extern const u32 gMonFrontPic_AlcremieRubySwirl[]; +extern const u32 gMonFrontPic_AlcremieCaramelSwirl[]; +extern const u32 gMonFrontPic_AlcremieRainbowSwirl[]; extern const u32 gMonFrontPic_EiscueNoiceFace[]; extern const u32 gMonFrontPic_IndeedeeFemale[]; extern const u32 gMonFrontPic_MorpekoHangry[]; @@ -2293,12 +2295,14 @@ extern const u32 gMonBackPic_MagearnaOriginalColor[]; extern const u32 gMonBackPic_CramorantGulping[]; extern const u32 gMonBackPic_CramorantGorging[]; extern const u32 gMonBackPic_ToxtricityLowKey[]; -//extern const u32 gMonBackPic_AlcremieBerry[]; -//extern const u32 gMonBackPic_AlcremieClover[]; -//extern const u32 gMonBackPic_AlcremieFlower[]; -//extern const u32 gMonBackPic_AlcremieLove[]; -//extern const u32 gMonBackPic_AlcremieRibbon[]; -//extern const u32 gMonBackPic_AlcremieStar[]; +extern const u32 gMonBackPic_AlcremieRubyCream[]; +extern const u32 gMonBackPic_AlcremieMatchaCream[]; +extern const u32 gMonBackPic_AlcremieMintCream[]; +extern const u32 gMonBackPic_AlcremieLemonCream[]; +extern const u32 gMonBackPic_AlcremieSaltedCream[]; +extern const u32 gMonBackPic_AlcremieRubySwirl[]; +extern const u32 gMonBackPic_AlcremieCaramelSwirl[]; +extern const u32 gMonBackPic_AlcremieRainbowSwirl[]; extern const u32 gMonBackPic_EiscueNoiceFace[]; extern const u32 gMonBackPic_IndeedeeFemale[]; extern const u32 gMonBackPic_MorpekoHangry[]; @@ -3463,62 +3467,6 @@ extern const u32 gMonPalette_AlcremieSaltedCream[]; extern const u32 gMonPalette_AlcremieRubySwirl[]; extern const u32 gMonPalette_AlcremieCaramelSwirl[]; extern const u32 gMonPalette_AlcremieRainbowSwirl[]; -/* -extern const u32 gMonPalette_AlcremieBerryVanilla[]; -extern const u32 gMonPalette_AlcremieBerryRubyCream[]; -extern const u32 gMonPalette_AlcremieBerryMatchaCream[]; -extern const u32 gMonPalette_AlcremieBerryMintCream[]; -extern const u32 gMonPalette_AlcremieBerryLemonCream[]; -extern const u32 gMonPalette_AlcremieBerrySaltedCream[]; -extern const u32 gMonPalette_AlcremieBerryRubySwirl[]; -extern const u32 gMonPalette_AlcremieBerryCaramelSwirl[]; -extern const u32 gMonPalette_AlcremieBerryRainbowSwirl[]; -extern const u32 gMonPalette_AlcremieCloverVanilla[]; -extern const u32 gMonPalette_AlcremieCloverRubyCream[]; -extern const u32 gMonPalette_AlcremieCloverMatchaCream[]; -extern const u32 gMonPalette_AlcremieCloverMintCream[]; -extern const u32 gMonPalette_AlcremieCloverLemonCream[]; -extern const u32 gMonPalette_AlcremieCloverSaltedCream[]; -extern const u32 gMonPalette_AlcremieCloverRubySwirl[]; -extern const u32 gMonPalette_AlcremieCloverCaramelSwirl[]; -extern const u32 gMonPalette_AlcremieCloverRainbowSwirl[]; -extern const u32 gMonPalette_AlcremieFlowerVanilla[]; -extern const u32 gMonPalette_AlcremieFlowerRubyCream[]; -extern const u32 gMonPalette_AlcremieFlowerMatchaCream[]; -extern const u32 gMonPalette_AlcremieFlowerMintCream[]; -extern const u32 gMonPalette_AlcremieFlowerLemonCream[]; -extern const u32 gMonPalette_AlcremieFlowerSaltedCream[]; -extern const u32 gMonPalette_AlcremieFlowerRubySwirl[]; -extern const u32 gMonPalette_AlcremieFlowerCaramelSwirl[]; -extern const u32 gMonPalette_AlcremieFlowerRainbowSwirl[]; -extern const u32 gMonPalette_AlcremieLoveVanilla[]; -extern const u32 gMonPalette_AlcremieLoveRubyCream[]; -extern const u32 gMonPalette_AlcremieLoveMatchaCream[]; -extern const u32 gMonPalette_AlcremieLoveMintCream[]; -extern const u32 gMonPalette_AlcremieLoveLemonCream[]; -extern const u32 gMonPalette_AlcremieLoveSaltedCream[]; -extern const u32 gMonPalette_AlcremieLoveRubySwirl[]; -extern const u32 gMonPalette_AlcremieLoveCaramelSwirl[]; -extern const u32 gMonPalette_AlcremieLoveRainbowSwirl[]; -extern const u32 gMonPalette_AlcremieRibbonVanilla[]; -extern const u32 gMonPalette_AlcremieRibbonRubyCream[]; -extern const u32 gMonPalette_AlcremieRibbonMatchaCream[]; -extern const u32 gMonPalette_AlcremieRibbonMintCream[]; -extern const u32 gMonPalette_AlcremieRibbonLemonCream[]; -extern const u32 gMonPalette_AlcremieRibbonSaltedCream[]; -extern const u32 gMonPalette_AlcremieRibbonRubySwirl[]; -extern const u32 gMonPalette_AlcremieRibbonCaramelSwirl[]; -extern const u32 gMonPalette_AlcremieRibbonRainbowSwirl[]; -extern const u32 gMonPalette_AlcremieStarVanilla[]; -extern const u32 gMonPalette_AlcremieStarRubyCream[]; -extern const u32 gMonPalette_AlcremieStarMatchaCream[]; -extern const u32 gMonPalette_AlcremieStarMintCream[]; -extern const u32 gMonPalette_AlcremieStarLemonCream[]; -extern const u32 gMonPalette_AlcremieStarSaltedCream[]; -extern const u32 gMonPalette_AlcremieStarRubySwirl[]; -extern const u32 gMonPalette_AlcremieStarCaramelSwirl[]; -extern const u32 gMonPalette_AlcremieStarRainbowSwirl[]; -*/ extern const u32 gMonPalette_EiscueNoiceFace[]; extern const u32 gMonPalette_IndeedeeFemale[]; extern const u32 gMonPalette_MorpekoHangry[]; @@ -4402,14 +4350,6 @@ extern const u32 gMonShinyPalette_MrRime[]; extern const u32 gMonShinyPalette_Runerigus[]; extern const u32 gMonShinyPalette_Milcery[]; extern const u32 gMonShinyPalette_Alcremie[]; -/* -extern const u32 gMonShinyPalette_AlcremieBerry[]; -extern const u32 gMonShinyPalette_AlcremieClover[]; -extern const u32 gMonShinyPalette_AlcremieFlower[]; -extern const u32 gMonShinyPalette_AlcremieLove[]; -extern const u32 gMonShinyPalette_AlcremieRibbon[]; -extern const u32 gMonShinyPalette_AlcremieStar[]; -*/ extern const u32 gMonShinyPalette_Falinks[]; extern const u32 gMonShinyPalette_Pincurchin[]; extern const u32 gMonShinyPalette_Snom[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 20e8d0a4c..25c9e2534 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -869,7 +869,7 @@ const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/fron const u32 gMonFrontPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/front.4bpp.lz"); const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/front.4bpp.lz"); -const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/front.4bpp.lz"); +const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/front.4bpp.lz"); const u32 gMonFrontPic_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/front.4bpp.lz"); const u32 gMonFrontPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/front.4bpp.lz"); const u32 gMonFrontPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/front.4bpp.lz"); @@ -1118,12 +1118,14 @@ const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/ma const u32 gMonFrontPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/front.4bpp.lz"); const u32 gMonFrontPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/front.4bpp.lz"); const u32 gMonFrontPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/front.4bpp.lz"); -//const u32 gMonFrontPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/front.4bpp.lz"); -//const u32 gMonFrontPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/front.4bpp.lz"); -//const u32 gMonFrontPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/front.4bpp.lz"); -//const u32 gMonFrontPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/front.4bpp.lz"); -//const u32 gMonFrontPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/front.4bpp.lz"); -//const u32 gMonFrontPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/ruby_cream/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/matcha_cream/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/mint_cream/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/lemon_cream/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/salted_cream/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ruby_swirl/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/caramel_swirl/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/rainbow_swirl/front.4bpp.lz"); const u32 gMonFrontPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/front.4bpp.lz"); const u32 gMonFrontPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/front.4bpp.lz"); const u32 gMonFrontPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/front.4bpp.lz"); @@ -2007,7 +2009,7 @@ const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/back. const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/back.4bpp.lz"); const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/back.4bpp.lz"); -const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/back.4bpp.lz"); +const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/back.4bpp.lz"); const u32 gMonBackPic_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/back.4bpp.lz"); const u32 gMonBackPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/back.4bpp.lz"); const u32 gMonBackPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/back.4bpp.lz"); @@ -2256,12 +2258,14 @@ const u32 gMonBackPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/mag const u32 gMonBackPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/back.4bpp.lz"); const u32 gMonBackPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/back.4bpp.lz"); const u32 gMonBackPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/back.4bpp.lz"); -//const u32 gMonBackPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/back.4bpp.lz"); -//const u32 gMonBackPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/back.4bpp.lz"); -//const u32 gMonBackPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/back.4bpp.lz"); -//const u32 gMonBackPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/back.4bpp.lz"); -//const u32 gMonBackPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/back.4bpp.lz"); -//const u32 gMonBackPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/ruby_cream/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/matcha_cream/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/mint_cream/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/lemon_cream/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/salted_cream/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ruby_swirl/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/caramel_swirl/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/rainbow_swirl/back.4bpp.lz"); const u32 gMonBackPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/back.4bpp.lz"); const u32 gMonBackPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/back.4bpp.lz"); const u32 gMonBackPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/back.4bpp.lz"); @@ -3143,7 +3147,7 @@ const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/norma const u32 gMonPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/normal.gbapal.lz"); const u32 gMonPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/normal.gbapal.lz"); -const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/vanilla.gbapal.lz"); +const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/normal.gbapal.lz"); const u32 gMonPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/normal.gbapal.lz"); const u32 gMonPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/normal.gbapal.lz"); const u32 gMonPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/normal.gbapal.lz"); @@ -3418,70 +3422,14 @@ const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/mag const u32 gMonPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/normal.gbapal.lz"); const u32 gMonPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/normal.gbapal.lz"); const u32 gMonPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/normal.gbapal.lz"); -const u32 gMonPalette_AlcremieRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/matcha_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/mint_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/lemon_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/salted_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/ruby_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/caramel_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/rainbow_swirl.gbapal.lz"); -/* -const u32 gMonPalette_AlcremieBerryVanilla[] = INCBIN_U32("graphics/pokemon/alcremie/berry/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieBerryRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieBerryMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/matcha_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieBerryMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/mint_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieBerryLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/lemon_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieBerrySaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/salted_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieBerryRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/ruby_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieBerryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/caramel_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieBerryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/rainbow_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverVanilla[] = INCBIN_U32("graphics/pokemon/alcremie/clover/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/matcha_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/mint_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/lemon_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/salted_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/ruby_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/caramel_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieCloverRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/rainbow_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerVanilla[] = INCBIN_U32("graphics/pokemon/alcremie/flower/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/matcha_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/mint_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/lemon_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/salted_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/ruby_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/caramel_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieFlowerRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/rainbow_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveVanilla[] = INCBIN_U32("graphics/pokemon/alcremie/love/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/matcha_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/mint_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/lemon_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/salted_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/ruby_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/caramel_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieLoveRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/rainbow_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonVanilla[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/matcha_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/mint_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/lemon_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/salted_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ruby_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/caramel_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieRibbonRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/rainbow_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieStarVanilla[] = INCBIN_U32("graphics/pokemon/alcremie/star/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieStarRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/ruby_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieStarMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/matcha_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieStarMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/mint_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieStarLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/lemon_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieStarSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/salted_cream.gbapal.lz"); -const u32 gMonPalette_AlcremieStarRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/ruby_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieStarCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/caramel_swirl.gbapal.lz"); -const u32 gMonPalette_AlcremieStarRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/rainbow_swirl.gbapal.lz"); -*/ +const u32 gMonPalette_AlcremieRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/ruby_cream/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/matcha_cream/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/mint_cream/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/lemon_cream/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/salted_cream/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ruby_swirl/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/caramel_swirl/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/rainbow_swirl/normal.gbapal.lz"); const u32 gMonPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/normal.gbapal.lz"); const u32 gMonPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/normal.gbapal.lz"); const u32 gMonPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/normal.gbapal.lz"); @@ -4364,7 +4312,7 @@ const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/ const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/shiny.gbapal.lz"); const u32 gMonShinyPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/shiny.gbapal.lz"); const u32 gMonShinyPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/shiny.gbapal.lz"); @@ -4633,14 +4581,14 @@ const u32 gMonShinyPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemo const u32 gMonShinyPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/shiny.gbapal.lz"); const u32 gMonShinyPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/shiny.gbapal.lz"); const u32 gMonShinyPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/shiny.gbapal.lz"); -/* -const u32 gMonShinyPalette_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/shiny.gbapal.lz"); -const u32 gMonShinyPalette_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/shiny.gbapal.lz"); -const u32 gMonShinyPalette_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/shiny.gbapal.lz"); -const u32 gMonShinyPalette_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/shiny.gbapal.lz"); -const u32 gMonShinyPalette_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/shiny.gbapal.lz"); -const u32 gMonShinyPalette_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/shiny.gbapal.lz"); -*/ +const u32 gMonShinyPalette_AlcremieRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/ruby_cream/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/matcha_cream/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/mint_cream/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/lemon_cream/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/salted_cream/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ruby_swirl/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/caramel_swirl/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/rainbow_swirl/shiny.gbapal.lz"); const u32 gMonShinyPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/shiny.gbapal.lz"); const u32 gMonShinyPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/shiny.gbapal.lz"); const u32 gMonShinyPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/shiny.gbapal.lz"); diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index e6dc8070f..a70aa13c5 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1244,70 +1244,14 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(POLTEAGEIST_ANTIQUE, gMonBackPic_Polteageist), - SPECIES_SPRITE(ALCREMIE_RUBY_CREAM, gMonBackPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_MATCHA_CREAM, gMonBackPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_MINT_CREAM, gMonBackPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_LEMON_CREAM, gMonBackPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_SALTED_CREAM, gMonBackPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_RUBY_SWIRL, gMonBackPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_CARAMEL_SWIRL, gMonBackPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_RAINBOW_SWIRL, gMonBackPic_Alcremie), -/* - SPECIES_SPRITE(ALCREMIE_BERRY_VANILLA, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_RUBY_CREAM, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_MATCHA_CREAM, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_MINT_CREAM, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_LEMON_CREAM, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_SALTED_CREAM, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_RUBY_SWIRL, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_CARAMEL_SWIRL, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_RAINBOW_SWIRL, gMonBackPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_CLOVER_VANILLA, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_RUBY_CREAM, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_MATCHA_CREAM, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_MINT_CREAM, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_LEMON_CREAM, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_SALTED_CREAM, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_RUBY_SWIRL, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_CARAMEL_SWIRL, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_RAINBOW_SWIRL, gMonBackPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_FLOWER_VANILLA, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_RUBY_CREAM, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_MATCHA_CREAM, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_MINT_CREAM, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_LEMON_CREAM, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_SALTED_CREAM, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_RUBY_SWIRL, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_CARAMEL_SWIRL, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_RAINBOW_SWIRL, gMonBackPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_LOVE_VANILLA, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_RUBY_CREAM, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_MATCHA_CREAM, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_MINT_CREAM, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_LEMON_CREAM, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_SALTED_CREAM, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_RUBY_SWIRL, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_CARAMEL_SWIRL, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_RAINBOW_SWIRL, gMonBackPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_RIBBON_VANILLA, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_RUBY_CREAM, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_MATCHA_CREAM, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_MINT_CREAM, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_LEMON_CREAM, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_SALTED_CREAM, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_RUBY_SWIRL, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_CARAMEL_SWIRL, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_RAINBOW_SWIRL, gMonBackPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_STAR_VANILLA, gMonBackPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_RUBY_CREAM, gMonBackPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_MATCHA_CREAM, gMonBackPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_MINT_CREAM, gMonBackPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_LEMON_CREAM, gMonBackPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_SALTED_CREAM, gMonBackPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_RUBY_SWIRL, gMonBackPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_CARAMEL_SWIRL, gMonBackPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_RAINBOW_SWIRL, gMonBackPic_AlcremieStar), -*/ + SPECIES_SPRITE(ALCREMIE_RUBY_CREAM, gMonBackPic_AlcremieRubyCream), + SPECIES_SPRITE(ALCREMIE_MATCHA_CREAM, gMonBackPic_AlcremieMatchaCream), + SPECIES_SPRITE(ALCREMIE_MINT_CREAM, gMonBackPic_AlcremieMintCream), + SPECIES_SPRITE(ALCREMIE_LEMON_CREAM, gMonBackPic_AlcremieLemonCream), + SPECIES_SPRITE(ALCREMIE_SALTED_CREAM, gMonBackPic_AlcremieSaltedCream), + SPECIES_SPRITE(ALCREMIE_RUBY_SWIRL, gMonBackPic_AlcremieRubySwirl), + SPECIES_SPRITE(ALCREMIE_CARAMEL_SWIRL, gMonBackPic_AlcremieCaramelSwirl), + SPECIES_SPRITE(ALCREMIE_RAINBOW_SWIRL, gMonBackPic_AlcremieRainbowSwirl), SPECIES_SPRITE(EISCUE_NOICE_FACE, gMonBackPic_EiscueNoiceFace), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 8876edf21..0bc35542c 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1244,70 +1244,14 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(POLTEAGEIST_ANTIQUE, gMonFrontPic_Polteageist), - SPECIES_SPRITE(ALCREMIE_RUBY_CREAM, gMonFrontPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_MATCHA_CREAM, gMonFrontPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_MINT_CREAM, gMonFrontPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_LEMON_CREAM, gMonFrontPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_SALTED_CREAM, gMonFrontPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_RUBY_SWIRL, gMonFrontPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_CARAMEL_SWIRL, gMonFrontPic_Alcremie), - SPECIES_SPRITE(ALCREMIE_RAINBOW_SWIRL, gMonFrontPic_Alcremie), -/* - SPECIES_SPRITE(ALCREMIE_BERRY_VANILLA, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_RUBY_CREAM, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_MATCHA_CREAM, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_MINT_CREAM, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_LEMON_CREAM, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_SALTED_CREAM, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_RUBY_SWIRL, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_CARAMEL_SWIRL, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_BERRY_RAINBOW_SWIRL, gMonFrontPic_AlcremieBerry), - SPECIES_SPRITE(ALCREMIE_CLOVER_VANILLA, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_RUBY_CREAM, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_MATCHA_CREAM, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_MINT_CREAM, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_LEMON_CREAM, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_SALTED_CREAM, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_RUBY_SWIRL, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_CARAMEL_SWIRL, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_CLOVER_RAINBOW_SWIRL, gMonFrontPic_AlcremieClover), - SPECIES_SPRITE(ALCREMIE_FLOWER_VANILLA, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_RUBY_CREAM, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_MATCHA_CREAM, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_MINT_CREAM, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_LEMON_CREAM, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_SALTED_CREAM, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_RUBY_SWIRL, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_CARAMEL_SWIRL, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_FLOWER_RAINBOW_SWIRL, gMonFrontPic_AlcremieFlower), - SPECIES_SPRITE(ALCREMIE_LOVE_VANILLA, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_RUBY_CREAM, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_MATCHA_CREAM, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_MINT_CREAM, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_LEMON_CREAM, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_SALTED_CREAM, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_RUBY_SWIRL, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_CARAMEL_SWIRL, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_LOVE_RAINBOW_SWIRL, gMonFrontPic_AlcremieLove), - SPECIES_SPRITE(ALCREMIE_RIBBON_VANILLA, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_RUBY_CREAM, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_MATCHA_CREAM, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_MINT_CREAM, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_LEMON_CREAM, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_SALTED_CREAM, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_RUBY_SWIRL, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_CARAMEL_SWIRL, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_RIBBON_RAINBOW_SWIRL, gMonFrontPic_AlcremieRibbon), - SPECIES_SPRITE(ALCREMIE_STAR_VANILLA, gMonFrontPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_RUBY_CREAM, gMonFrontPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_MATCHA_CREAM, gMonFrontPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_MINT_CREAM, gMonFrontPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_LEMON_CREAM, gMonFrontPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_SALTED_CREAM, gMonFrontPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_RUBY_SWIRL, gMonFrontPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_CARAMEL_SWIRL, gMonFrontPic_AlcremieStar), - SPECIES_SPRITE(ALCREMIE_STAR_RAINBOW_SWIRL, gMonFrontPic_AlcremieStar), -*/ + SPECIES_SPRITE(ALCREMIE_RUBY_CREAM, gMonFrontPic_AlcremieRubyCream), + SPECIES_SPRITE(ALCREMIE_MATCHA_CREAM, gMonFrontPic_AlcremieMatchaCream), + SPECIES_SPRITE(ALCREMIE_MINT_CREAM, gMonFrontPic_AlcremieMintCream), + SPECIES_SPRITE(ALCREMIE_LEMON_CREAM, gMonFrontPic_AlcremieLemonCream), + SPECIES_SPRITE(ALCREMIE_SALTED_CREAM, gMonFrontPic_AlcremieSaltedCream), + SPECIES_SPRITE(ALCREMIE_RUBY_SWIRL, gMonFrontPic_AlcremieRubySwirl), + SPECIES_SPRITE(ALCREMIE_CARAMEL_SWIRL, gMonFrontPic_AlcremieCaramelSwirl), + SPECIES_SPRITE(ALCREMIE_RAINBOW_SWIRL, gMonFrontPic_AlcremieRainbowSwirl), SPECIES_SPRITE(EISCUE_NOICE_FACE, gMonFrontPic_EiscueNoiceFace), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index bd338717f..59e3d918b 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1252,62 +1252,6 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ALCREMIE_RUBY_SWIRL, gMonPalette_AlcremieRubySwirl), SPECIES_PAL(ALCREMIE_CARAMEL_SWIRL, gMonPalette_AlcremieCaramelSwirl), SPECIES_PAL(ALCREMIE_RAINBOW_SWIRL, gMonPalette_AlcremieRainbowSwirl), -/* - SPECIES_PAL(ALCREMIE_BERRY_VANILLA, gMonPalette_AlcremieBerryVanilla), - SPECIES_PAL(ALCREMIE_BERRY_RUBY_CREAM, gMonPalette_AlcremieBerryRubyCream), - SPECIES_PAL(ALCREMIE_BERRY_MATCHA_CREAM, gMonPalette_AlcremieBerryMatchaCream), - SPECIES_PAL(ALCREMIE_BERRY_MINT_CREAM, gMonPalette_AlcremieBerryMintCream), - SPECIES_PAL(ALCREMIE_BERRY_LEMON_CREAM, gMonPalette_AlcremieBerryLemonCream), - SPECIES_PAL(ALCREMIE_BERRY_SALTED_CREAM, gMonPalette_AlcremieBerrySaltedCream), - SPECIES_PAL(ALCREMIE_BERRY_RUBY_SWIRL, gMonPalette_AlcremieBerryRubySwirl), - SPECIES_PAL(ALCREMIE_BERRY_CARAMEL_SWIRL, gMonPalette_AlcremieBerryCaramelSwirl), - SPECIES_PAL(ALCREMIE_BERRY_RAINBOW_SWIRL, gMonPalette_AlcremieBerryRainbowSwirl), - SPECIES_PAL(ALCREMIE_CLOVER_VANILLA, gMonPalette_AlcremieCloverVanilla), - SPECIES_PAL(ALCREMIE_CLOVER_RUBY_CREAM, gMonPalette_AlcremieCloverRubyCream), - SPECIES_PAL(ALCREMIE_CLOVER_MATCHA_CREAM, gMonPalette_AlcremieCloverMatchaCream), - SPECIES_PAL(ALCREMIE_CLOVER_MINT_CREAM, gMonPalette_AlcremieCloverMintCream), - SPECIES_PAL(ALCREMIE_CLOVER_LEMON_CREAM, gMonPalette_AlcremieCloverLemonCream), - SPECIES_PAL(ALCREMIE_CLOVER_SALTED_CREAM, gMonPalette_AlcremieCloverSaltedCream), - SPECIES_PAL(ALCREMIE_CLOVER_RUBY_SWIRL, gMonPalette_AlcremieCloverRubySwirl), - SPECIES_PAL(ALCREMIE_CLOVER_CARAMEL_SWIRL, gMonPalette_AlcremieCloverCaramelSwirl), - SPECIES_PAL(ALCREMIE_CLOVER_RAINBOW_SWIRL, gMonPalette_AlcremieCloverRainbowSwirl), - SPECIES_PAL(ALCREMIE_FLOWER_VANILLA, gMonPalette_AlcremieFlowerVanilla), - SPECIES_PAL(ALCREMIE_FLOWER_RUBY_CREAM, gMonPalette_AlcremieFlowerRubyCream), - SPECIES_PAL(ALCREMIE_FLOWER_MATCHA_CREAM, gMonPalette_AlcremieFlowerMatchaCream), - SPECIES_PAL(ALCREMIE_FLOWER_MINT_CREAM, gMonPalette_AlcremieFlowerMintCream), - SPECIES_PAL(ALCREMIE_FLOWER_LEMON_CREAM, gMonPalette_AlcremieFlowerLemonCream), - SPECIES_PAL(ALCREMIE_FLOWER_SALTED_CREAM, gMonPalette_AlcremieFlowerSaltedCream), - SPECIES_PAL(ALCREMIE_FLOWER_RUBY_SWIRL, gMonPalette_AlcremieFlowerRubySwirl), - SPECIES_PAL(ALCREMIE_FLOWER_CARAMEL_SWIRL, gMonPalette_AlcremieFlowerCaramelSwirl), - SPECIES_PAL(ALCREMIE_FLOWER_RAINBOW_SWIRL, gMonPalette_AlcremieFlowerRainbowSwirl), - SPECIES_PAL(ALCREMIE_LOVE_VANILLA, gMonPalette_AlcremieRibbonVanilla), - SPECIES_PAL(ALCREMIE_LOVE_RUBY_CREAM, gMonPalette_AlcremieRibbonRubyCream), - SPECIES_PAL(ALCREMIE_LOVE_MATCHA_CREAM, gMonPalette_AlcremieRibbonMatchaCream), - SPECIES_PAL(ALCREMIE_LOVE_MINT_CREAM, gMonPalette_AlcremieRibbonMintCream), - SPECIES_PAL(ALCREMIE_LOVE_LEMON_CREAM, gMonPalette_AlcremieRibbonLemonCream), - SPECIES_PAL(ALCREMIE_LOVE_SALTED_CREAM, gMonPalette_AlcremieRibbonSaltedCream), - SPECIES_PAL(ALCREMIE_LOVE_RUBY_SWIRL, gMonPalette_AlcremieRibbonRubySwirl), - SPECIES_PAL(ALCREMIE_LOVE_CARAMEL_SWIRL, gMonPalette_AlcremieRibbonCaramelSwirl), - SPECIES_PAL(ALCREMIE_LOVE_RAINBOW_SWIRL, gMonPalette_AlcremieRibbonRainbowSwirl), - SPECIES_PAL(ALCREMIE_RIBBON_VANILLA, gMonPalette_AlcremieRibbonVanilla), - SPECIES_PAL(ALCREMIE_RIBBON_RUBY_CREAM, gMonPalette_AlcremieRibbonRubyCream), - SPECIES_PAL(ALCREMIE_RIBBON_MATCHA_CREAM, gMonPalette_AlcremieRibbonMatchaCream), - SPECIES_PAL(ALCREMIE_RIBBON_MINT_CREAM, gMonPalette_AlcremieRibbonMintCream), - SPECIES_PAL(ALCREMIE_RIBBON_LEMON_CREAM, gMonPalette_AlcremieRibbonLemonCream), - SPECIES_PAL(ALCREMIE_RIBBON_SALTED_CREAM, gMonPalette_AlcremieRibbonSaltedCream), - SPECIES_PAL(ALCREMIE_RIBBON_RUBY_SWIRL, gMonPalette_AlcremieRibbonRubySwirl), - SPECIES_PAL(ALCREMIE_RIBBON_CARAMEL_SWIRL, gMonPalette_AlcremieRibbonCaramelSwirl), - SPECIES_PAL(ALCREMIE_RIBBON_RAINBOW_SWIRL, gMonPalette_AlcremieRibbonRainbowSwirl), - SPECIES_PAL(ALCREMIE_STAR_VANILLA, gMonPalette_AlcremieStarVanilla), - SPECIES_PAL(ALCREMIE_STAR_RUBY_CREAM, gMonPalette_AlcremieStarRubyCream), - SPECIES_PAL(ALCREMIE_STAR_MATCHA_CREAM, gMonPalette_AlcremieStarMatchaCream), - SPECIES_PAL(ALCREMIE_STAR_MINT_CREAM, gMonPalette_AlcremieStarMintCream), - SPECIES_PAL(ALCREMIE_STAR_LEMON_CREAM, gMonPalette_AlcremieStarLemonCream), - SPECIES_PAL(ALCREMIE_STAR_SALTED_CREAM, gMonPalette_AlcremieStarSaltedCream), - SPECIES_PAL(ALCREMIE_STAR_RUBY_SWIRL, gMonPalette_AlcremieStarRubySwirl), - SPECIES_PAL(ALCREMIE_STAR_CARAMEL_SWIRL, gMonPalette_AlcremieStarCaramelSwirl), - SPECIES_PAL(ALCREMIE_STAR_RAINBOW_SWIRL, gMonPalette_AlcremieStarRainbowSwirl), -*/ SPECIES_PAL(EISCUE_NOICE_FACE, gMonPalette_EiscueNoiceFace), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 9e00d8b93..38b3a662d 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1244,70 +1244,14 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(POLTEAGEIST_ANTIQUE, gMonShinyPalette_Polteageist), - SPECIES_SHINY_PAL(ALCREMIE_RUBY_CREAM, gMonShinyPalette_Alcremie), - SPECIES_SHINY_PAL(ALCREMIE_MATCHA_CREAM, gMonShinyPalette_Alcremie), - SPECIES_SHINY_PAL(ALCREMIE_MINT_CREAM, gMonShinyPalette_Alcremie), - SPECIES_SHINY_PAL(ALCREMIE_LEMON_CREAM, gMonShinyPalette_Alcremie), - SPECIES_SHINY_PAL(ALCREMIE_SALTED_CREAM, gMonShinyPalette_Alcremie), - SPECIES_SHINY_PAL(ALCREMIE_RUBY_SWIRL, gMonShinyPalette_Alcremie), - SPECIES_SHINY_PAL(ALCREMIE_CARAMEL_SWIRL, gMonShinyPalette_Alcremie), - SPECIES_SHINY_PAL(ALCREMIE_RAINBOW_SWIRL, gMonShinyPalette_Alcremie), -/* - SPECIES_SHINY_PAL(ALCREMIE_BERRY_VANILLA, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_BERRY_RUBY_CREAM, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_BERRY_MATCHA_CREAM, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_BERRY_MINT_CREAM, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_BERRY_LEMON_CREAM, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_BERRY_SALTED_CREAM, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_BERRY_RUBY_SWIRL, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_BERRY_CARAMEL_SWIRL, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_BERRY_RAINBOW_SWIRL, gMonShinyPalette_AlcremieBerry), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_VANILLA, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_RUBY_CREAM, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_MATCHA_CREAM, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_MINT_CREAM, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_LEMON_CREAM, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_SALTED_CREAM, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_RUBY_SWIRL, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_CARAMEL_SWIRL, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_CLOVER_RAINBOW_SWIRL, gMonShinyPalette_AlcremieClover), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_VANILLA, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_RUBY_CREAM, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_MATCHA_CREAM, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_MINT_CREAM, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_LEMON_CREAM, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_SALTED_CREAM, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_RUBY_SWIRL, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_CARAMEL_SWIRL, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_FLOWER_RAINBOW_SWIRL, gMonShinyPalette_AlcremieFlower), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_VANILLA, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_RUBY_CREAM, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_MATCHA_CREAM, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_MINT_CREAM, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_LEMON_CREAM, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_SALTED_CREAM, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_RUBY_SWIRL, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_CARAMEL_SWIRL, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_LOVE_RAINBOW_SWIRL, gMonShinyPalette_AlcremieLove), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_VANILLA, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_RUBY_CREAM, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_MATCHA_CREAM, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_MINT_CREAM, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_LEMON_CREAM, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_SALTED_CREAM, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_RUBY_SWIRL, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_CARAMEL_SWIRL, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_RIBBON_RAINBOW_SWIRL, gMonShinyPalette_AlcremieRibbon), - SPECIES_SHINY_PAL(ALCREMIE_STAR_VANILLA, gMonShinyPalette_AlcremieStar), - SPECIES_SHINY_PAL(ALCREMIE_STAR_RUBY_CREAM, gMonShinyPalette_AlcremieStar), - SPECIES_SHINY_PAL(ALCREMIE_STAR_MATCHA_CREAM, gMonShinyPalette_AlcremieStar), - SPECIES_SHINY_PAL(ALCREMIE_STAR_MINT_CREAM, gMonShinyPalette_AlcremieStar), - SPECIES_SHINY_PAL(ALCREMIE_STAR_LEMON_CREAM, gMonShinyPalette_AlcremieStar), - SPECIES_SHINY_PAL(ALCREMIE_STAR_SALTED_CREAM, gMonShinyPalette_AlcremieStar), - SPECIES_SHINY_PAL(ALCREMIE_STAR_RUBY_SWIRL, gMonShinyPalette_AlcremieStar), - SPECIES_SHINY_PAL(ALCREMIE_STAR_CARAMEL_SWIRL, gMonShinyPalette_AlcremieStar), - SPECIES_SHINY_PAL(ALCREMIE_STAR_RAINBOW_SWIRL, gMonShinyPalette_AlcremieStar), -*/ + SPECIES_SHINY_PAL(ALCREMIE_RUBY_CREAM, gMonShinyPalette_AlcremieRubyCream), + SPECIES_SHINY_PAL(ALCREMIE_MATCHA_CREAM, gMonShinyPalette_AlcremieMatchaCream), + SPECIES_SHINY_PAL(ALCREMIE_MINT_CREAM, gMonShinyPalette_AlcremieMintCream), + SPECIES_SHINY_PAL(ALCREMIE_LEMON_CREAM, gMonShinyPalette_AlcremieLemonCream), + SPECIES_SHINY_PAL(ALCREMIE_SALTED_CREAM, gMonShinyPalette_AlcremieSaltedCream), + SPECIES_SHINY_PAL(ALCREMIE_RUBY_SWIRL, gMonShinyPalette_AlcremieRubySwirl), + SPECIES_SHINY_PAL(ALCREMIE_CARAMEL_SWIRL, gMonShinyPalette_AlcremieCaramelSwirl), + SPECIES_SHINY_PAL(ALCREMIE_RAINBOW_SWIRL, gMonShinyPalette_AlcremieRainbowSwirl), SPECIES_SHINY_PAL(EISCUE_NOICE_FACE, gMonShinyPalette_EiscueNoiceFace),