diff --git a/graphics/pokemon/alcremie/back.png b/graphics/pokemon/alcremie/back.png new file mode 100644 index 000000000..056eca0ab Binary files /dev/null and b/graphics/pokemon/alcremie/back.png differ diff --git a/graphics/pokemon/alcremie/berry/back.png b/graphics/pokemon/alcremie/berry/back.png deleted file mode 100644 index a2236a94f..000000000 Binary files a/graphics/pokemon/alcremie/berry/back.png and /dev/null differ 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 4bbc456c3..000000000 Binary files a/graphics/pokemon/alcremie/berry/front.png and /dev/null differ 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 000000000..d5a073b54 Binary files /dev/null and b/graphics/pokemon/alcremie/caramel_swirl/back.png differ diff --git a/graphics/pokemon/alcremie/caramel_swirl/front.png b/graphics/pokemon/alcremie/caramel_swirl/front.png new file mode 100644 index 000000000..42f6c0482 Binary files /dev/null and b/graphics/pokemon/alcremie/caramel_swirl/front.png differ 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 8a8efe567..000000000 Binary files a/graphics/pokemon/alcremie/clover/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/clover/caramel_swirl.pal b/graphics/pokemon/alcremie/clover/caramel_swirl.pal deleted file mode 100644 index a8b596838..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/clover/front.png b/graphics/pokemon/alcremie/clover/front.png deleted file mode 100644 index dd30853ee..000000000 Binary files a/graphics/pokemon/alcremie/clover/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/clover/lemon_cream.pal b/graphics/pokemon/alcremie/clover/lemon_cream.pal deleted file mode 100644 index bd199e2bc..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/clover/matcha_cream.pal b/graphics/pokemon/alcremie/clover/matcha_cream.pal deleted file mode 100644 index 0f4f393f4..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/clover/mint_cream.pal b/graphics/pokemon/alcremie/clover/mint_cream.pal deleted file mode 100644 index 08b8f8346..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/clover/rainbow_swirl.pal b/graphics/pokemon/alcremie/clover/rainbow_swirl.pal deleted file mode 100644 index 4d6514f51..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/clover/ruby_cream.pal b/graphics/pokemon/alcremie/clover/ruby_cream.pal deleted file mode 100644 index 3243fea80..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/clover/ruby_swirl.pal b/graphics/pokemon/alcremie/clover/ruby_swirl.pal deleted file mode 100644 index fd68b6c2c..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/clover/salted_cream.pal b/graphics/pokemon/alcremie/clover/salted_cream.pal deleted file mode 100644 index a5c5bc10f..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/clover/vanilla.pal b/graphics/pokemon/alcremie/clover/vanilla.pal deleted file mode 100644 index 17fe8cc6b..000000000 --- a/graphics/pokemon/alcremie/clover/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 -136 216 64 -24 144 36 -24 80 36 -0 0 0 diff --git a/graphics/pokemon/alcremie/flower/back.png b/graphics/pokemon/alcremie/flower/back.png deleted file mode 100644 index 2d018bdab..000000000 Binary files a/graphics/pokemon/alcremie/flower/back.png and /dev/null differ 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 20c9af2f4..000000000 Binary files a/graphics/pokemon/alcremie/flower/front.png and /dev/null differ 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 000000000..e1daa350c Binary files /dev/null and b/graphics/pokemon/alcremie/front.png differ diff --git a/graphics/pokemon/alcremie/lemon_cream/back.png b/graphics/pokemon/alcremie/lemon_cream/back.png new file mode 100644 index 000000000..d5a073b54 Binary files /dev/null and b/graphics/pokemon/alcremie/lemon_cream/back.png differ diff --git a/graphics/pokemon/alcremie/lemon_cream/front.png b/graphics/pokemon/alcremie/lemon_cream/front.png new file mode 100644 index 000000000..b913e40be Binary files /dev/null and b/graphics/pokemon/alcremie/lemon_cream/front.png differ 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 6c3dd9436..000000000 Binary files a/graphics/pokemon/alcremie/love/back.png and /dev/null differ 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 36cef02d8..000000000 Binary files a/graphics/pokemon/alcremie/love/front.png and /dev/null differ 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 000000000..8f93ef92e Binary files /dev/null and b/graphics/pokemon/alcremie/matcha_cream/back.png differ diff --git a/graphics/pokemon/alcremie/matcha_cream/front.png b/graphics/pokemon/alcremie/matcha_cream/front.png new file mode 100644 index 000000000..39c3ab855 Binary files /dev/null and b/graphics/pokemon/alcremie/matcha_cream/front.png differ 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 000000000..481ce9c78 Binary files /dev/null and b/graphics/pokemon/alcremie/mint_cream/back.png differ diff --git a/graphics/pokemon/alcremie/mint_cream/front.png b/graphics/pokemon/alcremie/mint_cream/front.png new file mode 100644 index 000000000..68d3b5a4c Binary files /dev/null and b/graphics/pokemon/alcremie/mint_cream/front.png differ 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 000000000..e7f558454 Binary files /dev/null and b/graphics/pokemon/alcremie/rainbow_swirl/back.png differ diff --git a/graphics/pokemon/alcremie/rainbow_swirl/front.png b/graphics/pokemon/alcremie/rainbow_swirl/front.png new file mode 100644 index 000000000..4337e257a Binary files /dev/null and b/graphics/pokemon/alcremie/rainbow_swirl/front.png differ 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 3b595ebb6..000000000 Binary files a/graphics/pokemon/alcremie/ribbon/back.png and /dev/null differ 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 2f1b913cb..000000000 Binary files a/graphics/pokemon/alcremie/ribbon/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/ribbon/lemon_cream.pal b/graphics/pokemon/alcremie/ribbon/lemon_cream.pal deleted file mode 100644 index b022d0300..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ribbon/matcha_cream.pal b/graphics/pokemon/alcremie/ribbon/matcha_cream.pal deleted file mode 100644 index 4999acd24..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ribbon/mint_cream.pal b/graphics/pokemon/alcremie/ribbon/mint_cream.pal deleted file mode 100644 index 2349810b7..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ribbon/rainbow_swirl.pal b/graphics/pokemon/alcremie/ribbon/rainbow_swirl.pal deleted file mode 100644 index 8c1776947..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ribbon/ruby_cream.pal b/graphics/pokemon/alcremie/ribbon/ruby_cream.pal deleted file mode 100644 index 638429618..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ribbon/ruby_swirl.pal b/graphics/pokemon/alcremie/ribbon/ruby_swirl.pal deleted file mode 100644 index e1f9ce61d..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ribbon/salted_cream.pal b/graphics/pokemon/alcremie/ribbon/salted_cream.pal deleted file mode 100644 index cdf85d28b..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ribbon/shiny.pal b/graphics/pokemon/alcremie/ribbon/shiny.pal deleted file mode 100644 index b60e7632f..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -16 16 16 diff --git a/graphics/pokemon/alcremie/ribbon/vanilla.pal b/graphics/pokemon/alcremie/ribbon/vanilla.pal deleted file mode 100644 index b0ad7cdf7..000000000 --- a/graphics/pokemon/alcremie/ribbon/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 -176 136 176 -144 96 168 -112 72 136 -0 0 0 diff --git a/graphics/pokemon/alcremie/ruby_cream/back.png b/graphics/pokemon/alcremie/ruby_cream/back.png new file mode 100644 index 000000000..45fc28a0e Binary files /dev/null and b/graphics/pokemon/alcremie/ruby_cream/back.png differ diff --git a/graphics/pokemon/alcremie/ruby_cream/front.png b/graphics/pokemon/alcremie/ruby_cream/front.png new file mode 100644 index 000000000..7196c7054 Binary files /dev/null and b/graphics/pokemon/alcremie/ruby_cream/front.png differ 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 000000000..ae275b897 Binary files /dev/null and b/graphics/pokemon/alcremie/ruby_swirl/back.png differ diff --git a/graphics/pokemon/alcremie/ruby_swirl/front.png b/graphics/pokemon/alcremie/ruby_swirl/front.png new file mode 100644 index 000000000..cb99b49fa Binary files /dev/null and b/graphics/pokemon/alcremie/ruby_swirl/front.png differ diff --git a/graphics/pokemon/alcremie/strawberry/ruby_swirl.pal b/graphics/pokemon/alcremie/ruby_swirl/normal.pal similarity index 75% rename from graphics/pokemon/alcremie/strawberry/ruby_swirl.pal rename to graphics/pokemon/alcremie/ruby_swirl/normal.pal index 59e711dd2..5208a45f8 100644 --- a/graphics/pokemon/alcremie/strawberry/ruby_swirl.pal +++ b/graphics/pokemon/alcremie/ruby_swirl/normal.pal @@ -2,18 +2,18 @@ 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 +240 192 128 +208 184 160 +16 16 16 +248 240 208 +248 248 248 +136 32 56 248 88 112 192 48 72 -136 32 56 +248 176 184 +224 120 128 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/alcremie/ruby_swirl/shiny.pal b/graphics/pokemon/alcremie/ruby_swirl/shiny.pal new file mode 100644 index 000000000..eb171da47 --- /dev/null +++ b/graphics/pokemon/alcremie/ruby_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 +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/salted_cream/back.png b/graphics/pokemon/alcremie/salted_cream/back.png new file mode 100644 index 000000000..f32932d95 Binary files /dev/null and b/graphics/pokemon/alcremie/salted_cream/back.png differ diff --git a/graphics/pokemon/alcremie/salted_cream/front.png b/graphics/pokemon/alcremie/salted_cream/front.png new file mode 100644 index 000000000..08a75d2e8 Binary files /dev/null and b/graphics/pokemon/alcremie/salted_cream/front.png differ diff --git a/graphics/pokemon/alcremie/salted_cream/normal.pal b/graphics/pokemon/alcremie/salted_cream/normal.pal new file mode 100644 index 000000000..adfd376dc --- /dev/null +++ b/graphics/pokemon/alcremie/salted_cream/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +88 88 88 +248 248 248 +112 208 200 +176 176 176 +16 16 16 +136 32 56 +248 88 112 +192 48 72 +168 176 176 +248 248 248 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/salted_cream/shiny.pal b/graphics/pokemon/alcremie/salted_cream/shiny.pal new file mode 100644 index 000000000..953c50e5e --- /dev/null +++ b/graphics/pokemon/alcremie/salted_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 +136 32 56 +248 88 112 +192 48 72 +168 176 176 +152 152 152 +216 216 216 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/shiny.pal b/graphics/pokemon/alcremie/shiny.pal new file mode 100644 index 000000000..6d7750ab5 --- /dev/null +++ b/graphics/pokemon/alcremie/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 +216 216 216 +136 32 56 +248 88 112 +192 48 72 +168 176 176 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/star/back.png b/graphics/pokemon/alcremie/star/back.png deleted file mode 100644 index 38d32ca65..000000000 Binary files a/graphics/pokemon/alcremie/star/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/star/caramel_swirl.pal b/graphics/pokemon/alcremie/star/caramel_swirl.pal deleted file mode 100644 index 254db99d4..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/star/front.png b/graphics/pokemon/alcremie/star/front.png deleted file mode 100644 index 41f042229..000000000 Binary files a/graphics/pokemon/alcremie/star/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/star/lemon_cream.pal b/graphics/pokemon/alcremie/star/lemon_cream.pal deleted file mode 100644 index ec776c4d9..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/star/matcha_cream.pal b/graphics/pokemon/alcremie/star/matcha_cream.pal deleted file mode 100644 index b642f1178..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/star/mint_cream.pal b/graphics/pokemon/alcremie/star/mint_cream.pal deleted file mode 100644 index f4fb9991f..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/star/rainbow_swirl.pal b/graphics/pokemon/alcremie/star/rainbow_swirl.pal deleted file mode 100644 index a0aa5334c..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/star/ruby_cream.pal b/graphics/pokemon/alcremie/star/ruby_cream.pal deleted file mode 100644 index 1f66460fb..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/star/ruby_swirl.pal b/graphics/pokemon/alcremie/star/ruby_swirl.pal deleted file mode 100644 index 1f00d36c9..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/star/salted_cream.pal b/graphics/pokemon/alcremie/star/salted_cream.pal deleted file mode 100644 index 2b0c72d8f..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/star/shiny.pal b/graphics/pokemon/alcremie/star/shiny.pal deleted file mode 100644 index 6fb3e1d92..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -16 16 16 diff --git a/graphics/pokemon/alcremie/star/vanilla.pal b/graphics/pokemon/alcremie/star/vanilla.pal deleted file mode 100644 index d99429510..000000000 --- a/graphics/pokemon/alcremie/star/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 224 48 -200 176 24 -192 112 16 -0 0 0 diff --git a/graphics/pokemon/alcremie/strawberry/back.png b/graphics/pokemon/alcremie/strawberry/back.png deleted file mode 100644 index 2f3ce5007..000000000 Binary files a/graphics/pokemon/alcremie/strawberry/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/strawberry/front.png b/graphics/pokemon/alcremie/strawberry/front.png deleted file mode 100644 index fe7872d2d..000000000 Binary files a/graphics/pokemon/alcremie/strawberry/front.png and /dev/null differ 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),