diff --git a/graphics/pokemon/alcremie/back.png b/graphics/pokemon/alcremie/back.png deleted file mode 100644 index 056eca0ab..000000000 Binary files a/graphics/pokemon/alcremie/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/berry/back.png b/graphics/pokemon/alcremie/berry/back.png new file mode 100644 index 000000000..a2236a94f Binary files /dev/null and b/graphics/pokemon/alcremie/berry/back.png differ diff --git a/graphics/pokemon/alcremie/berry/caramel_swirl.pal b/graphics/pokemon/alcremie/berry/caramel_swirl.pal new file mode 100644 index 000000000..5a19b7c4c --- /dev/null +++ b/graphics/pokemon/alcremie/berry/caramel_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..4bbc456c3 Binary files /dev/null and b/graphics/pokemon/alcremie/berry/front.png differ diff --git a/graphics/pokemon/alcremie/berry/lemon_cream.pal b/graphics/pokemon/alcremie/berry/lemon_cream.pal new file mode 100644 index 000000000..17fd451a8 --- /dev/null +++ b/graphics/pokemon/alcremie/berry/lemon_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..edb69b688 --- /dev/null +++ b/graphics/pokemon/alcremie/berry/matcha_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..3a21681b2 --- /dev/null +++ b/graphics/pokemon/alcremie/berry/mint_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..37a0a4049 --- /dev/null +++ b/graphics/pokemon/alcremie/berry/rainbow_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..350cfeb22 --- /dev/null +++ b/graphics/pokemon/alcremie/berry/ruby_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..e0c66e7fc --- /dev/null +++ b/graphics/pokemon/alcremie/berry/ruby_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..eca511097 --- /dev/null +++ b/graphics/pokemon/alcremie/berry/salted_cream.pal @@ -0,0 +1,19 @@ +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/ruby_cream/shiny.pal b/graphics/pokemon/alcremie/berry/shiny.pal similarity index 72% rename from graphics/pokemon/alcremie/ruby_cream/shiny.pal rename to graphics/pokemon/alcremie/berry/shiny.pal index 454ec33ff..1fb826a87 100644 --- a/graphics/pokemon/alcremie/ruby_cream/shiny.pal +++ b/graphics/pokemon/alcremie/berry/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 -88 88 96 -128 128 128 -16 16 16 -216 216 216 -136 32 56 -248 88 112 -192 48 72 +168 176 176 248 248 248 168 176 176 +248 248 248 168 176 176 -152 152 152 -0 0 0 -0 0 0 +0 120 200 +0 80 144 +0 40 104 +16 16 16 diff --git a/graphics/pokemon/alcremie/berry/vanilla.pal b/graphics/pokemon/alcremie/berry/vanilla.pal new file mode 100644 index 000000000..118df4edd --- /dev/null +++ b/graphics/pokemon/alcremie/berry/vanilla.pal @@ -0,0 +1,19 @@ +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 deleted file mode 100644 index d5a073b54..000000000 Binary files a/graphics/pokemon/alcremie/caramel_swirl/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/caramel_swirl/front.png b/graphics/pokemon/alcremie/caramel_swirl/front.png deleted file mode 100644 index 42f6c0482..000000000 Binary files a/graphics/pokemon/alcremie/caramel_swirl/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/caramel_swirl/shiny.pal b/graphics/pokemon/alcremie/caramel_swirl/shiny.pal deleted file mode 100644 index d19dc335d..000000000 --- a/graphics/pokemon/alcremie/caramel_swirl/shiny.pal +++ /dev/null @@ -1,19 +0,0 @@ -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 new file mode 100644 index 000000000..8a8efe567 Binary files /dev/null and b/graphics/pokemon/alcremie/clover/back.png differ diff --git a/graphics/pokemon/alcremie/clover/caramel_swirl.pal b/graphics/pokemon/alcremie/clover/caramel_swirl.pal new file mode 100644 index 000000000..a8b596838 --- /dev/null +++ b/graphics/pokemon/alcremie/clover/caramel_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..dd30853ee Binary files /dev/null and b/graphics/pokemon/alcremie/clover/front.png differ diff --git a/graphics/pokemon/alcremie/clover/lemon_cream.pal b/graphics/pokemon/alcremie/clover/lemon_cream.pal new file mode 100644 index 000000000..bd199e2bc --- /dev/null +++ b/graphics/pokemon/alcremie/clover/lemon_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..0f4f393f4 --- /dev/null +++ b/graphics/pokemon/alcremie/clover/matcha_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..08b8f8346 --- /dev/null +++ b/graphics/pokemon/alcremie/clover/mint_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..4d6514f51 --- /dev/null +++ b/graphics/pokemon/alcremie/clover/rainbow_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..3243fea80 --- /dev/null +++ b/graphics/pokemon/alcremie/clover/ruby_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..fd68b6c2c --- /dev/null +++ b/graphics/pokemon/alcremie/clover/ruby_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..a5c5bc10f --- /dev/null +++ b/graphics/pokemon/alcremie/clover/salted_cream.pal @@ -0,0 +1,19 @@ +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/matcha_cream/shiny.pal b/graphics/pokemon/alcremie/clover/shiny.pal similarity index 65% rename from graphics/pokemon/alcremie/matcha_cream/shiny.pal rename to graphics/pokemon/alcremie/clover/shiny.pal index eb171da47..6329ca1ec 100644 --- a/graphics/pokemon/alcremie/matcha_cream/shiny.pal +++ b/graphics/pokemon/alcremie/clover/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 -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 248 248 248 168 176 176 -0 0 0 -0 0 0 -0 0 0 +248 248 248 +168 176 176 +136 216 64 +24 144 36 +24 80 36 +16 16 16 diff --git a/graphics/pokemon/alcremie/clover/vanilla.pal b/graphics/pokemon/alcremie/clover/vanilla.pal new file mode 100644 index 000000000..17fe8cc6b --- /dev/null +++ b/graphics/pokemon/alcremie/clover/vanilla.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..2d018bdab Binary files /dev/null and b/graphics/pokemon/alcremie/flower/back.png differ diff --git a/graphics/pokemon/alcremie/flower/caramel_swirl.pal b/graphics/pokemon/alcremie/flower/caramel_swirl.pal new file mode 100644 index 000000000..33bc209d7 --- /dev/null +++ b/graphics/pokemon/alcremie/flower/caramel_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..20c9af2f4 Binary files /dev/null and b/graphics/pokemon/alcremie/flower/front.png differ diff --git a/graphics/pokemon/alcremie/flower/lemon_cream.pal b/graphics/pokemon/alcremie/flower/lemon_cream.pal new file mode 100644 index 000000000..df85ea6b8 --- /dev/null +++ b/graphics/pokemon/alcremie/flower/lemon_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..f3b35677c --- /dev/null +++ b/graphics/pokemon/alcremie/flower/matcha_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..b32cc3bb2 --- /dev/null +++ b/graphics/pokemon/alcremie/flower/mint_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..2b7736025 --- /dev/null +++ b/graphics/pokemon/alcremie/flower/rainbow_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..6de39b5a3 --- /dev/null +++ b/graphics/pokemon/alcremie/flower/ruby_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..fce8994be --- /dev/null +++ b/graphics/pokemon/alcremie/flower/ruby_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..a9c50d230 --- /dev/null +++ b/graphics/pokemon/alcremie/flower/salted_cream.pal @@ -0,0 +1,19 @@ +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/mint_cream/shiny.pal b/graphics/pokemon/alcremie/flower/shiny.pal similarity index 65% rename from graphics/pokemon/alcremie/mint_cream/shiny.pal rename to graphics/pokemon/alcremie/flower/shiny.pal index f71c66c01..ee7ae0fba 100644 --- a/graphics/pokemon/alcremie/mint_cream/shiny.pal +++ b/graphics/pokemon/alcremie/flower/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 -88 88 96 -128 128 128 +168 176 176 +248 248 248 +168 176 176 +248 248 248 +168 176 176 +248 248 0 +248 104 40 +152 56 24 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/flower/vanilla.pal b/graphics/pokemon/alcremie/flower/vanilla.pal new file mode 100644 index 000000000..a3184e016 --- /dev/null +++ b/graphics/pokemon/alcremie/flower/vanilla.pal @@ -0,0 +1,19 @@ +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 deleted file mode 100644 index e1daa350c..000000000 Binary files a/graphics/pokemon/alcremie/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/lemon_cream/back.png b/graphics/pokemon/alcremie/lemon_cream/back.png deleted file mode 100644 index d5a073b54..000000000 Binary files a/graphics/pokemon/alcremie/lemon_cream/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/lemon_cream/front.png b/graphics/pokemon/alcremie/lemon_cream/front.png deleted file mode 100644 index b913e40be..000000000 Binary files a/graphics/pokemon/alcremie/lemon_cream/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/lemon_cream/shiny.pal b/graphics/pokemon/alcremie/lemon_cream/shiny.pal deleted file mode 100644 index d19dc335d..000000000 --- a/graphics/pokemon/alcremie/lemon_cream/shiny.pal +++ /dev/null @@ -1,19 +0,0 @@ -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 new file mode 100644 index 000000000..6c3dd9436 Binary files /dev/null and b/graphics/pokemon/alcremie/love/back.png differ diff --git a/graphics/pokemon/alcremie/love/caramel_swirl.pal b/graphics/pokemon/alcremie/love/caramel_swirl.pal new file mode 100644 index 000000000..86f59a8d6 --- /dev/null +++ b/graphics/pokemon/alcremie/love/caramel_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..36cef02d8 Binary files /dev/null and b/graphics/pokemon/alcremie/love/front.png differ diff --git a/graphics/pokemon/alcremie/love/lemon_cream.pal b/graphics/pokemon/alcremie/love/lemon_cream.pal new file mode 100644 index 000000000..34d9c0dfe --- /dev/null +++ b/graphics/pokemon/alcremie/love/lemon_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..3d33c04ab --- /dev/null +++ b/graphics/pokemon/alcremie/love/matcha_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..2344ddcf8 --- /dev/null +++ b/graphics/pokemon/alcremie/love/mint_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..3bb1f61ee --- /dev/null +++ b/graphics/pokemon/alcremie/love/rainbow_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..0d37782db --- /dev/null +++ b/graphics/pokemon/alcremie/love/ruby_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..ad18466c8 --- /dev/null +++ b/graphics/pokemon/alcremie/love/ruby_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..9bb17bbcf --- /dev/null +++ b/graphics/pokemon/alcremie/love/salted_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..848904393 --- /dev/null +++ b/graphics/pokemon/alcremie/love/shiny.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..9f965e53b --- /dev/null +++ b/graphics/pokemon/alcremie/love/vanilla.pal @@ -0,0 +1,19 @@ +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 deleted file mode 100644 index 8f93ef92e..000000000 Binary files a/graphics/pokemon/alcremie/matcha_cream/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/matcha_cream/front.png b/graphics/pokemon/alcremie/matcha_cream/front.png deleted file mode 100644 index 39c3ab855..000000000 Binary files a/graphics/pokemon/alcremie/matcha_cream/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/mint_cream/back.png b/graphics/pokemon/alcremie/mint_cream/back.png deleted file mode 100644 index 481ce9c78..000000000 Binary files a/graphics/pokemon/alcremie/mint_cream/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/mint_cream/front.png b/graphics/pokemon/alcremie/mint_cream/front.png deleted file mode 100644 index 68d3b5a4c..000000000 Binary files a/graphics/pokemon/alcremie/mint_cream/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/rainbow_swirl/back.png b/graphics/pokemon/alcremie/rainbow_swirl/back.png deleted file mode 100644 index e7f558454..000000000 Binary files a/graphics/pokemon/alcremie/rainbow_swirl/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/rainbow_swirl/front.png b/graphics/pokemon/alcremie/rainbow_swirl/front.png deleted file mode 100644 index 4337e257a..000000000 Binary files a/graphics/pokemon/alcremie/rainbow_swirl/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/ribbon/back.png b/graphics/pokemon/alcremie/ribbon/back.png new file mode 100644 index 000000000..3b595ebb6 Binary files /dev/null and b/graphics/pokemon/alcremie/ribbon/back.png differ diff --git a/graphics/pokemon/alcremie/ribbon/caramel_swirl.pal b/graphics/pokemon/alcremie/ribbon/caramel_swirl.pal new file mode 100644 index 000000000..c4fce2c7c --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/caramel_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..2f1b913cb Binary files /dev/null and b/graphics/pokemon/alcremie/ribbon/front.png differ diff --git a/graphics/pokemon/alcremie/ribbon/lemon_cream.pal b/graphics/pokemon/alcremie/ribbon/lemon_cream.pal new file mode 100644 index 000000000..b022d0300 --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/lemon_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..4999acd24 --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/matcha_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..2349810b7 --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/mint_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..8c1776947 --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/rainbow_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..638429618 --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/ruby_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..e1f9ce61d --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/ruby_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..cdf85d28b --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/salted_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..b60e7632f --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/shiny.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..b0ad7cdf7 --- /dev/null +++ b/graphics/pokemon/alcremie/ribbon/vanilla.pal @@ -0,0 +1,19 @@ +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 deleted file mode 100644 index 45fc28a0e..000000000 Binary files a/graphics/pokemon/alcremie/ruby_cream/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/ruby_cream/front.png b/graphics/pokemon/alcremie/ruby_cream/front.png deleted file mode 100644 index 7196c7054..000000000 Binary files a/graphics/pokemon/alcremie/ruby_cream/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/ruby_swirl/back.png b/graphics/pokemon/alcremie/ruby_swirl/back.png deleted file mode 100644 index ae275b897..000000000 Binary files a/graphics/pokemon/alcremie/ruby_swirl/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/ruby_swirl/front.png b/graphics/pokemon/alcremie/ruby_swirl/front.png deleted file mode 100644 index cb99b49fa..000000000 Binary files a/graphics/pokemon/alcremie/ruby_swirl/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/ruby_swirl/shiny.pal b/graphics/pokemon/alcremie/ruby_swirl/shiny.pal deleted file mode 100644 index eb171da47..000000000 --- a/graphics/pokemon/alcremie/ruby_swirl/shiny.pal +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index f32932d95..000000000 Binary files a/graphics/pokemon/alcremie/salted_cream/back.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/salted_cream/front.png b/graphics/pokemon/alcremie/salted_cream/front.png deleted file mode 100644 index 08a75d2e8..000000000 Binary files a/graphics/pokemon/alcremie/salted_cream/front.png and /dev/null differ diff --git a/graphics/pokemon/alcremie/salted_cream/normal.pal b/graphics/pokemon/alcremie/salted_cream/normal.pal deleted file mode 100644 index adfd376dc..000000000 --- a/graphics/pokemon/alcremie/salted_cream/normal.pal +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 953c50e5e..000000000 --- a/graphics/pokemon/alcremie/salted_cream/shiny.pal +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 6d7750ab5..000000000 --- a/graphics/pokemon/alcremie/shiny.pal +++ /dev/null @@ -1,19 +0,0 @@ -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 new file mode 100644 index 000000000..38d32ca65 Binary files /dev/null and b/graphics/pokemon/alcremie/star/back.png differ diff --git a/graphics/pokemon/alcremie/star/caramel_swirl.pal b/graphics/pokemon/alcremie/star/caramel_swirl.pal new file mode 100644 index 000000000..254db99d4 --- /dev/null +++ b/graphics/pokemon/alcremie/star/caramel_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..41f042229 Binary files /dev/null and b/graphics/pokemon/alcremie/star/front.png differ diff --git a/graphics/pokemon/alcremie/star/lemon_cream.pal b/graphics/pokemon/alcremie/star/lemon_cream.pal new file mode 100644 index 000000000..ec776c4d9 --- /dev/null +++ b/graphics/pokemon/alcremie/star/lemon_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..b642f1178 --- /dev/null +++ b/graphics/pokemon/alcremie/star/matcha_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..f4fb9991f --- /dev/null +++ b/graphics/pokemon/alcremie/star/mint_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..a0aa5334c --- /dev/null +++ b/graphics/pokemon/alcremie/star/rainbow_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..1f66460fb --- /dev/null +++ b/graphics/pokemon/alcremie/star/ruby_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..1f00d36c9 --- /dev/null +++ b/graphics/pokemon/alcremie/star/ruby_swirl.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..2b0c72d8f --- /dev/null +++ b/graphics/pokemon/alcremie/star/salted_cream.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..6fb3e1d92 --- /dev/null +++ b/graphics/pokemon/alcremie/star/shiny.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..d99429510 --- /dev/null +++ b/graphics/pokemon/alcremie/star/vanilla.pal @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000..2f3ce5007 Binary files /dev/null and b/graphics/pokemon/alcremie/strawberry/back.png differ diff --git a/graphics/pokemon/alcremie/caramel_swirl/normal.pal b/graphics/pokemon/alcremie/strawberry/caramel_swirl.pal similarity index 75% rename from graphics/pokemon/alcremie/caramel_swirl/normal.pal rename to graphics/pokemon/alcremie/strawberry/caramel_swirl.pal index 7e2e4cb99..78cea9164 100644 --- a/graphics/pokemon/alcremie/caramel_swirl/normal.pal +++ b/graphics/pokemon/alcremie/strawberry/caramel_swirl.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 -232 168 96 -200 168 120 -16 16 16 -248 232 184 -136 32 56 -248 88 112 -192 48 72 168 176 176 248 248 248 -0 0 0 -0 0 0 -0 0 0 +168 176 176 +248 248 248 +168 176 176 +248 88 112 +192 48 72 +136 32 56 0 0 0 diff --git a/graphics/pokemon/alcremie/strawberry/front.png b/graphics/pokemon/alcremie/strawberry/front.png new file mode 100644 index 000000000..fe7872d2d Binary files /dev/null and b/graphics/pokemon/alcremie/strawberry/front.png differ diff --git a/graphics/pokemon/alcremie/lemon_cream/normal.pal b/graphics/pokemon/alcremie/strawberry/lemon_cream.pal similarity index 75% rename from graphics/pokemon/alcremie/lemon_cream/normal.pal rename to graphics/pokemon/alcremie/strawberry/lemon_cream.pal index c69c0376e..0cbfae8ee 100644 --- a/graphics/pokemon/alcremie/lemon_cream/normal.pal +++ b/graphics/pokemon/alcremie/strawberry/lemon_cream.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 -232 224 0 -208 184 72 -16 16 16 -248 248 152 -136 32 56 -248 88 112 -192 48 72 168 176 176 248 248 248 -0 0 0 -0 0 0 -0 0 0 +168 176 176 +248 248 248 +168 176 176 +248 88 112 +192 48 72 +136 32 56 0 0 0 diff --git a/graphics/pokemon/alcremie/matcha_cream/normal.pal b/graphics/pokemon/alcremie/strawberry/matcha_cream.pal similarity index 75% rename from graphics/pokemon/alcremie/matcha_cream/normal.pal rename to graphics/pokemon/alcremie/strawberry/matcha_cream.pal index a5bbc02bc..918955f1a 100644 --- a/graphics/pokemon/alcremie/matcha_cream/normal.pal +++ b/graphics/pokemon/alcremie/strawberry/matcha_cream.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 -16 16 16 -232 248 208 -248 248 248 -136 32 56 +232 248 200 +176 208 152 +232 248 200 +176 208 152 248 88 112 192 48 72 -224 248 200 -176 208 152 -0 0 0 -0 0 0 +136 32 56 0 0 0 diff --git a/graphics/pokemon/alcremie/mint_cream/normal.pal b/graphics/pokemon/alcremie/strawberry/mint_cream.pal similarity index 75% rename from graphics/pokemon/alcremie/mint_cream/normal.pal rename to graphics/pokemon/alcremie/strawberry/mint_cream.pal index 7b56dfdc3..3978acb21 100644 --- a/graphics/pokemon/alcremie/mint_cream/normal.pal +++ b/graphics/pokemon/alcremie/strawberry/mint_cream.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 -112 208 200 -152 168 176 -16 16 16 -208 240 232 -136 32 56 +168 176 176 +248 248 248 +168 176 176 +248 248 248 +168 176 176 248 88 112 192 48 72 -168 176 176 -176 176 176 -248 248 248 -0 0 0 -0 0 0 +136 32 56 0 0 0 diff --git a/graphics/pokemon/alcremie/rainbow_swirl/normal.pal b/graphics/pokemon/alcremie/strawberry/rainbow_swirl.pal similarity index 95% rename from graphics/pokemon/alcremie/rainbow_swirl/normal.pal rename to graphics/pokemon/alcremie/strawberry/rainbow_swirl.pal index 3a02c0dd4..10bfc24d1 100644 --- a/graphics/pokemon/alcremie/rainbow_swirl/normal.pal +++ b/graphics/pokemon/alcremie/strawberry/rainbow_swirl.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 -216 144 88 -208 192 120 -16 16 16 -248 248 184 -248 248 248 -136 32 56 -248 88 112 -192 48 72 -248 248 112 -216 192 40 +208 128 136 176 232 224 128 160 168 -208 128 136 +248 248 112 +216 192 40 +248 88 112 +192 48 72 +136 32 56 +0 0 0 diff --git a/graphics/pokemon/alcremie/ruby_cream/normal.pal b/graphics/pokemon/alcremie/strawberry/ruby_cream.pal similarity index 57% rename from graphics/pokemon/alcremie/ruby_cream/normal.pal rename to graphics/pokemon/alcremie/strawberry/ruby_cream.pal index 873d673e1..e95929cab 100644 --- a/graphics/pokemon/alcremie/ruby_cream/normal.pal +++ b/graphics/pokemon/alcremie/strawberry/ruby_cream.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 80 112 -240 200 208 -232 112 192 -200 152 184 -16 16 16 248 248 248 -136 32 56 +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 88 112 192 48 72 -240 200 200 -200 144 184 -200 152 192 -240 200 208 -0 0 0 +136 32 56 0 0 0 diff --git a/graphics/pokemon/alcremie/ruby_swirl/normal.pal b/graphics/pokemon/alcremie/strawberry/ruby_swirl.pal similarity index 75% rename from graphics/pokemon/alcremie/ruby_swirl/normal.pal rename to graphics/pokemon/alcremie/strawberry/ruby_swirl.pal index 5208a45f8..59e711dd2 100644 --- a/graphics/pokemon/alcremie/ruby_swirl/normal.pal +++ b/graphics/pokemon/alcremie/strawberry/ruby_swirl.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 -240 192 128 -208 184 160 -16 16 16 -248 240 208 -248 248 248 -136 32 56 +224 120 128 +248 176 192 +224 120 128 +248 176 192 +224 120 128 248 88 112 192 48 72 -248 176 184 -224 120 128 -0 0 0 -0 0 0 +136 32 56 0 0 0 diff --git a/graphics/pokemon/alcremie/strawberry/salted_cream.pal b/graphics/pokemon/alcremie/strawberry/salted_cream.pal new file mode 100644 index 000000000..af57499a4 --- /dev/null +++ b/graphics/pokemon/alcremie/strawberry/salted_cream.pal @@ -0,0 +1,19 @@ +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/graphics/pokemon/alcremie/rainbow_swirl/shiny.pal b/graphics/pokemon/alcremie/strawberry/shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/rainbow_swirl/shiny.pal rename to graphics/pokemon/alcremie/strawberry/shiny.pal index e7e9c558f..6ae9aa96a 100644 --- a/graphics/pokemon/alcremie/rainbow_swirl/shiny.pal +++ b/graphics/pokemon/alcremie/strawberry/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 -88 88 96 -128 128 128 -16 16 16 -152 152 152 -216 216 216 -136 32 56 +168 176 176 +248 248 248 +168 176 176 +248 248 248 +168 176 176 248 88 112 192 48 72 -248 248 248 -168 176 176 -248 248 248 -168 176 176 -168 176 176 +136 32 56 +16 16 16 diff --git a/graphics/pokemon/alcremie/normal.pal b/graphics/pokemon/alcremie/strawberry/vanilla.pal similarity index 69% rename from graphics/pokemon/alcremie/normal.pal rename to graphics/pokemon/alcremie/strawberry/vanilla.pal index db4dca6f9..b9cb001f7 100644 --- a/graphics/pokemon/alcremie/normal.pal +++ b/graphics/pokemon/alcremie/strawberry/vanilla.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 -240 136 144 -208 160 176 -16 16 16 -248 224 208 -248 248 248 -136 32 56 +208 128 136 +248 224 200 +208 160 168 +248 224 200 +208 160 168 248 88 112 192 48 72 -208 160 168 -0 0 0 -0 0 0 -0 0 0 +136 32 56 0 0 0 diff --git a/graphics/pokemon/appletun/icon.png b/graphics/pokemon/appletun/icon.png new file mode 100644 index 000000000..66de1521a Binary files /dev/null and b/graphics/pokemon/appletun/icon.png differ diff --git a/graphics/pokemon/applin/icon.png b/graphics/pokemon/applin/icon.png new file mode 100644 index 000000000..c518f91a0 Binary files /dev/null and b/graphics/pokemon/applin/icon.png differ diff --git a/graphics/pokemon/arceus/anim_front.png b/graphics/pokemon/arceus/anim_front.png index ac951c180..8e1f8a538 100644 Binary files a/graphics/pokemon/arceus/anim_front.png and b/graphics/pokemon/arceus/anim_front.png differ diff --git a/graphics/pokemon/arceus/back.png b/graphics/pokemon/arceus/back.png index b49ad9f15..5ab63eb07 100644 Binary files a/graphics/pokemon/arceus/back.png and b/graphics/pokemon/arceus/back.png differ diff --git a/graphics/pokemon/arceus/front.png b/graphics/pokemon/arceus/front.png index 275ed5bca..72349052d 100644 Binary files a/graphics/pokemon/arceus/front.png and b/graphics/pokemon/arceus/front.png differ diff --git a/graphics/pokemon/blipbug/icon.png b/graphics/pokemon/blipbug/icon.png new file mode 100644 index 000000000..e4ce3a937 Binary files /dev/null and b/graphics/pokemon/blipbug/icon.png differ diff --git a/graphics/pokemon/boltund/icon.png b/graphics/pokemon/boltund/icon.png new file mode 100644 index 000000000..344ab587e Binary files /dev/null and b/graphics/pokemon/boltund/icon.png differ diff --git a/graphics/pokemon/carkol/icon.png b/graphics/pokemon/carkol/icon.png new file mode 100644 index 000000000..4469388d6 Binary files /dev/null and b/graphics/pokemon/carkol/icon.png differ diff --git a/graphics/pokemon/centiskorch/icon.png b/graphics/pokemon/centiskorch/icon.png new file mode 100644 index 000000000..6c52063bf Binary files /dev/null and b/graphics/pokemon/centiskorch/icon.png differ diff --git a/graphics/pokemon/chewtle/icon.png b/graphics/pokemon/chewtle/icon.png new file mode 100644 index 000000000..1bcbc9784 Binary files /dev/null and b/graphics/pokemon/chewtle/icon.png differ diff --git a/graphics/pokemon/cinderace/icon.png b/graphics/pokemon/cinderace/icon.png new file mode 100644 index 000000000..f5112ef2c Binary files /dev/null and b/graphics/pokemon/cinderace/icon.png differ diff --git a/graphics/pokemon/clobbopus/icon.png b/graphics/pokemon/clobbopus/icon.png new file mode 100644 index 000000000..695c42cf7 Binary files /dev/null and b/graphics/pokemon/clobbopus/icon.png differ diff --git a/graphics/pokemon/coalossal/icon.png b/graphics/pokemon/coalossal/icon.png new file mode 100644 index 000000000..781259a2c Binary files /dev/null and b/graphics/pokemon/coalossal/icon.png differ diff --git a/graphics/pokemon/copperajah/icon.png b/graphics/pokemon/copperajah/icon.png new file mode 100644 index 000000000..917f6173b Binary files /dev/null and b/graphics/pokemon/copperajah/icon.png differ diff --git a/graphics/pokemon/corsola/galarian/icon.png b/graphics/pokemon/corsola/galarian/icon.png new file mode 100644 index 000000000..96ef4da04 Binary files /dev/null and b/graphics/pokemon/corsola/galarian/icon.png differ diff --git a/graphics/pokemon/corviknight/icon.png b/graphics/pokemon/corviknight/icon.png new file mode 100644 index 000000000..dc865a044 Binary files /dev/null and b/graphics/pokemon/corviknight/icon.png differ diff --git a/graphics/pokemon/corvisquire/icon.png b/graphics/pokemon/corvisquire/icon.png new file mode 100644 index 000000000..408a46a85 Binary files /dev/null and b/graphics/pokemon/corvisquire/icon.png differ diff --git a/graphics/pokemon/cramorant/gorging/icon.png b/graphics/pokemon/cramorant/gorging/icon.png new file mode 100644 index 000000000..8c9830913 Binary files /dev/null and b/graphics/pokemon/cramorant/gorging/icon.png differ diff --git a/graphics/pokemon/cramorant/gulping/icon.png b/graphics/pokemon/cramorant/gulping/icon.png new file mode 100644 index 000000000..0d22d7f1d Binary files /dev/null and b/graphics/pokemon/cramorant/gulping/icon.png differ diff --git a/graphics/pokemon/cramorant/icon.png b/graphics/pokemon/cramorant/icon.png new file mode 100644 index 000000000..e8c1ce511 Binary files /dev/null and b/graphics/pokemon/cramorant/icon.png differ diff --git a/graphics/pokemon/cufant/icon.png b/graphics/pokemon/cufant/icon.png new file mode 100644 index 000000000..bcdcad88e Binary files /dev/null and b/graphics/pokemon/cufant/icon.png differ diff --git a/graphics/pokemon/cursola/icon.png b/graphics/pokemon/cursola/icon.png new file mode 100644 index 000000000..8bfc49817 Binary files /dev/null and b/graphics/pokemon/cursola/icon.png differ diff --git a/graphics/pokemon/darmanitan/galarian/icon.png b/graphics/pokemon/darmanitan/galarian/icon.png new file mode 100644 index 000000000..f09c2ea4d Binary files /dev/null and b/graphics/pokemon/darmanitan/galarian/icon.png differ diff --git a/graphics/pokemon/darumaka/galarian/icon.png b/graphics/pokemon/darumaka/galarian/icon.png new file mode 100644 index 000000000..88db35713 Binary files /dev/null and b/graphics/pokemon/darumaka/galarian/icon.png differ diff --git a/graphics/pokemon/dottler/icon.png b/graphics/pokemon/dottler/icon.png new file mode 100644 index 000000000..1274c130f Binary files /dev/null and b/graphics/pokemon/dottler/icon.png differ diff --git a/graphics/pokemon/dragapult/icon.png b/graphics/pokemon/dragapult/icon.png new file mode 100644 index 000000000..7e49f9ada Binary files /dev/null and b/graphics/pokemon/dragapult/icon.png differ diff --git a/graphics/pokemon/drakloak/icon.png b/graphics/pokemon/drakloak/icon.png new file mode 100644 index 000000000..4e06a768b Binary files /dev/null and b/graphics/pokemon/drakloak/icon.png differ diff --git a/graphics/pokemon/drednaw/icon.png b/graphics/pokemon/drednaw/icon.png new file mode 100644 index 000000000..9d0e42c01 Binary files /dev/null and b/graphics/pokemon/drednaw/icon.png differ diff --git a/graphics/pokemon/dreepy/icon.png b/graphics/pokemon/dreepy/icon.png new file mode 100644 index 000000000..27261fd31 Binary files /dev/null and b/graphics/pokemon/dreepy/icon.png differ diff --git a/graphics/pokemon/drizzile/icon.png b/graphics/pokemon/drizzile/icon.png new file mode 100644 index 000000000..f02ce10e2 Binary files /dev/null and b/graphics/pokemon/drizzile/icon.png differ diff --git a/graphics/pokemon/dubwool/icon.png b/graphics/pokemon/dubwool/icon.png new file mode 100644 index 000000000..d22fed234 Binary files /dev/null and b/graphics/pokemon/dubwool/icon.png differ diff --git a/graphics/pokemon/duraludon/icon.png b/graphics/pokemon/duraludon/icon.png new file mode 100644 index 000000000..6025a5c25 Binary files /dev/null and b/graphics/pokemon/duraludon/icon.png differ diff --git a/graphics/pokemon/eiscue/icon.png b/graphics/pokemon/eiscue/icon.png new file mode 100644 index 000000000..800e244f5 Binary files /dev/null and b/graphics/pokemon/eiscue/icon.png differ diff --git a/graphics/pokemon/eiscue/noice_face/icon.png b/graphics/pokemon/eiscue/noice_face/icon.png new file mode 100644 index 000000000..b0822bc01 Binary files /dev/null and b/graphics/pokemon/eiscue/noice_face/icon.png differ diff --git a/graphics/pokemon/eldegoss/icon.png b/graphics/pokemon/eldegoss/icon.png new file mode 100644 index 000000000..bb22f1b6c Binary files /dev/null and b/graphics/pokemon/eldegoss/icon.png differ diff --git a/graphics/pokemon/eternatus/eternamax/back.png b/graphics/pokemon/eternatus/eternamax/back.png new file mode 100644 index 000000000..7d6f7f484 Binary files /dev/null and b/graphics/pokemon/eternatus/eternamax/back.png differ diff --git a/graphics/pokemon/eternatus/eternamax/front.png b/graphics/pokemon/eternatus/eternamax/front.png new file mode 100644 index 000000000..60d41e258 Binary files /dev/null and b/graphics/pokemon/eternatus/eternamax/front.png differ diff --git a/graphics/pokemon/eternatus/eternamax/normal.pal b/graphics/pokemon/eternatus/eternamax/normal.pal new file mode 100644 index 000000000..8cee5aab5 --- /dev/null +++ b/graphics/pokemon/eternatus/eternamax/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +56 40 112 +32 16 72 +16 16 16 +224 40 184 +240 136 208 +248 248 248 +168 40 72 +224 48 48 +56 16 184 +96 88 192 +248 136 136 +248 80 80 +248 176 176 +248 216 216 +0 0 0 diff --git a/graphics/pokemon/eternatus/eternamax/shiny.pal b/graphics/pokemon/eternatus/eternamax/shiny.pal new file mode 100644 index 000000000..2d39e0b86 --- /dev/null +++ b/graphics/pokemon/eternatus/eternamax/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +104 32 104 +72 16 64 +16 16 16 +224 40 184 +240 136 208 +248 248 248 +168 40 72 +224 48 48 +168 24 168 +208 48 232 +248 136 136 +248 80 80 +248 176 176 +248 216 216 +0 0 0 diff --git a/graphics/pokemon/eternatus/icon.png b/graphics/pokemon/eternatus/icon.png new file mode 100644 index 000000000..60797c604 Binary files /dev/null and b/graphics/pokemon/eternatus/icon.png differ diff --git a/graphics/pokemon/falinks/icon.png b/graphics/pokemon/falinks/icon.png new file mode 100644 index 000000000..e8b750bd5 Binary files /dev/null and b/graphics/pokemon/falinks/icon.png differ diff --git a/graphics/pokemon/farfetchd/galarian/icon.png b/graphics/pokemon/farfetchd/galarian/icon.png new file mode 100644 index 000000000..2dda2cd26 Binary files /dev/null and b/graphics/pokemon/farfetchd/galarian/icon.png differ diff --git a/graphics/pokemon/flapple/icon.png b/graphics/pokemon/flapple/icon.png new file mode 100644 index 000000000..e8d8660fe Binary files /dev/null and b/graphics/pokemon/flapple/icon.png differ diff --git a/graphics/pokemon/frosmoth/icon.png b/graphics/pokemon/frosmoth/icon.png new file mode 100644 index 000000000..3e71a143e Binary files /dev/null and b/graphics/pokemon/frosmoth/icon.png differ diff --git a/graphics/pokemon/gossifleur/icon.png b/graphics/pokemon/gossifleur/icon.png new file mode 100644 index 000000000..74446ed5d Binary files /dev/null and b/graphics/pokemon/gossifleur/icon.png differ diff --git a/graphics/pokemon/grapploct/icon.png b/graphics/pokemon/grapploct/icon.png new file mode 100644 index 000000000..dda18023e Binary files /dev/null and b/graphics/pokemon/grapploct/icon.png differ diff --git a/graphics/pokemon/grimmsnarl/icon.png b/graphics/pokemon/grimmsnarl/icon.png new file mode 100644 index 000000000..d6f921cf0 Binary files /dev/null and b/graphics/pokemon/grimmsnarl/icon.png differ diff --git a/graphics/pokemon/grookey/icon.png b/graphics/pokemon/grookey/icon.png new file mode 100644 index 000000000..f25d1f115 Binary files /dev/null and b/graphics/pokemon/grookey/icon.png differ diff --git a/graphics/pokemon/hatenna/icon.png b/graphics/pokemon/hatenna/icon.png new file mode 100644 index 000000000..6dde7e200 Binary files /dev/null and b/graphics/pokemon/hatenna/icon.png differ diff --git a/graphics/pokemon/hatterene/icon.png b/graphics/pokemon/hatterene/icon.png new file mode 100644 index 000000000..aae700b18 Binary files /dev/null and b/graphics/pokemon/hatterene/icon.png differ diff --git a/graphics/pokemon/hattrem/icon.png b/graphics/pokemon/hattrem/icon.png new file mode 100644 index 000000000..e498c4d77 Binary files /dev/null and b/graphics/pokemon/hattrem/icon.png differ diff --git a/graphics/pokemon/impidimp/icon.png b/graphics/pokemon/impidimp/icon.png new file mode 100644 index 000000000..e889a80d4 Binary files /dev/null and b/graphics/pokemon/impidimp/icon.png differ diff --git a/graphics/pokemon/indeedee/female/icon.png b/graphics/pokemon/indeedee/female/icon.png new file mode 100644 index 000000000..ca9aeda07 Binary files /dev/null and b/graphics/pokemon/indeedee/female/icon.png differ diff --git a/graphics/pokemon/indeedee/icon.png b/graphics/pokemon/indeedee/icon.png new file mode 100644 index 000000000..ed83aad7c Binary files /dev/null and b/graphics/pokemon/indeedee/icon.png differ diff --git a/graphics/pokemon/inteleon/back.png b/graphics/pokemon/inteleon/back.png new file mode 100644 index 000000000..57f6c40c9 Binary files /dev/null and b/graphics/pokemon/inteleon/back.png differ diff --git a/graphics/pokemon/inteleon/front.png b/graphics/pokemon/inteleon/front.png new file mode 100644 index 000000000..3ae051456 Binary files /dev/null and b/graphics/pokemon/inteleon/front.png differ diff --git a/graphics/pokemon/inteleon/icon.png b/graphics/pokemon/inteleon/icon.png new file mode 100644 index 000000000..37fbd4b59 Binary files /dev/null and b/graphics/pokemon/inteleon/icon.png differ diff --git a/graphics/pokemon/inteleon/normal.pal b/graphics/pokemon/inteleon/normal.pal new file mode 100644 index 000000000..52a971001 --- /dev/null +++ b/graphics/pokemon/inteleon/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +0 56 104 +136 96 40 +232 200 88 +240 248 136 +24 120 192 +0 88 152 +80 152 192 +152 208 224 +16 16 16 +224 160 40 +248 248 248 +48 48 40 +96 96 96 +72 72 72 +248 248 248 diff --git a/graphics/pokemon/inteleon/shiny.pal b/graphics/pokemon/inteleon/shiny.pal new file mode 100644 index 000000000..50344c79a --- /dev/null +++ b/graphics/pokemon/inteleon/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +0 64 112 +136 40 56 +232 88 144 +248 136 176 +0 200 200 +8 160 168 +0 96 160 +16 120 192 +16 16 16 +224 160 40 +248 248 248 +152 152 168 +240 248 248 +192 200 208 +96 96 96 diff --git a/graphics/pokemon/kyurem/black/anim_front.png b/graphics/pokemon/kyurem/black/anim_front.png index 7a8d8b9d6..71013f7a3 100644 Binary files a/graphics/pokemon/kyurem/black/anim_front.png and b/graphics/pokemon/kyurem/black/anim_front.png differ diff --git a/graphics/pokemon/kyurem/black/back.png b/graphics/pokemon/kyurem/black/back.png index 6146678a6..4e9c83539 100644 Binary files a/graphics/pokemon/kyurem/black/back.png and b/graphics/pokemon/kyurem/black/back.png differ diff --git a/graphics/pokemon/kyurem/black/front.png b/graphics/pokemon/kyurem/black/front.png index 89609f659..ccba4d35a 100644 Binary files a/graphics/pokemon/kyurem/black/front.png and b/graphics/pokemon/kyurem/black/front.png differ diff --git a/graphics/pokemon/kyurem/black/normal.pal b/graphics/pokemon/kyurem/black/normal.pal index 670d80323..bdb3fe453 100644 --- a/graphics/pokemon/kyurem/black/normal.pal +++ b/graphics/pokemon/kyurem/black/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +153 210 164 +36 39 43 +173 228 247 16 16 16 -56 56 64 -56 80 96 -168 224 240 -120 152 160 -32 32 40 -16 24 32 -128 96 0 -248 208 24 -152 160 168 -104 104 112 -224 224 216 -64 72 88 -48 48 56 -0 0 0 +123 157 160 +156 166 173 +57 62 66 +60 84 96 +104 111 119 +23 29 33 +0 197 255 +0 106 189 +255 212 25 +132 99 0 +71 78 89 +230 230 222 diff --git a/graphics/pokemon/kyurem/black/shiny.pal b/graphics/pokemon/kyurem/black/shiny.pal index bf8756aea..da69e6756 100644 --- a/graphics/pokemon/kyurem/black/shiny.pal +++ b/graphics/pokemon/kyurem/black/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +153 210 164 +36 39 43 +173 228 247 16 16 16 -56 56 48 -56 56 96 -192 200 240 -120 144 200 -40 40 32 -24 24 16 -128 32 104 -232 64 176 -88 120 104 -40 72 56 -224 224 216 -24 48 40 -48 48 56 -0 0 0 +122 147 201 +96 128 108 +57 62 66 +58 58 96 +48 80 56 +23 29 33 +64 248 64 +40 108 40 +240 64 180 +130 40 108 +32 56 40 +230 230 222 diff --git a/graphics/pokemon/kyurem/white/anim_front.png b/graphics/pokemon/kyurem/white/anim_front.png index 8728cb3ad..b55d6c89a 100644 Binary files a/graphics/pokemon/kyurem/white/anim_front.png and b/graphics/pokemon/kyurem/white/anim_front.png differ diff --git a/graphics/pokemon/kyurem/white/back.png b/graphics/pokemon/kyurem/white/back.png index c3e89dca1..0f76b5c45 100644 Binary files a/graphics/pokemon/kyurem/white/back.png and b/graphics/pokemon/kyurem/white/back.png differ diff --git a/graphics/pokemon/kyurem/white/front.png b/graphics/pokemon/kyurem/white/front.png index b1a53d59c..7e7314e76 100644 Binary files a/graphics/pokemon/kyurem/white/front.png and b/graphics/pokemon/kyurem/white/front.png differ diff --git a/graphics/pokemon/kyurem/white/normal.pal b/graphics/pokemon/kyurem/white/normal.pal index 744df97ce..cc136a09e 100644 --- a/graphics/pokemon/kyurem/white/normal.pal +++ b/graphics/pokemon/kyurem/white/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -120 152 160 +153 210 164 +173 228 247 +123 157 160 +255 255 255 16 16 16 -120 104 96 -168 224 240 -248 248 248 -192 176 168 -64 72 88 -248 208 24 -56 80 96 -152 160 168 -104 104 112 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +156 166 173 +71 78 89 +104 111 119 +60 84 96 +230 74 66 +148 41 33 +198 181 169 +122 109 101 +255 173 99 +255 212 25 +255 222 58 diff --git a/graphics/pokemon/kyurem/white/shiny.pal b/graphics/pokemon/kyurem/white/shiny.pal index d761c4927..ba7f1f9e2 100644 --- a/graphics/pokemon/kyurem/white/shiny.pal +++ b/graphics/pokemon/kyurem/white/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -120 144 200 +153 210 164 +196 203 240 +122 147 200 +255 255 255 16 16 16 -96 96 112 -192 200 240 -248 248 248 -168 160 208 +90 115 128 32 48 56 -232 88 184 -56 56 96 -88 112 120 -48 72 80 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +48 75 81 +58 58 96 +230 74 66 +148 41 33 +198 181 169 +103 99 119 +255 173 99 +237 90 188 +255 222 58 diff --git a/graphics/pokemon/linoone/galarian/icon.png b/graphics/pokemon/linoone/galarian/icon.png new file mode 100644 index 000000000..12437ca3e Binary files /dev/null and b/graphics/pokemon/linoone/galarian/icon.png differ diff --git a/graphics/pokemon/meowth/galarian/icon.png b/graphics/pokemon/meowth/galarian/icon.png new file mode 100644 index 000000000..5292f0b54 Binary files /dev/null and b/graphics/pokemon/meowth/galarian/icon.png differ diff --git a/graphics/pokemon/milcery/icon.png b/graphics/pokemon/milcery/icon.png new file mode 100644 index 000000000..0e0b54d6c Binary files /dev/null and b/graphics/pokemon/milcery/icon.png differ diff --git a/graphics/pokemon/morgrem/icon.png b/graphics/pokemon/morgrem/icon.png new file mode 100644 index 000000000..54112d6b6 Binary files /dev/null and b/graphics/pokemon/morgrem/icon.png differ diff --git a/graphics/pokemon/morpeko/hangry/icon.png b/graphics/pokemon/morpeko/hangry/icon.png new file mode 100644 index 000000000..94b69b322 Binary files /dev/null and b/graphics/pokemon/morpeko/hangry/icon.png differ diff --git a/graphics/pokemon/morpeko/icon.png b/graphics/pokemon/morpeko/icon.png new file mode 100644 index 000000000..b6503b42f Binary files /dev/null and b/graphics/pokemon/morpeko/icon.png differ diff --git a/graphics/pokemon/mr_mime/galarian/icon.png b/graphics/pokemon/mr_mime/galarian/icon.png new file mode 100644 index 000000000..c2c7c06ee Binary files /dev/null and b/graphics/pokemon/mr_mime/galarian/icon.png differ diff --git a/graphics/pokemon/mr_rime/icon.png b/graphics/pokemon/mr_rime/icon.png new file mode 100644 index 000000000..f13b60b4d Binary files /dev/null and b/graphics/pokemon/mr_rime/icon.png differ diff --git a/graphics/pokemon/nickit/icon.png b/graphics/pokemon/nickit/icon.png new file mode 100644 index 000000000..b7095d9c7 Binary files /dev/null and b/graphics/pokemon/nickit/icon.png differ diff --git a/graphics/pokemon/obstagoon/icon.png b/graphics/pokemon/obstagoon/icon.png new file mode 100644 index 000000000..47edf20f2 Binary files /dev/null and b/graphics/pokemon/obstagoon/icon.png differ diff --git a/graphics/pokemon/orbeetle/icon.png b/graphics/pokemon/orbeetle/icon.png new file mode 100644 index 000000000..9e8ddbed6 Binary files /dev/null and b/graphics/pokemon/orbeetle/icon.png differ diff --git a/graphics/pokemon/palkia/anim_front.png b/graphics/pokemon/palkia/anim_front.png index 273753b17..3b408c2a6 100644 Binary files a/graphics/pokemon/palkia/anim_front.png and b/graphics/pokemon/palkia/anim_front.png differ diff --git a/graphics/pokemon/palkia/front.png b/graphics/pokemon/palkia/front.png index 3821537ab..16ae684d5 100644 Binary files a/graphics/pokemon/palkia/front.png and b/graphics/pokemon/palkia/front.png differ diff --git a/graphics/pokemon/perrserker/icon.png b/graphics/pokemon/perrserker/icon.png new file mode 100644 index 000000000..fe93bd317 Binary files /dev/null and b/graphics/pokemon/perrserker/icon.png differ diff --git a/graphics/pokemon/polteageist/icon.png b/graphics/pokemon/polteageist/icon.png new file mode 100644 index 000000000..22fba612d Binary files /dev/null and b/graphics/pokemon/polteageist/icon.png differ diff --git a/graphics/pokemon/ponyta/galarian/icon.png b/graphics/pokemon/ponyta/galarian/icon.png new file mode 100644 index 000000000..3db1d91a5 Binary files /dev/null and b/graphics/pokemon/ponyta/galarian/icon.png differ diff --git a/graphics/pokemon/raboot/icon.png b/graphics/pokemon/raboot/icon.png new file mode 100644 index 000000000..80df66631 Binary files /dev/null and b/graphics/pokemon/raboot/icon.png differ diff --git a/graphics/pokemon/rapidash/galarian/icon.png b/graphics/pokemon/rapidash/galarian/icon.png new file mode 100644 index 000000000..abd13ec13 Binary files /dev/null and b/graphics/pokemon/rapidash/galarian/icon.png differ diff --git a/graphics/pokemon/regieleki/back.png b/graphics/pokemon/regieleki/back.png new file mode 100644 index 000000000..59d39eae4 Binary files /dev/null and b/graphics/pokemon/regieleki/back.png differ diff --git a/graphics/pokemon/regieleki/front.png b/graphics/pokemon/regieleki/front.png new file mode 100644 index 000000000..d88744bcd Binary files /dev/null and b/graphics/pokemon/regieleki/front.png differ diff --git a/graphics/pokemon/regieleki/normal.pal b/graphics/pokemon/regieleki/normal.pal new file mode 100644 index 000000000..220bd018d --- /dev/null +++ b/graphics/pokemon/regieleki/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +120 80 40 +224 232 24 +16 16 16 +208 168 8 +248 248 192 +248 152 192 +40 56 96 +48 80 144 +72 120 200 +136 168 216 +184 136 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/regieleki/shiny.pal b/graphics/pokemon/regieleki/shiny.pal new file mode 100644 index 000000000..27ad1c6bb --- /dev/null +++ b/graphics/pokemon/regieleki/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +120 80 40 +224 232 24 +16 16 16 +208 168 8 +248 248 192 +248 152 192 +104 104 104 +168 160 200 +216 216 216 +248 248 248 +184 136 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/rillaboom/back.png b/graphics/pokemon/rillaboom/back.png new file mode 100644 index 000000000..decc2fbaf Binary files /dev/null and b/graphics/pokemon/rillaboom/back.png differ diff --git a/graphics/pokemon/rillaboom/front.png b/graphics/pokemon/rillaboom/front.png new file mode 100644 index 000000000..b3822a3b4 Binary files /dev/null and b/graphics/pokemon/rillaboom/front.png differ diff --git a/graphics/pokemon/rillaboom/icon.png b/graphics/pokemon/rillaboom/icon.png new file mode 100644 index 000000000..1315d1214 Binary files /dev/null and b/graphics/pokemon/rillaboom/icon.png differ diff --git a/graphics/pokemon/rillaboom/normal.pal b/graphics/pokemon/rillaboom/normal.pal new file mode 100644 index 000000000..2cdb5f975 --- /dev/null +++ b/graphics/pokemon/rillaboom/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +0 40 24 +0 128 64 +0 88 40 +16 16 16 +104 64 64 +176 152 120 +48 24 32 +248 248 248 +64 40 40 +248 112 56 +176 64 56 +128 112 80 +240 224 160 +176 120 72 +144 104 64 diff --git a/graphics/pokemon/rillaboom/shiny.pal b/graphics/pokemon/rillaboom/shiny.pal new file mode 100644 index 000000000..9bce7e685 --- /dev/null +++ b/graphics/pokemon/rillaboom/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +48 64 0 +136 176 0 +88 112 0 +16 16 16 +88 40 48 +152 144 128 +40 16 32 +248 248 248 +56 24 40 +248 112 56 +176 64 56 +96 88 72 +240 224 160 +176 120 72 +144 104 64 diff --git a/graphics/pokemon/rolycoly/icon.png b/graphics/pokemon/rolycoly/icon.png new file mode 100644 index 000000000..fb4108eaa Binary files /dev/null and b/graphics/pokemon/rolycoly/icon.png differ diff --git a/graphics/pokemon/rookidee/icon.png b/graphics/pokemon/rookidee/icon.png new file mode 100644 index 000000000..b06523786 Binary files /dev/null and b/graphics/pokemon/rookidee/icon.png differ diff --git a/graphics/pokemon/runerigus/icon.png b/graphics/pokemon/runerigus/icon.png new file mode 100644 index 000000000..9110ff9f9 Binary files /dev/null and b/graphics/pokemon/runerigus/icon.png differ diff --git a/graphics/pokemon/sandaconda/icon.png b/graphics/pokemon/sandaconda/icon.png new file mode 100644 index 000000000..bfde35f57 Binary files /dev/null and b/graphics/pokemon/sandaconda/icon.png differ diff --git a/graphics/pokemon/scorbunny/icon.png b/graphics/pokemon/scorbunny/icon.png new file mode 100644 index 000000000..84c83b301 Binary files /dev/null and b/graphics/pokemon/scorbunny/icon.png differ diff --git a/graphics/pokemon/silicobra/icon.png b/graphics/pokemon/silicobra/icon.png new file mode 100644 index 000000000..c48874a72 Binary files /dev/null and b/graphics/pokemon/silicobra/icon.png differ diff --git a/graphics/pokemon/sinistea/icon.png b/graphics/pokemon/sinistea/icon.png new file mode 100644 index 000000000..0f5154685 Binary files /dev/null and b/graphics/pokemon/sinistea/icon.png differ diff --git a/graphics/pokemon/sirfetchd/icon.png b/graphics/pokemon/sirfetchd/icon.png new file mode 100644 index 000000000..eefa9a738 Binary files /dev/null and b/graphics/pokemon/sirfetchd/icon.png differ diff --git a/graphics/pokemon/sizzlipede/icon.png b/graphics/pokemon/sizzlipede/icon.png new file mode 100644 index 000000000..e3c83ae04 Binary files /dev/null and b/graphics/pokemon/sizzlipede/icon.png differ diff --git a/graphics/pokemon/snom/icon.png b/graphics/pokemon/snom/icon.png new file mode 100644 index 000000000..d402de3f5 Binary files /dev/null and b/graphics/pokemon/snom/icon.png differ diff --git a/graphics/pokemon/sobble/icon.png b/graphics/pokemon/sobble/icon.png new file mode 100644 index 000000000..69327e018 Binary files /dev/null and b/graphics/pokemon/sobble/icon.png differ diff --git a/graphics/pokemon/stonjourner/icon.png b/graphics/pokemon/stonjourner/icon.png new file mode 100644 index 000000000..8fadb8567 Binary files /dev/null and b/graphics/pokemon/stonjourner/icon.png differ diff --git a/graphics/pokemon/stunfisk/galarian/icon.png b/graphics/pokemon/stunfisk/galarian/icon.png new file mode 100644 index 000000000..729a18bf1 Binary files /dev/null and b/graphics/pokemon/stunfisk/galarian/icon.png differ diff --git a/graphics/pokemon/thievul/icon.png b/graphics/pokemon/thievul/icon.png new file mode 100644 index 000000000..b96aa7477 Binary files /dev/null and b/graphics/pokemon/thievul/icon.png differ diff --git a/graphics/pokemon/thwackey/icon.png b/graphics/pokemon/thwackey/icon.png new file mode 100644 index 000000000..d093da09a Binary files /dev/null and b/graphics/pokemon/thwackey/icon.png differ diff --git a/graphics/pokemon/toxtricity/icon.png b/graphics/pokemon/toxtricity/icon.png new file mode 100644 index 000000000..e3d8123b5 Binary files /dev/null and b/graphics/pokemon/toxtricity/icon.png differ diff --git a/graphics/pokemon/toxtricity/low_key/icon.png b/graphics/pokemon/toxtricity/low_key/icon.png new file mode 100644 index 000000000..daf034d6a Binary files /dev/null and b/graphics/pokemon/toxtricity/low_key/icon.png differ diff --git a/graphics/pokemon/weezing/galarian/icon.png b/graphics/pokemon/weezing/galarian/icon.png new file mode 100644 index 000000000..79c7dd6bf Binary files /dev/null and b/graphics/pokemon/weezing/galarian/icon.png differ diff --git a/graphics/pokemon/wooloo/icon.png b/graphics/pokemon/wooloo/icon.png new file mode 100644 index 000000000..205d15416 Binary files /dev/null and b/graphics/pokemon/wooloo/icon.png differ diff --git a/graphics/pokemon/yamask/galarian/icon.png b/graphics/pokemon/yamask/galarian/icon.png new file mode 100644 index 000000000..918473372 Binary files /dev/null and b/graphics/pokemon/yamask/galarian/icon.png differ diff --git a/graphics/pokemon/yamper/icon.png b/graphics/pokemon/yamper/icon.png new file mode 100644 index 000000000..4c445402e Binary files /dev/null and b/graphics/pokemon/yamper/icon.png differ diff --git a/graphics/pokemon/zacian/crowned_sword/icon.png b/graphics/pokemon/zacian/crowned_sword/icon.png new file mode 100644 index 000000000..7136f24cc Binary files /dev/null and b/graphics/pokemon/zacian/crowned_sword/icon.png differ diff --git a/graphics/pokemon/zacian/icon.png b/graphics/pokemon/zacian/icon.png new file mode 100644 index 000000000..474e53ff9 Binary files /dev/null and b/graphics/pokemon/zacian/icon.png differ diff --git a/graphics/pokemon/zamazenta/crowned_shield/icon.png b/graphics/pokemon/zamazenta/crowned_shield/icon.png new file mode 100644 index 000000000..52be47e34 Binary files /dev/null and b/graphics/pokemon/zamazenta/crowned_shield/icon.png differ diff --git a/graphics/pokemon/zamazenta/icon.png b/graphics/pokemon/zamazenta/icon.png new file mode 100644 index 000000000..7d9d722e0 Binary files /dev/null and b/graphics/pokemon/zamazenta/icon.png differ diff --git a/graphics/pokemon/zigzagoon/galarian/icon.png b/graphics/pokemon/zigzagoon/galarian/icon.png new file mode 100644 index 000000000..d83d717d0 Binary files /dev/null and b/graphics/pokemon/zigzagoon/galarian/icon.png differ diff --git a/include/constants/species.h b/include/constants/species.h index 5a410aa5b..1214538fc 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1312,6 +1312,62 @@ #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 898199713..8e13b8464 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -849,13 +849,13 @@ extern const u32 gMonFrontPic_Meltan[]; extern const u32 gMonFrontPic_Melmetal[]; extern const u32 gMonFrontPic_Grookey[]; extern const u32 gMonFrontPic_Thwackey[]; -//extern const u32 gMonFrontPic_Rillaboom[]; +extern const u32 gMonFrontPic_Rillaboom[]; extern const u32 gMonFrontPic_Scorbunny[]; extern const u32 gMonFrontPic_Raboot[]; extern const u32 gMonFrontPic_Cinderace[]; extern const u32 gMonFrontPic_Sobble[]; extern const u32 gMonFrontPic_Drizzile[]; -//extern const u32 gMonFrontPic_Inteleon[]; +extern const u32 gMonFrontPic_Inteleon[]; extern const u32 gMonFrontPic_Skwovet[]; extern const u32 gMonFrontPic_Greedent[]; extern const u32 gMonFrontPic_Rookidee[]; @@ -931,7 +931,7 @@ extern const u32 gMonFrontPic_Eternatus[]; extern const u32 gMonFrontPic_Kubfu[]; extern const u32 gMonFrontPic_Urshifu[]; extern const u32 gMonFrontPic_Zarude[]; -//extern const u32 gMonFrontPic_Regieleki[]; +extern const u32 gMonFrontPic_Regieleki[]; extern const u32 gMonFrontPic_Regidrago[]; extern const u32 gMonFrontPic_Glastrier[]; extern const u32 gMonFrontPic_Spectrier[]; @@ -1155,20 +1155,18 @@ extern const u32 gMonFrontPic_MagearnaOriginalColor[]; extern const u32 gMonFrontPic_CramorantGulping[]; extern const u32 gMonFrontPic_CramorantGorging[]; extern const u32 gMonFrontPic_ToxtricityLowKey[]; -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_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_EiscueNoiceFace[]; extern const u32 gMonFrontPic_IndeedeeFemale[]; extern const u32 gMonFrontPic_MorpekoHangry[]; extern const u32 gMonFrontPic_ZacianCrownedSword[]; extern const u32 gMonFrontPic_ZamazentaCrownedShield[]; -//extern const u32 gMonFrontPic_EternatusEternamax[]; +extern const u32 gMonFrontPic_EternatusEternamax[]; extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[]; extern const u32 gMonFrontPic_ZarudeDada[]; extern const u32 gMonFrontPic_CalyrexIceRider[]; @@ -1989,13 +1987,13 @@ extern const u32 gMonBackPic_Meltan[]; extern const u32 gMonBackPic_Melmetal[]; extern const u32 gMonBackPic_Grookey[]; extern const u32 gMonBackPic_Thwackey[]; -//extern const u32 gMonBackPic_Rillaboom[]; +extern const u32 gMonBackPic_Rillaboom[]; extern const u32 gMonBackPic_Scorbunny[]; extern const u32 gMonBackPic_Raboot[]; extern const u32 gMonBackPic_Cinderace[]; extern const u32 gMonBackPic_Sobble[]; extern const u32 gMonBackPic_Drizzile[]; -//extern const u32 gMonBackPic_Inteleon[]; +extern const u32 gMonBackPic_Inteleon[]; extern const u32 gMonBackPic_Skwovet[]; extern const u32 gMonBackPic_Greedent[]; extern const u32 gMonBackPic_Rookidee[]; @@ -2071,7 +2069,7 @@ extern const u32 gMonBackPic_Eternatus[]; extern const u32 gMonBackPic_Kubfu[]; extern const u32 gMonBackPic_Urshifu[]; extern const u32 gMonBackPic_Zarude[]; -//extern const u32 gMonBackPic_Regieleki[]; +extern const u32 gMonBackPic_Regieleki[]; extern const u32 gMonBackPic_Regidrago[]; extern const u32 gMonBackPic_Glastrier[]; extern const u32 gMonBackPic_Spectrier[]; @@ -2295,20 +2293,18 @@ extern const u32 gMonBackPic_MagearnaOriginalColor[]; extern const u32 gMonBackPic_CramorantGulping[]; extern const u32 gMonBackPic_CramorantGorging[]; extern const u32 gMonBackPic_ToxtricityLowKey[]; -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_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_EiscueNoiceFace[]; extern const u32 gMonBackPic_IndeedeeFemale[]; extern const u32 gMonBackPic_MorpekoHangry[]; extern const u32 gMonBackPic_ZacianCrownedSword[]; extern const u32 gMonBackPic_ZamazentaCrownedShield[]; -//extern const u32 gMonBackPic_EternatusEternamax[]; +extern const u32 gMonBackPic_EternatusEternamax[]; extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[]; extern const u32 gMonBackPic_ZarudeDada[]; extern const u32 gMonBackPic_CalyrexIceRider[]; @@ -3127,13 +3123,13 @@ extern const u32 gMonPalette_Meltan[]; extern const u32 gMonPalette_Melmetal[]; extern const u32 gMonPalette_Grookey[]; extern const u32 gMonPalette_Thwackey[]; -//extern const u32 gMonPalette_Rillaboom[]; +extern const u32 gMonPalette_Rillaboom[]; extern const u32 gMonPalette_Scorbunny[]; extern const u32 gMonPalette_Raboot[]; extern const u32 gMonPalette_Cinderace[]; extern const u32 gMonPalette_Sobble[]; extern const u32 gMonPalette_Drizzile[]; -//extern const u32 gMonPalette_Inteleon[]; +extern const u32 gMonPalette_Inteleon[]; extern const u32 gMonPalette_Skwovet[]; extern const u32 gMonPalette_Greedent[]; extern const u32 gMonPalette_Rookidee[]; @@ -3209,7 +3205,7 @@ extern const u32 gMonPalette_Eternatus[]; extern const u32 gMonPalette_Kubfu[]; extern const u32 gMonPalette_Urshifu[]; extern const u32 gMonPalette_Zarude[]; -//extern const u32 gMonPalette_Regieleki[]; +extern const u32 gMonPalette_Regieleki[]; extern const u32 gMonPalette_Regidrago[]; extern const u32 gMonPalette_Glastrier[]; extern const u32 gMonPalette_Spectrier[]; @@ -3467,12 +3463,68 @@ 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[]; extern const u32 gMonPalette_ZacianCrownedSword[]; extern const u32 gMonPalette_ZamazentaCrownedShield[]; -//extern const u32 gMonPalette_EternatusEternamax[]; +extern const u32 gMonPalette_EternatusEternamax[]; extern const u32 gMonPalette_UrshifuRapidStrikeStyle[]; extern const u32 gMonPalette_ZarudeDada[]; extern const u32 gMonPalette_CalyrexIceRider[]; @@ -4292,13 +4344,13 @@ extern const u32 gMonShinyPalette_Meltan[]; extern const u32 gMonShinyPalette_Melmetal[]; extern const u32 gMonShinyPalette_Grookey[]; extern const u32 gMonShinyPalette_Thwackey[]; -//extern const u32 gMonShinyPalette_Rillaboom[]; +extern const u32 gMonShinyPalette_Rillaboom[]; extern const u32 gMonShinyPalette_Scorbunny[]; extern const u32 gMonShinyPalette_Raboot[]; extern const u32 gMonShinyPalette_Cinderace[]; extern const u32 gMonShinyPalette_Sobble[]; extern const u32 gMonShinyPalette_Drizzile[]; -//extern const u32 gMonShinyPalette_Inteleon[]; +extern const u32 gMonShinyPalette_Inteleon[]; extern const u32 gMonShinyPalette_Skwovet[]; extern const u32 gMonShinyPalette_Greedent[]; extern const u32 gMonShinyPalette_Rookidee[]; @@ -4350,6 +4402,14 @@ 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[]; @@ -4374,7 +4434,7 @@ extern const u32 gMonShinyPalette_Eternatus[]; extern const u32 gMonShinyPalette_Kubfu[]; extern const u32 gMonShinyPalette_Urshifu[]; extern const u32 gMonShinyPalette_Zarude[]; -//extern const u32 gMonShinyPalette_Regieleki[]; +extern const u32 gMonShinyPalette_Regieleki[]; extern const u32 gMonShinyPalette_Regidrago[]; extern const u32 gMonShinyPalette_Glastrier[]; extern const u32 gMonShinyPalette_Spectrier[]; @@ -4631,7 +4691,7 @@ extern const u32 gMonShinyPalette_IndeedeeFemale[]; extern const u32 gMonShinyPalette_MorpekoHangry[]; extern const u32 gMonShinyPalette_ZacianCrownedSword[]; extern const u32 gMonShinyPalette_ZamazentaCrownedShield[]; -//extern const u32 gMonShinyPalette_EternatusEternamax[]; +extern const u32 gMonShinyPalette_EternatusEternamax[]; extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[]; extern const u32 gMonShinyPalette_ZarudeDada[]; extern const u32 gMonShinyPalette_CalyrexIceRider[]; @@ -5447,6 +5507,95 @@ extern const u8 gMonIcon_Blacephalon[]; extern const u8 gMonIcon_Zeraora[]; extern const u8 gMonIcon_Meltan[]; extern const u8 gMonIcon_Melmetal[]; +extern const u8 gMonIcon_Grookey[]; +extern const u8 gMonIcon_Thwackey[]; +extern const u8 gMonIcon_Rillaboom[]; +extern const u8 gMonIcon_Scorbunny[]; +extern const u8 gMonIcon_Raboot[]; +extern const u8 gMonIcon_Cinderace[]; +extern const u8 gMonIcon_Sobble[]; +extern const u8 gMonIcon_Drizzile[]; +extern const u8 gMonIcon_Inteleon[]; +//extern const u8 gMonIcon_Skwovet[]; +//extern const u8 gMonIcon_Greedent[]; +extern const u8 gMonIcon_Rookidee[]; +extern const u8 gMonIcon_Corvisquire[]; +extern const u8 gMonIcon_Corviknight[]; +extern const u8 gMonIcon_Blipbug[]; +extern const u8 gMonIcon_Dottler[]; +extern const u8 gMonIcon_Orbeetle[]; +extern const u8 gMonIcon_Nickit[]; +extern const u8 gMonIcon_Thievul[]; +extern const u8 gMonIcon_Gossifleur[]; +extern const u8 gMonIcon_Eldegoss[]; +extern const u8 gMonIcon_Wooloo[]; +extern const u8 gMonIcon_Dubwool[]; +extern const u8 gMonIcon_Chewtle[]; +extern const u8 gMonIcon_Drednaw[]; +extern const u8 gMonIcon_Yamper[]; +extern const u8 gMonIcon_Boltund[]; +extern const u8 gMonIcon_Rolycoly[]; +extern const u8 gMonIcon_Carkol[]; +extern const u8 gMonIcon_Coalossal[]; +extern const u8 gMonIcon_Applin[]; +extern const u8 gMonIcon_Flapple[]; +extern const u8 gMonIcon_Appletun[]; +extern const u8 gMonIcon_Silicobra[]; +extern const u8 gMonIcon_Sandaconda[]; +extern const u8 gMonIcon_Cramorant[]; +//extern const u8 gMonIcon_Arrokuda[]; +//extern const u8 gMonIcon_Barraskewda[]; +//extern const u8 gMonIcon_Toxel[]; +extern const u8 gMonIcon_Toxtricity[]; +extern const u8 gMonIcon_Sizzlipede[]; +extern const u8 gMonIcon_Centiskorch[]; +extern const u8 gMonIcon_Clobbopus[]; +extern const u8 gMonIcon_Grapploct[]; +extern const u8 gMonIcon_Sinistea[]; +extern const u8 gMonIcon_Polteageist[]; +extern const u8 gMonIcon_Hatenna[]; +extern const u8 gMonIcon_Hattrem[]; +extern const u8 gMonIcon_Hatterene[]; +extern const u8 gMonIcon_Impidimp[]; +extern const u8 gMonIcon_Morgrem[]; +extern const u8 gMonIcon_Grimmsnarl[]; +extern const u8 gMonIcon_Obstagoon[]; +extern const u8 gMonIcon_Perrserker[]; +extern const u8 gMonIcon_Cursola[]; +extern const u8 gMonIcon_Sirfetchd[]; +extern const u8 gMonIcon_MrRime[]; +extern const u8 gMonIcon_Runerigus[]; +extern const u8 gMonIcon_Milcery[]; +//extern const u8 gMonIcon_Alcremie[]; +extern const u8 gMonIcon_Falinks[]; +//extern const u8 gMonIcon_Pincurchin[]; +extern const u8 gMonIcon_Snom[]; +extern const u8 gMonIcon_Frosmoth[]; +extern const u8 gMonIcon_Stonjourner[]; +extern const u8 gMonIcon_Eiscue[]; +extern const u8 gMonIcon_Indeedee[]; +extern const u8 gMonIcon_Morpeko[]; +extern const u8 gMonIcon_Cufant[]; +extern const u8 gMonIcon_Copperajah[]; +//extern const u8 gMonIcon_Dracozolt[]; +//extern const u8 gMonIcon_Arctozolt[]; +//extern const u8 gMonIcon_Dracovish[]; +//extern const u8 gMonIcon_Arctovish[]; +extern const u8 gMonIcon_Duraludon[]; +extern const u8 gMonIcon_Dreepy[]; +extern const u8 gMonIcon_Drakloak[]; +extern const u8 gMonIcon_Dragapult[]; +extern const u8 gMonIcon_Zacian[]; +extern const u8 gMonIcon_Zamazenta[]; +extern const u8 gMonIcon_Eternatus[]; +//extern const u8 gMonIcon_Kubfu[]; +//extern const u8 gMonIcon_Urshifu[]; +//extern const u8 gMonIcon_Zarude[]; +//extern const u8 gMonIcon_Regieleki[]; +//extern const u8 gMonIcon_Regidrago[]; +//extern const u8 gMonIcon_Glastrier[]; +//extern const u8 gMonIcon_Spectrier[]; +//extern const u8 gMonIcon_Calyrex[]; extern const u8 gMonIcon_VenusaurMega[]; extern const u8 gMonIcon_CharizardMegaX[]; extern const u8 gMonIcon_CharizardMegaY[]; @@ -5515,6 +5664,25 @@ extern const u8 gMonIcon_GrimerAlolan[]; extern const u8 gMonIcon_MukAlolan[]; extern const u8 gMonIcon_ExeggutorAlolan[]; extern const u8 gMonIcon_MarowakAlolan[]; +extern const u8 gMonIcon_MeowthGalarian[]; +extern const u8 gMonIcon_PonytaGalarian[]; +extern const u8 gMonIcon_RapidashGalarian[]; +//extern const u8 gMonIcon_SlowpokeGalarian[]; +//extern const u8 gMonIcon_SlowbroGalarian[]; +extern const u8 gMonIcon_FarfetchdGalarian[]; +extern const u8 gMonIcon_WeezingGalarian[]; +extern const u8 gMonIcon_MrMimeGalarian[]; +//extern const u8 gMonIcon_ArticunoGalarian[]; +//extern const u8 gMonIcon_ZapdosGalarian[]; +//extern const u8 gMonIcon_MoltresGalarian[]; +//extern const u8 gMonIcon_SlowkingGalarian[]; +extern const u8 gMonIcon_CorsolaGalarian[]; +extern const u8 gMonIcon_ZigzagoonGalarian[]; +extern const u8 gMonIcon_LinooneGalarian[]; +extern const u8 gMonIcon_DarumakaGalarian[]; +extern const u8 gMonIcon_DarmanitanGalarian[]; +extern const u8 gMonIcon_YamaskGalarian[]; +extern const u8 gMonIcon_StunfiskGalarian[]; extern const u8 gMonIcon_PikachuCosplay[]; extern const u8 gMonIcon_PikachuRockStar[]; extern const u8 gMonIcon_PikachuBelle[]; @@ -5578,6 +5746,7 @@ extern const u8 gMonIcon_GiratinaOrigin[]; extern const u8 gMonIcon_ShayminSky[]; extern const u8 gMonIcon_BasculinBlueStriped[]; extern const u8 gMonIcon_DarmanitanZenMode[]; +//extern const u8 gMonIcon_DarmanitanZenModeGalarian[]; extern const u8 gMonIcon_DeerlingSummer[]; extern const u8 gMonIcon_DeerlingAutumn[]; extern const u8 gMonIcon_DeerlingWinter[]; @@ -5657,6 +5826,27 @@ extern const u8 gMonIcon_NecrozmaDuskMane[]; extern const u8 gMonIcon_NecrozmaDawnWings[]; extern const u8 gMonIcon_NecrozmaUltra[]; extern const u8 gMonIcon_MagearnaOriginalColor[]; +extern const u8 gMonIcon_CramorantGulping[]; +extern const u8 gMonIcon_CramorantGorging[]; +extern const u8 gMonIcon_ToxtricityLowKey[]; +//extern const u8 gMonIcon_AlcremieRubyCream[]; +//extern const u8 gMonIcon_AlcremieMatchaCream[]; +//extern const u8 gMonIcon_AlcremieMintCream[]; +//extern const u8 gMonIcon_AlcremieLemonCream[]; +//extern const u8 gMonIcon_AlcremieSaltedCream[]; +//extern const u8 gMonIcon_AlcremieRubySwirl[]; +//extern const u8 gMonIcon_AlcremieCaramelSwirl[]; +//extern const u8 gMonIcon_AlcremieRainbowSwirl[]; +extern const u8 gMonIcon_EiscueNoiceFace[]; +extern const u8 gMonIcon_IndeedeeFemale[]; +extern const u8 gMonIcon_MorpekoHangry[]; +extern const u8 gMonIcon_ZacianCrownedSword[]; +extern const u8 gMonIcon_ZamazentaCrownedShield[]; +//extern const u8 gMonIcon_EternatusEternamax[]; +//extern const u8 gMonIcon_UrshifuRapidStrikeStyle[]; +//extern const u8 gMonIcon_ZarudeDada[]; +//extern const u8 gMonIcon_CalyrexIceRider[]; +//extern const u8 gMonIcon_CalyrexShadowRider[]; extern const u8 gMonIcon_Egg[]; extern const u8 gMonFootprint_QuestionMark[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index e279db7c1..20e8d0a4c 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -812,13 +812,13 @@ const u32 gMonFrontPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/front.4bpp const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/front.4bpp.lz"); const u32 gMonFrontPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/front.4bpp.lz"); const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/front.4bpp.lz"); -//const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz"); +const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz"); const u32 gMonFrontPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/front.4bpp.lz"); const u32 gMonFrontPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/front.4bpp.lz"); const u32 gMonFrontPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/front.4bpp.lz"); const u32 gMonFrontPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/front.4bpp.lz"); const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/front.4bpp.lz"); -//const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz"); +const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz"); const u32 gMonFrontPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/front.4bpp.lz"); const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/front.4bpp.lz"); const u32 gMonFrontPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/front.4bpp.lz"); @@ -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/front.4bpp.lz"); +const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/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"); @@ -894,7 +894,7 @@ const u32 gMonFrontPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/fron const u32 gMonFrontPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/front.4bpp.lz"); const u32 gMonFrontPic_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz"); const u32 gMonFrontPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/front.4bpp.lz"); -//const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/front.4bpp.lz"); +const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/front.4bpp.lz"); const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/front.4bpp.lz"); const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz"); const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz"); @@ -1118,20 +1118,18 @@ 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_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_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_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"); const u32 gMonFrontPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/front.4bpp.lz"); const u32 gMonFrontPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/front.4bpp.lz"); -//const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/front.4bpp.lz"); +const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/front.4bpp.lz"); const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/front.4bpp.lz"); const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz"); const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz"); @@ -1952,13 +1950,13 @@ const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/back.4bpp.l const u32 gMonBackPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/back.4bpp.lz"); const u32 gMonBackPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/back.4bpp.lz"); const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/back.4bpp.lz"); -//const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/back.4bpp.lz"); +const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/back.4bpp.lz"); const u32 gMonBackPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/back.4bpp.lz"); const u32 gMonBackPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/back.4bpp.lz"); const u32 gMonBackPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/back.4bpp.lz"); const u32 gMonBackPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/back.4bpp.lz"); const u32 gMonBackPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/back.4bpp.lz"); -//const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/back.4bpp.lz"); +const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/back.4bpp.lz"); const u32 gMonBackPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/back.4bpp.lz"); const u32 gMonBackPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/back.4bpp.lz"); const u32 gMonBackPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/back.4bpp.lz"); @@ -2009,7 +2007,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/back.4bpp.lz"); +const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/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"); @@ -2034,7 +2032,7 @@ const u32 gMonBackPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/back. const u32 gMonBackPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/back.4bpp.lz"); const u32 gMonBackPic_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz"); const u32 gMonBackPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/back.4bpp.lz"); -//const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/back.4bpp.lz"); +const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/back.4bpp.lz"); const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.4bpp.lz"); const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz"); const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz"); @@ -2258,20 +2256,18 @@ 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_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_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_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"); const u32 gMonBackPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/back.4bpp.lz"); const u32 gMonBackPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/back.4bpp.lz"); -//const u32 gMonBackPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/back.4bpp.lz"); +const u32 gMonBackPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/back.4bpp.lz"); const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/back.4bpp.lz"); const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/back.4bpp.lz"); const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz"); @@ -3090,13 +3086,13 @@ const u32 gMonPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/normal.gbap const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/normal.gbapal.lz"); const u32 gMonPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/normal.gbapal.lz"); const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/normal.gbapal.lz"); -//const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz"); +const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz"); const u32 gMonPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/normal.gbapal.lz"); const u32 gMonPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/normal.gbapal.lz"); const u32 gMonPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/normal.gbapal.lz"); const u32 gMonPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/normal.gbapal.lz"); const u32 gMonPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/normal.gbapal.lz"); -//const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/normal.gbapal.lz"); +const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/normal.gbapal.lz"); const u32 gMonPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/normal.gbapal.lz"); const u32 gMonPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/normal.gbapal.lz"); const u32 gMonPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/normal.gbapal.lz"); @@ -3147,7 +3143,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/normal.gbapal.lz"); +const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/vanilla.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"); @@ -3172,7 +3168,7 @@ const u32 gMonPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/norma const u32 gMonPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/normal.gbapal.lz"); const u32 gMonPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz"); const u32 gMonPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/normal.gbapal.lz"); -//const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/normal.gbapal.lz"); +const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/normal.gbapal.lz"); const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/normal.gbapal.lz"); const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz"); const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz"); @@ -3422,20 +3418,76 @@ 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/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_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_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"); const u32 gMonPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/normal.gbapal.lz"); const u32 gMonPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/normal.gbapal.lz"); -//const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/normal.gbapal.lz"); +const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/normal.gbapal.lz"); const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/normal.gbapal.lz"); const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz"); const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz"); @@ -4255,13 +4307,13 @@ const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/shiny. const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/shiny.gbapal.lz"); const u32 gMonShinyPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/shiny.gbapal.lz"); const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/shiny.gbapal.lz"); const u32 gMonShinyPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/shiny.gbapal.lz"); const u32 gMonShinyPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/shiny.gbapal.lz"); const u32 gMonShinyPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/shiny.gbapal.lz"); const u32 gMonShinyPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/shiny.gbapal.lz"); const u32 gMonShinyPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/shiny.gbapal.lz"); @@ -4312,7 +4364,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/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/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"); @@ -4337,7 +4389,7 @@ const u32 gMonShinyPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/ const u32 gMonShinyPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/shiny.gbapal.lz"); const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/shiny.gbapal.lz"); const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz"); @@ -4581,20 +4633,20 @@ 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_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_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_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"); const u32 gMonShinyPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/shiny.gbapal.lz"); const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/shiny.gbapal.lz"); const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz"); @@ -5410,6 +5462,95 @@ const u8 gMonIcon_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/icon.4 const u8 gMonIcon_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/icon.4bpp"); const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/icon.4bpp"); const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/icon.4bpp"); +const u8 gMonIcon_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/icon.4bpp"); +const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/icon.4bpp"); +const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/icon.4bpp"); +const u8 gMonIcon_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/icon.4bpp"); +const u8 gMonIcon_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/icon.4bpp"); +const u8 gMonIcon_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/icon.4bpp"); +const u8 gMonIcon_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/icon.4bpp"); +const u8 gMonIcon_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/icon.4bpp"); +const u8 gMonIcon_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/icon.4bpp"); +//const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/icon.4bpp"); +//const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/icon.4bpp"); +const u8 gMonIcon_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/icon.4bpp"); +const u8 gMonIcon_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/icon.4bpp"); +const u8 gMonIcon_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/icon.4bpp"); +const u8 gMonIcon_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/icon.4bpp"); +const u8 gMonIcon_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/icon.4bpp"); +const u8 gMonIcon_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/icon.4bpp"); +const u8 gMonIcon_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/icon.4bpp"); +const u8 gMonIcon_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/icon.4bpp"); +const u8 gMonIcon_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/icon.4bpp"); +const u8 gMonIcon_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/icon.4bpp"); +const u8 gMonIcon_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/icon.4bpp"); +const u8 gMonIcon_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/icon.4bpp"); +const u8 gMonIcon_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/icon.4bpp"); +const u8 gMonIcon_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/icon.4bpp"); +const u8 gMonIcon_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/icon.4bpp"); +const u8 gMonIcon_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/icon.4bpp"); +const u8 gMonIcon_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/icon.4bpp"); +const u8 gMonIcon_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/icon.4bpp"); +const u8 gMonIcon_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/icon.4bpp"); +const u8 gMonIcon_Applin[] = INCBIN_U8("graphics/pokemon/applin/icon.4bpp"); +const u8 gMonIcon_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/icon.4bpp"); +const u8 gMonIcon_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/icon.4bpp"); +const u8 gMonIcon_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/icon.4bpp"); +const u8 gMonIcon_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/icon.4bpp"); +const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/icon.4bpp"); +//const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/icon.4bpp"); +//const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/icon.4bpp"); +//const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/icon.4bpp"); +const u8 gMonIcon_Toxtricity[] = INCBIN_U8("graphics/pokemon/toxtricity/icon.4bpp"); +const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/icon.4bpp"); +const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/icon.4bpp"); +const u8 gMonIcon_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/icon.4bpp"); +const u8 gMonIcon_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/icon.4bpp"); +const u8 gMonIcon_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/icon.4bpp"); +const u8 gMonIcon_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/icon.4bpp"); +const u8 gMonIcon_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/icon.4bpp"); +const u8 gMonIcon_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/icon.4bpp"); +const u8 gMonIcon_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/icon.4bpp"); +const u8 gMonIcon_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/icon.4bpp"); +const u8 gMonIcon_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/icon.4bpp"); +const u8 gMonIcon_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/icon.4bpp"); +const u8 gMonIcon_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/icon.4bpp"); +const u8 gMonIcon_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/icon.4bpp"); +const u8 gMonIcon_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/icon.4bpp"); +const u8 gMonIcon_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/icon.4bpp"); +const u8 gMonIcon_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/icon.4bpp"); +const u8 gMonIcon_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/icon.4bpp"); +const u8 gMonIcon_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/icon.4bpp"); +//const u8 gMonIcon_Alcremie[] = INCBIN_U8("graphics/pokemon/alcremie/icon.4bpp"); +const u8 gMonIcon_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/icon.4bpp"); +//const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/icon.4bpp"); +const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/snom/icon.4bpp"); +const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/icon.4bpp"); +const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/icon.4bpp"); +const u8 gMonIcon_Eiscue[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp"); +const u8 gMonIcon_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp"); +const u8 gMonIcon_Morpeko[] = INCBIN_U8("graphics/pokemon/morpeko/icon.4bpp"); +const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/icon.4bpp"); +const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/icon.4bpp"); +//const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/icon.4bpp"); +//const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/icon.4bpp"); +//const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/icon.4bpp"); +//const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/icon.4bpp"); +const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/icon.4bpp"); +const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/icon.4bpp"); +const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/icon.4bpp"); +const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/icon.4bpp"); +const u8 gMonIcon_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp"); +const u8 gMonIcon_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp"); +const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/icon.4bpp"); +//const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/icon.4bpp"); +//const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp"); +//const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/icon.4bpp"); +//const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp"); +//const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp"); +//const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp"); +//const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp"); +//const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp"); const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/mega_venusaur/icon.4bpp"); const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/mega_charizard_x/icon.4bpp"); const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/mega_charizard_y/icon.4bpp"); @@ -5478,6 +5619,25 @@ const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/alolan_grimer/ico const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/alolan_muk/icon.4bpp"); const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/alolan_exeggutor/icon.4bpp"); const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/alolan_marowak/icon.4bpp"); +const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/meowth/galarian/icon.4bpp"); +const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/ponyta/galarian/icon.4bpp"); +const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/rapidash/galarian/icon.4bpp"); +//const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/slowpoke/galarian/icon.4bpp"); +//const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/slowbro/galarian/icon.4bpp"); +const u8 gMonIcon_FarfetchdGalarian[] = INCBIN_U8("graphics/pokemon/farfetchd/galarian/icon.4bpp"); +const u8 gMonIcon_WeezingGalarian[] = INCBIN_U8("graphics/pokemon/weezing/galarian/icon.4bpp"); +const u8 gMonIcon_MrMimeGalarian[] = INCBIN_U8("graphics/pokemon/mr_mime/galarian/icon.4bpp"); +//const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/articuno/galarian/icon.4bpp"); +//const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/zapdos/galarian/icon.4bpp"); +//const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/moltres/galarian/icon.4bpp"); +//const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/slowking/galarian/icon.4bpp"); +const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/corsola/galarian/icon.4bpp"); +const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/galarian/icon.4bpp"); +const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/linoone/galarian/icon.4bpp"); +const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/galarian/icon.4bpp"); +const u8 gMonIcon_DarmanitanGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp"); +const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp"); +const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/galarian/icon.4bpp"); const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/pikachu/cosplay/icon.4bpp"); const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/pikachu/rock_star/icon.4bpp"); const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/pikachu/belle/icon.4bpp"); @@ -5541,6 +5701,7 @@ const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4bpp"); const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/basculin/blue_striped/icon.4bpp"); const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp"); +//const u8 gMonIcon_DarmanitanZenModeGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp"); const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/deerling/summer/icon.4bpp"); const u8 gMonIcon_DeerlingAutumn[] = INCBIN_U8("graphics/pokemon/deerling/autumn/icon.4bpp"); const u8 gMonIcon_DeerlingWinter[] = INCBIN_U8("graphics/pokemon/deerling/winter/icon.4bpp"); @@ -5620,6 +5781,27 @@ const u8 gMonIcon_NecrozmaDuskMane[] = INCBIN_U8("graphics/pokemon/necrozma/dusk const u8 gMonIcon_NecrozmaDawnWings[] = INCBIN_U8("graphics/pokemon/necrozma/dawn_wings/icon.4bpp"); const u8 gMonIcon_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/necrozma/ultra/icon.4bpp"); const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/magearna/original_color/icon.4bpp"); +const u8 gMonIcon_CramorantGulping[] = INCBIN_U8("graphics/pokemon/cramorant/gulping/icon.4bpp"); +const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/cramorant/gorging/icon.4bpp"); +const u8 gMonIcon_ToxtricityLowKey[] = INCBIN_U8("graphics/pokemon/toxtricity/low_key/icon.4bpp"); +//const u8 gMonIcon_AlcremieRubyCream[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieMatchaCream[] = INCBIN_U8("graphics/pokemon/alcremie/matcha_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieMintCream[] = INCBIN_U8("graphics/pokemon/alcremie/mint_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieLemonCream[] = INCBIN_U8("graphics/pokemon/alcremie/lemon_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieSaltedCream[] = INCBIN_U8("graphics/pokemon/alcremie/salted_cream/icon.4bpp"); +//const u8 gMonIcon_AlcremieRubySwirl[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_swirl/icon.4bpp"); +//const u8 gMonIcon_AlcremieCaramelSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/caramel_swirl/icon.4bpp"); +//const u8 gMonIcon_AlcremieRainbowSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/rainbow_swirl/icon.4bpp"); +const u8 gMonIcon_EiscueNoiceFace[] = INCBIN_U8("graphics/pokemon/eiscue/noice_face/icon.4bpp"); +const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/indeedee/female/icon.4bpp"); +const u8 gMonIcon_MorpekoHangry[] = INCBIN_U8("graphics/pokemon/morpeko/hangry/icon.4bpp"); +const u8 gMonIcon_ZacianCrownedSword[] = INCBIN_U8("graphics/pokemon/zacian/crowned_sword/icon.4bpp"); +const u8 gMonIcon_ZamazentaCrownedShield[] = INCBIN_U8("graphics/pokemon/zamazenta/crowned_shield/icon.4bpp"); +//const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/eternamax/icon.4bpp"); +//const u8 gMonIcon_UrshifuRapidStrikeStyle[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_style/icon.4bpp"); +//const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp"); +//const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp"); +//const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp"); const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 1770255c2..6c98620e0 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -4063,7 +4063,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_RILLABOOM] = { .size = 0x85, - .y_offset = 13, + .y_offset = 4, }, [SPECIES_SCORBUNNY] = { @@ -4093,7 +4093,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_INTELEON] = { .size = 0x85, - .y_offset = 13, + .y_offset = 4, }, [SPECIES_SKWOVET] = { @@ -4473,7 +4473,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_REGIELEKI] = { .size = 0x85, - .y_offset = 13, + .y_offset = 9, }, [SPECIES_REGIDRAGO] = { @@ -6075,7 +6075,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_ETERNATUS_ETERNAMAX] = { .size = 0x85, - .y_offset = 13, + .y_offset = 7, }, // Urshifu [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index e1670e819..e6dc8070f 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -812,13 +812,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(MELMETAL, gMonBackPic_Melmetal), SPECIES_SPRITE(GROOKEY, gMonBackPic_Grookey), SPECIES_SPRITE(THWACKEY, gMonBackPic_Thwackey), - SPECIES_SPRITE(RILLABOOM, gMonBackPic_DoubleQuestionMark/*gMonBackPic_Rillaboom*/), + SPECIES_SPRITE(RILLABOOM, gMonBackPic_Rillaboom), SPECIES_SPRITE(SCORBUNNY, gMonBackPic_Scorbunny), SPECIES_SPRITE(RABOOT, gMonBackPic_Raboot), SPECIES_SPRITE(CINDERACE, gMonBackPic_Cinderace), SPECIES_SPRITE(SOBBLE, gMonBackPic_Sobble), SPECIES_SPRITE(DRIZZILE, gMonBackPic_Drizzile), - SPECIES_SPRITE(INTELEON, gMonBackPic_DoubleQuestionMark/*gMonBackPic_Inteleon*/), + SPECIES_SPRITE(INTELEON, gMonBackPic_Inteleon), SPECIES_SPRITE(SKWOVET, gMonBackPic_Skwovet), SPECIES_SPRITE(GREEDENT, gMonBackPic_Greedent), SPECIES_SPRITE(ROOKIDEE, gMonBackPic_Rookidee), @@ -894,7 +894,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(KUBFU, gMonBackPic_Kubfu), SPECIES_SPRITE(URSHIFU, gMonBackPic_Urshifu), SPECIES_SPRITE(ZARUDE, gMonBackPic_Zarude), - SPECIES_SPRITE(REGIELEKI, gMonBackPic_DoubleQuestionMark/*gMonBackPic_Regieleki*/), + SPECIES_SPRITE(REGIELEKI, gMonBackPic_Regieleki), SPECIES_SPRITE(REGIDRAGO, gMonBackPic_Regidrago), SPECIES_SPRITE(GLASTRIER, gMonBackPic_Glastrier), SPECIES_SPRITE(SPECTRIER, gMonBackPic_Spectrier), @@ -1244,14 +1244,70 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(POLTEAGEIST_ANTIQUE, gMonBackPic_Polteageist), - 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(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(EISCUE_NOICE_FACE, gMonBackPic_EiscueNoiceFace), @@ -1263,7 +1319,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(ZAMAZENTA_CROWNED_SHIELD, gMonBackPic_ZamazentaCrownedShield), - SPECIES_SPRITE(ETERNATUS_ETERNAMAX, gMonBackPic_Eternatus/*Eternamax*/), + SPECIES_SPRITE(ETERNATUS_ETERNAMAX, gMonBackPic_EternatusEternamax), SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE, gMonBackPic_UrshifuRapidStrikeStyle), diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 4528ed59d..54fece404 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -131,5 +131,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = // Misc Forms [SPECIES_GIRATINA_ORIGIN] = 7, [SPECIES_THUNDURUS_THERIAN] = 7, + // Eternamax + [SPECIES_ETERNATUS_ETERNAMAX] = 4, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 56632aa43..e302b90c3 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -4064,7 +4064,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_RILLABOOM] = { .size = 0x86, - .y_offset = 4, + .y_offset = 3, }, [SPECIES_SCORBUNNY] = { @@ -4094,7 +4094,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_INTELEON] = { .size = 0x86, - .y_offset = 4, + .y_offset = 1, }, [SPECIES_SKWOVET] = { @@ -6076,7 +6076,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_ETERNATUS_ETERNAMAX] = { .size = 0x86, - .y_offset = 4, + .y_offset = 0, }, // Urshifu [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index e73f6458b..8876edf21 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -812,13 +812,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(MELMETAL, gMonFrontPic_Melmetal), SPECIES_SPRITE(GROOKEY, gMonFrontPic_Grookey), SPECIES_SPRITE(THWACKEY, gMonFrontPic_Thwackey), - SPECIES_SPRITE(RILLABOOM, gMonFrontPic_DoubleQuestionMark/*gMonFrontPic_Rillaboom*/), + SPECIES_SPRITE(RILLABOOM, gMonFrontPic_Rillaboom), SPECIES_SPRITE(SCORBUNNY, gMonFrontPic_Scorbunny), SPECIES_SPRITE(RABOOT, gMonFrontPic_Raboot), SPECIES_SPRITE(CINDERACE, gMonFrontPic_Cinderace), SPECIES_SPRITE(SOBBLE, gMonFrontPic_Sobble), SPECIES_SPRITE(DRIZZILE, gMonFrontPic_Drizzile), - SPECIES_SPRITE(INTELEON, gMonFrontPic_DoubleQuestionMark/*gMonFrontPic_Inteleon*/), + SPECIES_SPRITE(INTELEON, gMonFrontPic_Inteleon), SPECIES_SPRITE(SKWOVET, gMonFrontPic_Skwovet), SPECIES_SPRITE(GREEDENT, gMonFrontPic_Greedent), SPECIES_SPRITE(ROOKIDEE, gMonFrontPic_Rookidee), @@ -894,7 +894,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(KUBFU, gMonFrontPic_Kubfu), SPECIES_SPRITE(URSHIFU, gMonFrontPic_Urshifu), SPECIES_SPRITE(ZARUDE, gMonFrontPic_Zarude), - SPECIES_SPRITE(REGIELEKI, gMonFrontPic_DoubleQuestionMark/*gMonFrontPic_Regieleki*/), + SPECIES_SPRITE(REGIELEKI, gMonFrontPic_Regieleki), SPECIES_SPRITE(REGIDRAGO, gMonFrontPic_Regidrago), SPECIES_SPRITE(GLASTRIER, gMonFrontPic_Glastrier), SPECIES_SPRITE(SPECTRIER, gMonFrontPic_Spectrier), @@ -1244,14 +1244,70 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(POLTEAGEIST_ANTIQUE, gMonFrontPic_Polteageist), - 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(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(EISCUE_NOICE_FACE, gMonFrontPic_EiscueNoiceFace), @@ -1263,7 +1319,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(ZAMAZENTA_CROWNED_SHIELD, gMonFrontPic_ZamazentaCrownedShield), - SPECIES_SPRITE(ETERNATUS_ETERNAMAX, gMonFrontPic_Eternatus/*Eternamax*/), + SPECIES_SPRITE(ETERNATUS_ETERNAMAX, gMonFrontPic_EternatusEternamax), SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE, gMonFrontPic_UrshifuRapidStrikeStyle), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index c66d57846..bd338717f 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -812,13 +812,13 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MELMETAL, gMonPalette_Melmetal), SPECIES_PAL(GROOKEY, gMonPalette_Grookey), SPECIES_PAL(THWACKEY, gMonPalette_Thwackey), - SPECIES_PAL(RILLABOOM, gMonPalette_DoubleQuestionMark/*gMonPalette_Rillaboom*/), + SPECIES_PAL(RILLABOOM, gMonPalette_Rillaboom), SPECIES_PAL(SCORBUNNY, gMonPalette_Scorbunny), SPECIES_PAL(RABOOT, gMonPalette_Raboot), SPECIES_PAL(CINDERACE, gMonPalette_Cinderace), SPECIES_PAL(SOBBLE, gMonPalette_Sobble), SPECIES_PAL(DRIZZILE, gMonPalette_Drizzile), - SPECIES_PAL(INTELEON, gMonPalette_DoubleQuestionMark/*gMonPalette_Inteleon*/), + SPECIES_PAL(INTELEON, gMonPalette_Inteleon), SPECIES_PAL(SKWOVET, gMonPalette_Skwovet), SPECIES_PAL(GREEDENT, gMonPalette_Greedent), SPECIES_PAL(ROOKIDEE, gMonPalette_Rookidee), @@ -894,7 +894,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(KUBFU, gMonPalette_Kubfu), SPECIES_PAL(URSHIFU, gMonPalette_Urshifu), SPECIES_PAL(ZARUDE, gMonPalette_Zarude), - SPECIES_PAL(REGIELEKI, gMonPalette_DoubleQuestionMark/*gMonPalette_Regieleki*/), + SPECIES_PAL(REGIELEKI, gMonPalette_Regieleki), SPECIES_PAL(REGIDRAGO, gMonPalette_Regidrago), SPECIES_PAL(GLASTRIER, gMonPalette_Glastrier), SPECIES_PAL(SPECTRIER, gMonPalette_Spectrier), @@ -1235,7 +1235,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MAGEARNA_ORIGINAL_COLOR, gMonPalette_MagearnaOriginalColor), -SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), + SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), SPECIES_PAL(CRAMORANT_GORGING, gMonPalette_CramorantGorging), SPECIES_PAL(TOXTRICITY_LOW_KEY, gMonPalette_ToxtricityLowKey), @@ -1252,6 +1252,62 @@ SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), 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), @@ -1263,7 +1319,7 @@ SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), SPECIES_PAL(ZAMAZENTA_CROWNED_SHIELD, gMonPalette_ZamazentaCrownedShield), - SPECIES_PAL(ETERNATUS_ETERNAMAX, gMonPalette_Eternatus/*Eternamax*/), + SPECIES_PAL(ETERNATUS_ETERNAMAX, gMonPalette_EternatusEternamax), SPECIES_PAL(URSHIFU_RAPID_STRIKE_STYLE, gMonPalette_UrshifuRapidStrikeStyle), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 0985b1609..9e00d8b93 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -812,13 +812,13 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(MELMETAL, gMonShinyPalette_Melmetal), SPECIES_SHINY_PAL(GROOKEY, gMonShinyPalette_Grookey), SPECIES_SHINY_PAL(THWACKEY, gMonShinyPalette_Thwackey), - SPECIES_SHINY_PAL(RILLABOOM, gMonShinyPalette_DoubleQuestionMark/*gMonShinyPalette_Rillaboom*/), + SPECIES_SHINY_PAL(RILLABOOM, gMonShinyPalette_Rillaboom), SPECIES_SHINY_PAL(SCORBUNNY, gMonShinyPalette_Scorbunny), SPECIES_SHINY_PAL(RABOOT, gMonShinyPalette_Raboot), SPECIES_SHINY_PAL(CINDERACE, gMonShinyPalette_Cinderace), SPECIES_SHINY_PAL(SOBBLE, gMonShinyPalette_Sobble), SPECIES_SHINY_PAL(DRIZZILE, gMonShinyPalette_Drizzile), - SPECIES_SHINY_PAL(INTELEON, gMonShinyPalette_DoubleQuestionMark/*gMonShinyPalette_Inteleon*/), + SPECIES_SHINY_PAL(INTELEON, gMonShinyPalette_Inteleon), SPECIES_SHINY_PAL(SKWOVET, gMonShinyPalette_Skwovet), SPECIES_SHINY_PAL(GREEDENT, gMonShinyPalette_Greedent), SPECIES_SHINY_PAL(ROOKIDEE, gMonShinyPalette_Rookidee), @@ -894,7 +894,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(KUBFU, gMonShinyPalette_Kubfu), SPECIES_SHINY_PAL(URSHIFU, gMonShinyPalette_Urshifu), SPECIES_SHINY_PAL(ZARUDE, gMonShinyPalette_Zarude), - SPECIES_SHINY_PAL(REGIELEKI, gMonShinyPalette_DoubleQuestionMark/*gMonShinyPalette_Regieleki*/), + SPECIES_SHINY_PAL(REGIELEKI, gMonShinyPalette_Regieleki), SPECIES_SHINY_PAL(REGIDRAGO, gMonShinyPalette_Regidrago), SPECIES_SHINY_PAL(GLASTRIER, gMonShinyPalette_Glastrier), SPECIES_SHINY_PAL(SPECTRIER, gMonShinyPalette_Spectrier), @@ -1244,14 +1244,70 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(POLTEAGEIST_ANTIQUE, gMonShinyPalette_Polteageist), - 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(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(EISCUE_NOICE_FACE, gMonShinyPalette_EiscueNoiceFace), @@ -1263,7 +1319,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(ZAMAZENTA_CROWNED_SHIELD, gMonShinyPalette_ZamazentaCrownedShield), - SPECIES_SHINY_PAL(ETERNATUS_ETERNAMAX, gMonShinyPalette_Eternatus/*Eternamax*/), + SPECIES_SHINY_PAL(ETERNATUS_ETERNAMAX, gMonShinyPalette_EternatusEternamax), SPECIES_SHINY_PAL(URSHIFU_RAPID_STRIKE_STYLE, gMonShinyPalette_UrshifuRapidStrikeStyle), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 534461733..2e1e48376 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -835,95 +835,95 @@ const u8 *const gMonIconTable[] = [SPECIES_ZERAORA] = gMonIcon_Zeraora, [SPECIES_MELTAN] = gMonIcon_Meltan, [SPECIES_MELMETAL] = gMonIcon_Melmetal, - [SPECIES_GROOKEY] = gMonIcon_QuestionMark, - [SPECIES_THWACKEY] = gMonIcon_QuestionMark, - [SPECIES_RILLABOOM] = gMonIcon_QuestionMark, - [SPECIES_SCORBUNNY] = gMonIcon_QuestionMark, - [SPECIES_RABOOT] = gMonIcon_QuestionMark, - [SPECIES_CINDERACE] = gMonIcon_QuestionMark, - [SPECIES_SOBBLE] = gMonIcon_QuestionMark, - [SPECIES_DRIZZILE] = gMonIcon_QuestionMark, - [SPECIES_INTELEON] = gMonIcon_QuestionMark, - [SPECIES_SKWOVET] = gMonIcon_QuestionMark, - [SPECIES_GREEDENT] = gMonIcon_QuestionMark, - [SPECIES_ROOKIDEE] = gMonIcon_QuestionMark, - [SPECIES_CORVISQUIRE] = gMonIcon_QuestionMark, - [SPECIES_CORVIKNIGHT] = gMonIcon_QuestionMark, - [SPECIES_BLIPBUG] = gMonIcon_QuestionMark, - [SPECIES_DOTTLER] = gMonIcon_QuestionMark, - [SPECIES_ORBEETLE] = gMonIcon_QuestionMark, - [SPECIES_NICKIT] = gMonIcon_QuestionMark, - [SPECIES_THIEVUL] = gMonIcon_QuestionMark, - [SPECIES_GOSSIFLEUR] = gMonIcon_QuestionMark, - [SPECIES_ELDEGOSS] = gMonIcon_QuestionMark, - [SPECIES_WOOLOO] = gMonIcon_QuestionMark, - [SPECIES_DUBWOOL] = gMonIcon_QuestionMark, - [SPECIES_CHEWTLE] = gMonIcon_QuestionMark, - [SPECIES_DREDNAW] = gMonIcon_QuestionMark, - [SPECIES_YAMPER] = gMonIcon_QuestionMark, - [SPECIES_BOLTUND] = gMonIcon_QuestionMark, - [SPECIES_ROLYCOLY] = gMonIcon_QuestionMark, - [SPECIES_CARKOL] = gMonIcon_QuestionMark, - [SPECIES_COALOSSAL] = gMonIcon_QuestionMark, - [SPECIES_APPLIN] = gMonIcon_QuestionMark, - [SPECIES_FLAPPLE] = gMonIcon_QuestionMark, - [SPECIES_APPLETUN] = gMonIcon_QuestionMark, - [SPECIES_SILICOBRA] = gMonIcon_QuestionMark, - [SPECIES_SANDACONDA] = gMonIcon_QuestionMark, - [SPECIES_CRAMORANT] = gMonIcon_QuestionMark, - [SPECIES_ARROKUDA] = gMonIcon_QuestionMark, - [SPECIES_BARRASKEWDA] = gMonIcon_QuestionMark, - [SPECIES_TOXEL] = gMonIcon_QuestionMark, - [SPECIES_TOXTRICITY] = gMonIcon_QuestionMark, - [SPECIES_SIZZLIPEDE] = gMonIcon_QuestionMark, - [SPECIES_CENTISKORCH] = gMonIcon_QuestionMark, - [SPECIES_CLOBBOPUS] = gMonIcon_QuestionMark, - [SPECIES_GRAPPLOCT] = gMonIcon_QuestionMark, - [SPECIES_SINISTEA] = gMonIcon_QuestionMark, - [SPECIES_POLTEAGEIST] = gMonIcon_QuestionMark, - [SPECIES_HATENNA] = gMonIcon_QuestionMark, - [SPECIES_HATTREM] = gMonIcon_QuestionMark, - [SPECIES_HATTERENE] = gMonIcon_QuestionMark, - [SPECIES_IMPIDIMP] = gMonIcon_QuestionMark, - [SPECIES_MORGREM] = gMonIcon_QuestionMark, - [SPECIES_GRIMMSNARL] = gMonIcon_QuestionMark, - [SPECIES_OBSTAGOON] = gMonIcon_QuestionMark, - [SPECIES_PERRSERKER] = gMonIcon_QuestionMark, - [SPECIES_CURSOLA] = gMonIcon_QuestionMark, - [SPECIES_SIRFETCHD] = gMonIcon_QuestionMark, - [SPECIES_MR_RIME] = gMonIcon_QuestionMark, - [SPECIES_RUNERIGUS] = gMonIcon_QuestionMark, - [SPECIES_MILCERY] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE] = gMonIcon_QuestionMark, - [SPECIES_FALINKS] = gMonIcon_QuestionMark, - [SPECIES_PINCURCHIN] = gMonIcon_QuestionMark, - [SPECIES_SNOM] = gMonIcon_QuestionMark, - [SPECIES_FROSMOTH] = gMonIcon_QuestionMark, - [SPECIES_STONJOURNER] = gMonIcon_QuestionMark, - [SPECIES_EISCUE] = gMonIcon_QuestionMark, - [SPECIES_INDEEDEE] = gMonIcon_QuestionMark, - [SPECIES_MORPEKO] = gMonIcon_QuestionMark, - [SPECIES_CUFANT] = gMonIcon_QuestionMark, - [SPECIES_COPPERAJAH] = gMonIcon_QuestionMark, - [SPECIES_DRACOZOLT] = gMonIcon_QuestionMark, - [SPECIES_ARCTOZOLT] = gMonIcon_QuestionMark, - [SPECIES_DRACOVISH] = gMonIcon_QuestionMark, - [SPECIES_ARCTOVISH] = gMonIcon_QuestionMark, - [SPECIES_DURALUDON] = gMonIcon_QuestionMark, - [SPECIES_DREEPY] = gMonIcon_QuestionMark, - [SPECIES_DRAKLOAK] = gMonIcon_QuestionMark, - [SPECIES_DRAGAPULT] = gMonIcon_QuestionMark, - [SPECIES_ZACIAN] = gMonIcon_QuestionMark, - [SPECIES_ZAMAZENTA] = gMonIcon_QuestionMark, - [SPECIES_ETERNATUS] = gMonIcon_QuestionMark, - [SPECIES_KUBFU] = gMonIcon_QuestionMark, - [SPECIES_URSHIFU] = gMonIcon_QuestionMark, - [SPECIES_ZARUDE] = gMonIcon_QuestionMark, - [SPECIES_REGIELEKI] = gMonIcon_QuestionMark, - [SPECIES_REGIDRAGO] = gMonIcon_QuestionMark, - [SPECIES_GLASTRIER] = gMonIcon_QuestionMark, - [SPECIES_SPECTRIER] = gMonIcon_QuestionMark, - [SPECIES_CALYREX] = gMonIcon_QuestionMark, + [SPECIES_GROOKEY] = gMonIcon_Grookey, + [SPECIES_THWACKEY] = gMonIcon_Thwackey, + [SPECIES_RILLABOOM] = gMonIcon_Rillaboom, + [SPECIES_SCORBUNNY] = gMonIcon_Scorbunny, + [SPECIES_RABOOT] = gMonIcon_Raboot, + [SPECIES_CINDERACE] = gMonIcon_Cinderace, + [SPECIES_SOBBLE] = gMonIcon_Sobble, + [SPECIES_DRIZZILE] = gMonIcon_Drizzile, + [SPECIES_INTELEON] = gMonIcon_Inteleon, + [SPECIES_SKWOVET] = gMonIcon_QuestionMark,//gMonIcon_Skwovet, + [SPECIES_GREEDENT] = gMonIcon_QuestionMark,//gMonIcon_Greedent, + [SPECIES_ROOKIDEE] = gMonIcon_Rookidee, + [SPECIES_CORVISQUIRE] = gMonIcon_Corvisquire, + [SPECIES_CORVIKNIGHT] = gMonIcon_Corviknight, + [SPECIES_BLIPBUG] = gMonIcon_Blipbug, + [SPECIES_DOTTLER] = gMonIcon_Dottler, + [SPECIES_ORBEETLE] = gMonIcon_Orbeetle, + [SPECIES_NICKIT] = gMonIcon_Nickit, + [SPECIES_THIEVUL] = gMonIcon_Thievul, + [SPECIES_GOSSIFLEUR] = gMonIcon_Gossifleur, + [SPECIES_ELDEGOSS] = gMonIcon_Eldegoss, + [SPECIES_WOOLOO] = gMonIcon_Wooloo, + [SPECIES_DUBWOOL] = gMonIcon_Dubwool, + [SPECIES_CHEWTLE] = gMonIcon_Chewtle, + [SPECIES_DREDNAW] = gMonIcon_Drednaw, + [SPECIES_YAMPER] = gMonIcon_Yamper, + [SPECIES_BOLTUND] = gMonIcon_Boltund, + [SPECIES_ROLYCOLY] = gMonIcon_Rolycoly, + [SPECIES_CARKOL] = gMonIcon_Carkol, + [SPECIES_COALOSSAL] = gMonIcon_Coalossal, + [SPECIES_APPLIN] = gMonIcon_Applin, + [SPECIES_FLAPPLE] = gMonIcon_Flapple, + [SPECIES_APPLETUN] = gMonIcon_Appletun, + [SPECIES_SILICOBRA] = gMonIcon_Silicobra, + [SPECIES_SANDACONDA] = gMonIcon_Sandaconda, + [SPECIES_CRAMORANT] = gMonIcon_Cramorant, + [SPECIES_ARROKUDA] = gMonIcon_QuestionMark,//gMonIcon_Arrokuda, + [SPECIES_BARRASKEWDA] = gMonIcon_QuestionMark,//gMonIcon_Barraskewda, + [SPECIES_TOXEL] = gMonIcon_QuestionMark,//gMonIcon_Toxel, + [SPECIES_TOXTRICITY] = gMonIcon_Toxtricity, + [SPECIES_SIZZLIPEDE] = gMonIcon_Sizzlipede, + [SPECIES_CENTISKORCH] = gMonIcon_Centiskorch, + [SPECIES_CLOBBOPUS] = gMonIcon_Clobbopus, + [SPECIES_GRAPPLOCT] = gMonIcon_Grapploct, + [SPECIES_SINISTEA] = gMonIcon_Sinistea, + [SPECIES_POLTEAGEIST] = gMonIcon_Polteageist, + [SPECIES_HATENNA] = gMonIcon_Hatenna, + [SPECIES_HATTREM] = gMonIcon_Hattrem, + [SPECIES_HATTERENE] = gMonIcon_Hatterene, + [SPECIES_IMPIDIMP] = gMonIcon_Impidimp, + [SPECIES_MORGREM] = gMonIcon_Morgrem, + [SPECIES_GRIMMSNARL] = gMonIcon_Grimmsnarl, + [SPECIES_OBSTAGOON] = gMonIcon_Obstagoon, + [SPECIES_PERRSERKER] = gMonIcon_Perrserker, + [SPECIES_CURSOLA] = gMonIcon_Cursola, + [SPECIES_SIRFETCHD] = gMonIcon_Sirfetchd, + [SPECIES_MR_RIME] = gMonIcon_MrRime, + [SPECIES_RUNERIGUS] = gMonIcon_Runerigus, + [SPECIES_MILCERY] = gMonIcon_Milcery, + [SPECIES_ALCREMIE] = gMonIcon_QuestionMark,//gMonIcon_Alcremie, + [SPECIES_FALINKS] = gMonIcon_Falinks, + [SPECIES_PINCURCHIN] = gMonIcon_QuestionMark,//gMonIcon_Pincurchin, + [SPECIES_SNOM] = gMonIcon_Snom, + [SPECIES_FROSMOTH] = gMonIcon_Frosmoth, + [SPECIES_STONJOURNER] = gMonIcon_Stonjourner, + [SPECIES_EISCUE] = gMonIcon_Eiscue, + [SPECIES_INDEEDEE] = gMonIcon_Indeedee, + [SPECIES_MORPEKO] = gMonIcon_Morpeko, + [SPECIES_CUFANT] = gMonIcon_Cufant, + [SPECIES_COPPERAJAH] = gMonIcon_Copperajah, + [SPECIES_DRACOZOLT] = gMonIcon_QuestionMark,//gMonIcon_Dracozolt, + [SPECIES_ARCTOZOLT] = gMonIcon_QuestionMark,//gMonIcon_Arctozolt, + [SPECIES_DRACOVISH] = gMonIcon_QuestionMark,//gMonIcon_Dracovish, + [SPECIES_ARCTOVISH] = gMonIcon_QuestionMark,//gMonIcon_Arctovish, + [SPECIES_DURALUDON] = gMonIcon_Duraludon, + [SPECIES_DREEPY] = gMonIcon_Dreepy, + [SPECIES_DRAKLOAK] = gMonIcon_Drakloak, + [SPECIES_DRAGAPULT] = gMonIcon_Dragapult, + [SPECIES_ZACIAN] = gMonIcon_Zacian, + [SPECIES_ZAMAZENTA] = gMonIcon_Zamazenta, + [SPECIES_ETERNATUS] = gMonIcon_Eternatus, + [SPECIES_KUBFU] = gMonIcon_QuestionMark,//gMonIcon_Kubfu, + [SPECIES_URSHIFU] = gMonIcon_QuestionMark,//gMonIcon_Urshifu, + [SPECIES_ZARUDE] = gMonIcon_QuestionMark,//gMonIcon_Zarude, + [SPECIES_REGIELEKI] = gMonIcon_QuestionMark,//gMonIcon_Regieleki, + [SPECIES_REGIDRAGO] = gMonIcon_QuestionMark,//gMonIcon_Regidrago, + [SPECIES_GLASTRIER] = gMonIcon_QuestionMark,//gMonIcon_Glastrier, + [SPECIES_SPECTRIER] = gMonIcon_QuestionMark,//gMonIcon_Spectrier, + [SPECIES_CALYREX] = gMonIcon_QuestionMark,//gMonIcon_Calyrex, [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY, @@ -992,25 +992,25 @@ const u8 *const gMonIconTable[] = [SPECIES_MUK_ALOLAN] = gMonIcon_MukAlolan, [SPECIES_EXEGGUTOR_ALOLAN] = gMonIcon_ExeggutorAlolan, [SPECIES_MAROWAK_ALOLAN] = gMonIcon_MarowakAlolan, - [SPECIES_MEOWTH_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_PONYTA_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_RAPIDASH_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_FARFETCHD_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_WEEZING_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_MR_MIME_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_MOLTRES_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_SLOWKING_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_CORSOLA_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_LINOONE_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_YAMASK_GALARIAN] = gMonIcon_QuestionMark, - [SPECIES_STUNFISK_GALARIAN] = gMonIcon_QuestionMark, + [SPECIES_MEOWTH_GALARIAN] = gMonIcon_MeowthGalarian, + [SPECIES_PONYTA_GALARIAN] = gMonIcon_PonytaGalarian, + [SPECIES_RAPIDASH_GALARIAN] = gMonIcon_RapidashGalarian, + [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowpokeGalarian, + [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowbroGalarian, + [SPECIES_FARFETCHD_GALARIAN] = gMonIcon_FarfetchdGalarian, + [SPECIES_WEEZING_GALARIAN] = gMonIcon_WeezingGalarian, + [SPECIES_MR_MIME_GALARIAN] = gMonIcon_MrMimeGalarian, + [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_ArticunoGalarian, + [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_ZapdosGalarian, + [SPECIES_MOLTRES_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_MoltresGalarian, + [SPECIES_SLOWKING_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowkingGalarian, + [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian, + [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian, + [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, + [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, + [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian, + [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, + [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, @@ -1092,7 +1092,7 @@ const u8 *const gMonIconTable[] = [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped, [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_QuestionMark, + [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_DarmanitanZenModeGalarian, [SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer, [SPECIES_DEERLING_AUTUMN] = gMonIcon_DeerlingAutumn, [SPECIES_DEERLING_WINTER] = gMonIcon_DeerlingWinter, @@ -1209,29 +1209,29 @@ const u8 *const gMonIconTable[] = [SPECIES_NECROZMA_DAWN_WINGS] = gMonIcon_NecrozmaDawnWings, [SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor, - [SPECIES_CRAMORANT_GULPING] = gMonIcon_QuestionMark, - [SPECIES_CRAMORANT_GORGING] = gMonIcon_QuestionMark, - [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_QuestionMark, - [SPECIES_SINISTEA_ANTIQUE] = gMonIcon_QuestionMark, - [SPECIES_POLTEAGEIST_ANTIQUE] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_RUBY_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_MATCHA_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_MINT_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_LEMON_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_SALTED_CREAM] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_RUBY_SWIRL] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = gMonIcon_QuestionMark, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = gMonIcon_QuestionMark, - [SPECIES_EISCUE_NOICE_FACE] = gMonIcon_QuestionMark, - [SPECIES_INDEEDEE_FEMALE] = gMonIcon_QuestionMark, - [SPECIES_MORPEKO_HANGRY] = gMonIcon_QuestionMark, - [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_QuestionMark, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_QuestionMark, - [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_QuestionMark, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_QuestionMark, - [SPECIES_ZARUDE_DADA] = gMonIcon_QuestionMark, - [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_QuestionMark, - [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_QuestionMark, + [SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping, + [SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging, + [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, + [SPECIES_SINISTEA_ANTIQUE] = gMonIcon_Sinistea, + [SPECIES_POLTEAGEIST_ANTIQUE] = gMonIcon_Polteageist, + [SPECIES_ALCREMIE_RUBY_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubyCream, + [SPECIES_ALCREMIE_MATCHA_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMatchaCream, + [SPECIES_ALCREMIE_MINT_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieMintCream, + [SPECIES_ALCREMIE_LEMON_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieLemonCream, + [SPECIES_ALCREMIE_SALTED_CREAM] = gMonIcon_QuestionMark,//gMonIcon_AlcremieSaltedCream, + [SPECIES_ALCREMIE_RUBY_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRubySwirl, + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieCaramelSwirl, + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = gMonIcon_QuestionMark,//gMonIcon_AlcremieRainbowSwirl, + [SPECIES_EISCUE_NOICE_FACE] = gMonIcon_EiscueNoiceFace, + [SPECIES_INDEEDEE_FEMALE] = gMonIcon_IndeedeeFemale, + [SPECIES_MORPEKO_HANGRY] = gMonIcon_MorpekoHangry, + [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_ZacianCrownedSword, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_ZamazentaCrownedShield, + [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_QuestionMark,//gMonIcon_EternatusEternamax, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_QuestionMark,//gMonIcon_UrshifuRapidStrikeStyle, + [SPECIES_ZARUDE_DADA] = gMonIcon_QuestionMark,//gMonIcon_ZarudeDada, + [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_QuestionMark,//gMonIcon_CalyrexIceRider, + [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_QuestionMark,//gMonIcon_CalyrexShadowRider, [SPECIES_EGG] = gMonIcon_Egg, }; @@ -2051,14 +2051,14 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZERAORA] = 0, [SPECIES_MELTAN] = 2, [SPECIES_MELMETAL] = 2, - [SPECIES_GROOKEY] = 0, - [SPECIES_THWACKEY] = 0, - [SPECIES_RILLABOOM] = 0, + [SPECIES_GROOKEY] = 1, + [SPECIES_THWACKEY] = 1, + [SPECIES_RILLABOOM] = 1, [SPECIES_SCORBUNNY] = 0, [SPECIES_RABOOT] = 0, [SPECIES_CINDERACE] = 0, - [SPECIES_SOBBLE] = 0, - [SPECIES_DRIZZILE] = 0, + [SPECIES_SOBBLE] = 2, + [SPECIES_DRIZZILE] = 2, [SPECIES_INTELEON] = 0, [SPECIES_SKWOVET] = 0, [SPECIES_GREEDENT] = 0, @@ -2066,37 +2066,37 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CORVISQUIRE] = 0, [SPECIES_CORVIKNIGHT] = 0, [SPECIES_BLIPBUG] = 0, - [SPECIES_DOTTLER] = 0, + [SPECIES_DOTTLER] = 2, [SPECIES_ORBEETLE] = 0, - [SPECIES_NICKIT] = 0, - [SPECIES_THIEVUL] = 0, - [SPECIES_GOSSIFLEUR] = 0, - [SPECIES_ELDEGOSS] = 0, + [SPECIES_NICKIT] = 2, + [SPECIES_THIEVUL] = 2, + [SPECIES_GOSSIFLEUR] = 1, + [SPECIES_ELDEGOSS] = 1, [SPECIES_WOOLOO] = 0, - [SPECIES_DUBWOOL] = 0, + [SPECIES_DUBWOOL] = 2, [SPECIES_CHEWTLE] = 0, [SPECIES_DREDNAW] = 0, - [SPECIES_YAMPER] = 0, - [SPECIES_BOLTUND] = 0, + [SPECIES_YAMPER] = 1, + [SPECIES_BOLTUND] = 1, [SPECIES_ROLYCOLY] = 0, [SPECIES_CARKOL] = 0, [SPECIES_COALOSSAL] = 0, - [SPECIES_APPLIN] = 0, - [SPECIES_FLAPPLE] = 0, - [SPECIES_APPLETUN] = 0, - [SPECIES_SILICOBRA] = 0, - [SPECIES_SANDACONDA] = 0, + [SPECIES_APPLIN] = 1, + [SPECIES_FLAPPLE] = 1, + [SPECIES_APPLETUN] = 1, + [SPECIES_SILICOBRA] = 1, + [SPECIES_SANDACONDA] = 1, [SPECIES_CRAMORANT] = 0, [SPECIES_ARROKUDA] = 0, [SPECIES_BARRASKEWDA] = 0, [SPECIES_TOXEL] = 0, - [SPECIES_TOXTRICITY] = 0, + [SPECIES_TOXTRICITY] = 2, [SPECIES_SIZZLIPEDE] = 0, [SPECIES_CENTISKORCH] = 0, [SPECIES_CLOBBOPUS] = 0, - [SPECIES_GRAPPLOCT] = 0, - [SPECIES_SINISTEA] = 0, - [SPECIES_POLTEAGEIST] = 0, + [SPECIES_GRAPPLOCT] = 2, + [SPECIES_SINISTEA] = 2, + [SPECIES_POLTEAGEIST] = 2, [SPECIES_HATENNA] = 0, [SPECIES_HATTREM] = 0, [SPECIES_HATTERENE] = 0, @@ -2104,21 +2104,21 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MORGREM] = 0, [SPECIES_GRIMMSNARL] = 0, [SPECIES_OBSTAGOON] = 0, - [SPECIES_PERRSERKER] = 0, + [SPECIES_PERRSERKER] = 2, [SPECIES_CURSOLA] = 0, - [SPECIES_SIRFETCHD] = 0, + [SPECIES_SIRFETCHD] = 1, [SPECIES_MR_RIME] = 0, - [SPECIES_RUNERIGUS] = 0, - [SPECIES_MILCERY] = 0, + [SPECIES_RUNERIGUS] = 2, + [SPECIES_MILCERY] = 1, [SPECIES_ALCREMIE] = 0, [SPECIES_FALINKS] = 0, [SPECIES_PINCURCHIN] = 0, [SPECIES_SNOM] = 0, [SPECIES_FROSMOTH] = 0, - [SPECIES_STONJOURNER] = 0, + [SPECIES_STONJOURNER] = 2, [SPECIES_EISCUE] = 0, - [SPECIES_INDEEDEE] = 0, - [SPECIES_MORPEKO] = 0, + [SPECIES_INDEEDEE] = 2, + [SPECIES_MORPEKO] = 2, [SPECIES_CUFANT] = 0, [SPECIES_COPPERAJAH] = 0, [SPECIES_DRACOZOLT] = 0, @@ -2129,8 +2129,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DREEPY] = 0, [SPECIES_DRAKLOAK] = 0, [SPECIES_DRAGAPULT] = 0, - [SPECIES_ZACIAN] = 0, - [SPECIES_ZAMAZENTA] = 0, + [SPECIES_ZACIAN] = 2, + [SPECIES_ZAMAZENTA] = 2, [SPECIES_ETERNATUS] = 0, [SPECIES_KUBFU] = 0, [SPECIES_URSHIFU] = 0, @@ -2209,12 +2209,12 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_EXEGGUTOR_ALOLAN] = 1, [SPECIES_MAROWAK_ALOLAN] = 1, [SPECIES_MEOWTH_GALARIAN] = 0, - [SPECIES_PONYTA_GALARIAN] = 0, - [SPECIES_RAPIDASH_GALARIAN] = 0, + [SPECIES_PONYTA_GALARIAN] = 2, + [SPECIES_RAPIDASH_GALARIAN] = 2, [SPECIES_SLOWPOKE_GALARIAN] = 0, [SPECIES_SLOWBRO_GALARIAN] = 0, - [SPECIES_FARFETCHD_GALARIAN] = 0, - [SPECIES_WEEZING_GALARIAN] = 0, + [SPECIES_FARFETCHD_GALARIAN] = 1, + [SPECIES_WEEZING_GALARIAN] = 1, [SPECIES_MR_MIME_GALARIAN] = 0, [SPECIES_ARTICUNO_GALARIAN] = 0, [SPECIES_ZAPDOS_GALARIAN] = 0, @@ -2225,8 +2225,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_LINOONE_GALARIAN] = 0, [SPECIES_DARUMAKA_GALARIAN] = 0, [SPECIES_DARMANITAN_GALARIAN] = 0, - [SPECIES_YAMASK_GALARIAN] = 0, - [SPECIES_STUNFISK_GALARIAN] = 0, + [SPECIES_YAMASK_GALARIAN] = 2, + [SPECIES_STUNFISK_GALARIAN] = 1, [SPECIES_PIKACHU_COSPLAY] = 2, [SPECIES_PIKACHU_ROCK_STAR] = 1, [SPECIES_PIKACHU_BELLE] = 0, @@ -2392,9 +2392,9 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MAGEARNA_ORIGINAL_COLOR] = 0, [SPECIES_CRAMORANT_GULPING] = 0, [SPECIES_CRAMORANT_GORGING] = 0, - [SPECIES_TOXTRICITY_LOW_KEY] = 0, - [SPECIES_SINISTEA_ANTIQUE] = 0, - [SPECIES_POLTEAGEIST_ANTIQUE] = 0, + [SPECIES_TOXTRICITY_LOW_KEY] = 2, + [SPECIES_SINISTEA_ANTIQUE] = 2, + [SPECIES_POLTEAGEIST_ANTIQUE] = 2, [SPECIES_ALCREMIE_RUBY_CREAM] = 0, [SPECIES_ALCREMIE_MATCHA_CREAM] = 0, [SPECIES_ALCREMIE_MINT_CREAM] = 0, @@ -2404,10 +2404,10 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ALCREMIE_CARAMEL_SWIRL] = 0, [SPECIES_ALCREMIE_RAINBOW_SWIRL] = 0, [SPECIES_EISCUE_NOICE_FACE] = 0, - [SPECIES_INDEEDEE_FEMALE] = 0, - [SPECIES_MORPEKO_HANGRY] = 0, - [SPECIES_ZACIAN_CROWNED_SWORD] = 0, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = 0, + [SPECIES_INDEEDEE_FEMALE] = 2, + [SPECIES_MORPEKO_HANGRY] = 2, + [SPECIES_ZACIAN_CROWNED_SWORD] = 2, + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = 2, [SPECIES_ETERNATUS_ETERNAMAX] = 0, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = 0, [SPECIES_ZARUDE_DADA] = 0,