diff --git a/graphics/pokemon/aegislash/anim_front.png b/graphics/pokemon/aegislash/anim_front.png new file mode 100644 index 0000000000..0e13771869 Binary files /dev/null and b/graphics/pokemon/aegislash/anim_front.png differ diff --git a/graphics/pokemon/aegislash/blade/anim_front.png b/graphics/pokemon/aegislash/blade/anim_front.png new file mode 100644 index 0000000000..90b898ad28 Binary files /dev/null and b/graphics/pokemon/aegislash/blade/anim_front.png differ diff --git a/graphics/pokemon/aegislash/footprint.png b/graphics/pokemon/aegislash/footprint.png new file mode 100644 index 0000000000..90850b4744 Binary files /dev/null and b/graphics/pokemon/aegislash/footprint.png differ diff --git a/graphics/pokemon/aegislash/normal.pal b/graphics/pokemon/aegislash/normal.pal index c50c4fdbbf..1df7457553 100644 --- a/graphics/pokemon/aegislash/normal.pal +++ b/graphics/pokemon/aegislash/normal.pal @@ -4,7 +4,7 @@ JASC-PAL 152 208 160 72 56 48 232 224 128 -16 16 16 +0 0 0 248 248 248 144 128 80 176 160 88 diff --git a/graphics/pokemon/alcremie/icon.png b/graphics/pokemon/alcremie/icon.png new file mode 100644 index 0000000000..31cf9e47c9 Binary files /dev/null and b/graphics/pokemon/alcremie/icon.png differ diff --git a/graphics/pokemon/amaura/anim_front.png b/graphics/pokemon/amaura/anim_front.png new file mode 100644 index 0000000000..63c7d94cbd Binary files /dev/null and b/graphics/pokemon/amaura/anim_front.png differ diff --git a/graphics/pokemon/amaura/back.png b/graphics/pokemon/amaura/back.png index 439d67e17f..5e2e7657ff 100644 Binary files a/graphics/pokemon/amaura/back.png and b/graphics/pokemon/amaura/back.png differ diff --git a/graphics/pokemon/amaura/footprint.png b/graphics/pokemon/amaura/footprint.png new file mode 100644 index 0000000000..59e6de9545 Binary files /dev/null and b/graphics/pokemon/amaura/footprint.png differ diff --git a/graphics/pokemon/amaura/front.png b/graphics/pokemon/amaura/front.png index c8e841da58..c9dbac5180 100644 Binary files a/graphics/pokemon/amaura/front.png and b/graphics/pokemon/amaura/front.png differ diff --git a/graphics/pokemon/amaura/normal.pal b/graphics/pokemon/amaura/normal.pal index 65e56ac828..8e51be770f 100644 --- a/graphics/pokemon/amaura/normal.pal +++ b/graphics/pokemon/amaura/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 +152 216 248 +80 168 208 +248 248 144 +0 0 0 +248 192 192 +48 104 184 224 120 152 184 184 72 -248 192 192 -248 224 176 -80 168 208 -48 104 184 -8 16 16 -152 216 248 -0 160 224 +192 192 200 +32 64 184 +32 184 224 248 248 248 -0 128 184 -152 208 240 -16 16 16 -112 112 104 -152 208 240 +137 214 254 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/amaura/shiny.pal b/graphics/pokemon/amaura/shiny.pal index 1911fb6920..4e67f53caa 100644 --- a/graphics/pokemon/amaura/shiny.pal +++ b/graphics/pokemon/amaura/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 +208 240 240 +152 208 240 +248 248 144 +0 0 0 +248 192 192 +112 136 136 224 120 152 184 184 72 -248 192 192 -248 224 176 -160 184 184 -112 136 136 -8 16 16 -208 240 240 +192 192 200 +0 128 144 0 208 224 248 248 248 -0 168 184 -152 208 240 -16 16 16 -112 112 104 -152 224 240 +137 214 254 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/arctovish/icon.png b/graphics/pokemon/arctovish/icon.png new file mode 100644 index 0000000000..2160612295 Binary files /dev/null and b/graphics/pokemon/arctovish/icon.png differ diff --git a/graphics/pokemon/arctozolt/icon.png b/graphics/pokemon/arctozolt/icon.png new file mode 100644 index 0000000000..73dbd1e67e Binary files /dev/null and b/graphics/pokemon/arctozolt/icon.png differ diff --git a/graphics/pokemon/aromatisse/anim_front.png b/graphics/pokemon/aromatisse/anim_front.png new file mode 100644 index 0000000000..c6d3c9b95d Binary files /dev/null and b/graphics/pokemon/aromatisse/anim_front.png differ diff --git a/graphics/pokemon/aromatisse/footprint.png b/graphics/pokemon/aromatisse/footprint.png new file mode 100644 index 0000000000..b4df4e5422 Binary files /dev/null and b/graphics/pokemon/aromatisse/footprint.png differ diff --git a/graphics/pokemon/arrokuda/icon.png b/graphics/pokemon/arrokuda/icon.png new file mode 100644 index 0000000000..f724cc3579 Binary files /dev/null and b/graphics/pokemon/arrokuda/icon.png differ diff --git a/graphics/pokemon/articuno/galarian/icon.png b/graphics/pokemon/articuno/galarian/icon.png new file mode 100644 index 0000000000..ce061cbc0d Binary files /dev/null and b/graphics/pokemon/articuno/galarian/icon.png differ diff --git a/graphics/pokemon/aurorus/anim_front.png b/graphics/pokemon/aurorus/anim_front.png new file mode 100644 index 0000000000..a43877822f Binary files /dev/null and b/graphics/pokemon/aurorus/anim_front.png differ diff --git a/graphics/pokemon/aurorus/back.png b/graphics/pokemon/aurorus/back.png index a068d3e4da..f8318b73b3 100644 Binary files a/graphics/pokemon/aurorus/back.png and b/graphics/pokemon/aurorus/back.png differ diff --git a/graphics/pokemon/aurorus/footprint.png b/graphics/pokemon/aurorus/footprint.png new file mode 100644 index 0000000000..bb11fc27d3 Binary files /dev/null and b/graphics/pokemon/aurorus/footprint.png differ diff --git a/graphics/pokemon/aurorus/front.png b/graphics/pokemon/aurorus/front.png index eeb4d19320..00a50a2727 100644 Binary files a/graphics/pokemon/aurorus/front.png and b/graphics/pokemon/aurorus/front.png differ diff --git a/graphics/pokemon/avalugg/anim_front.png b/graphics/pokemon/avalugg/anim_front.png new file mode 100644 index 0000000000..2dd6c74f9b Binary files /dev/null and b/graphics/pokemon/avalugg/anim_front.png differ diff --git a/graphics/pokemon/avalugg/back.png b/graphics/pokemon/avalugg/back.png index be48bdb1dd..787bc2d605 100644 Binary files a/graphics/pokemon/avalugg/back.png and b/graphics/pokemon/avalugg/back.png differ diff --git a/graphics/pokemon/avalugg/footprint.png b/graphics/pokemon/avalugg/footprint.png new file mode 100644 index 0000000000..bbed0cff2a Binary files /dev/null and b/graphics/pokemon/avalugg/footprint.png differ diff --git a/graphics/pokemon/avalugg/front.png b/graphics/pokemon/avalugg/front.png index 53a20220d6..76bce56675 100644 Binary files a/graphics/pokemon/avalugg/front.png and b/graphics/pokemon/avalugg/front.png differ diff --git a/graphics/pokemon/avalugg/normal.pal b/graphics/pokemon/avalugg/normal.pal index 2957de1bfc..06f0cccdb4 100644 --- a/graphics/pokemon/avalugg/normal.pal +++ b/graphics/pokemon/avalugg/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -136 176 192 -80 96 104 -0 0 0 -176 224 240 -232 240 248 -160 128 184 +120 192 168 +240 248 248 +192 232 248 +128 192 224 +88 136 184 +16 16 32 +160 104 208 120 80 160 -248 192 0 -184 184 184 -248 224 136 +248 240 88 +240 200 80 248 248 248 -96 104 104 -200 200 168 +192 192 200 +120 120 144 +0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/avalugg/shiny.pal b/graphics/pokemon/avalugg/shiny.pal index faa17b0759..4918fcc971 100644 --- a/graphics/pokemon/avalugg/shiny.pal +++ b/graphics/pokemon/avalugg/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -104 192 184 -64 96 104 -0 0 0 -152 232 224 -224 248 248 -152 184 128 +248 192 214 +208 240 248 +160 216 240 +104 168 192 +56 88 104 +16 16 32 +152 184 120 104 144 72 -248 192 0 -184 184 96 248 224 136 -248 248 248 -128 128 48 -200 200 168 +248 192 0 +232 224 80 +192 200 72 +128 136 40 +0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/barbaracle/anim_front.png b/graphics/pokemon/barbaracle/anim_front.png new file mode 100644 index 0000000000..b4febab31b Binary files /dev/null and b/graphics/pokemon/barbaracle/anim_front.png differ diff --git a/graphics/pokemon/barbaracle/footprint.png b/graphics/pokemon/barbaracle/footprint.png new file mode 100644 index 0000000000..b36b1c3eef Binary files /dev/null and b/graphics/pokemon/barbaracle/footprint.png differ diff --git a/graphics/pokemon/barraskewda/icon.png b/graphics/pokemon/barraskewda/icon.png new file mode 100644 index 0000000000..c0aed5b3dc Binary files /dev/null and b/graphics/pokemon/barraskewda/icon.png differ diff --git a/graphics/pokemon/basculin/anim_front.png b/graphics/pokemon/basculin/anim_front.png new file mode 100644 index 0000000000..800c4e257b Binary files /dev/null and b/graphics/pokemon/basculin/anim_front.png differ diff --git a/graphics/pokemon/bergmite/anim_front.png b/graphics/pokemon/bergmite/anim_front.png new file mode 100644 index 0000000000..503e7ea256 Binary files /dev/null and b/graphics/pokemon/bergmite/anim_front.png differ diff --git a/graphics/pokemon/bergmite/back.png b/graphics/pokemon/bergmite/back.png index 17d6233dd5..5158de96b7 100644 Binary files a/graphics/pokemon/bergmite/back.png and b/graphics/pokemon/bergmite/back.png differ diff --git a/graphics/pokemon/bergmite/footprint.png b/graphics/pokemon/bergmite/footprint.png new file mode 100644 index 0000000000..78eeb7b032 Binary files /dev/null and b/graphics/pokemon/bergmite/footprint.png differ diff --git a/graphics/pokemon/bergmite/front.png b/graphics/pokemon/bergmite/front.png index 487819bccf..8526648893 100644 Binary files a/graphics/pokemon/bergmite/front.png and b/graphics/pokemon/bergmite/front.png differ diff --git a/graphics/pokemon/bergmite/normal.pal b/graphics/pokemon/bergmite/normal.pal index 88f82d21a3..703e895daf 100644 --- a/graphics/pokemon/bergmite/normal.pal +++ b/graphics/pokemon/bergmite/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 96 104 -128 152 168 -176 216 224 -0 0 0 -232 240 248 -120 80 160 -168 136 192 -248 184 0 -248 224 136 -184 184 184 +192 248 248 +152 216 248 +128 192 224 +96 144 192 248 248 248 -96 104 104 -216 216 216 -104 176 224 +192 208 224 +96 112 128 +16 16 16 +200 168 232 +160 104 208 +248 240 88 +240 200 80 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/bergmite/shiny.pal b/graphics/pokemon/bergmite/shiny.pal index 8f6a4cf148..aeb1c2a6b9 100644 --- a/graphics/pokemon/bergmite/shiny.pal +++ b/graphics/pokemon/bergmite/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 96 104 +240 248 248 +184 224 224 128 168 168 -176 224 216 -0 0 0 -232 240 248 -104 144 72 +72 88 96 +240 232 96 +216 208 16 +168 152 8 +16 16 16 152 184 128 -216 208 64 +104 144 72 248 248 168 -184 160 104 -248 232 160 -104 88 40 -216 200 136 -104 192 216 +216 208 64 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/binacle/anim_front.png b/graphics/pokemon/binacle/anim_front.png new file mode 100644 index 0000000000..5898572175 Binary files /dev/null and b/graphics/pokemon/binacle/anim_front.png differ diff --git a/graphics/pokemon/binacle/footprint.png b/graphics/pokemon/binacle/footprint.png new file mode 100644 index 0000000000..9430d42505 Binary files /dev/null and b/graphics/pokemon/binacle/footprint.png differ diff --git a/graphics/pokemon/braixen/anim_front.png b/graphics/pokemon/braixen/anim_front.png new file mode 100644 index 0000000000..2d8ba7ee18 Binary files /dev/null and b/graphics/pokemon/braixen/anim_front.png differ diff --git a/graphics/pokemon/braixen/back.png b/graphics/pokemon/braixen/back.png index 60a88b127b..828c631835 100644 Binary files a/graphics/pokemon/braixen/back.png and b/graphics/pokemon/braixen/back.png differ diff --git a/graphics/pokemon/braixen/footprint.png b/graphics/pokemon/braixen/footprint.png new file mode 100644 index 0000000000..1efae67101 Binary files /dev/null and b/graphics/pokemon/braixen/footprint.png differ diff --git a/graphics/pokemon/braixen/front.png b/graphics/pokemon/braixen/front.png index 155ad564fc..bb090c9d17 100644 Binary files a/graphics/pokemon/braixen/front.png and b/graphics/pokemon/braixen/front.png differ diff --git a/graphics/pokemon/braixen/normal.pal b/graphics/pokemon/braixen/normal.pal index 58b01464ee..64fe47de9f 100644 --- a/graphics/pokemon/braixen/normal.pal +++ b/graphics/pokemon/braixen/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 104 64 24 40 40 40 64 64 64 -0 0 0 +248 232 48 diff --git a/graphics/pokemon/braixen/shiny.pal b/graphics/pokemon/braixen/shiny.pal index a2c8348e96..56ad926e5e 100644 --- a/graphics/pokemon/braixen/shiny.pal +++ b/graphics/pokemon/braixen/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 104 64 24 40 40 40 64 64 64 -0 0 0 +240 96 112 diff --git a/graphics/pokemon/bunnelby/anim_front.png b/graphics/pokemon/bunnelby/anim_front.png new file mode 100644 index 0000000000..128653b687 Binary files /dev/null and b/graphics/pokemon/bunnelby/anim_front.png differ diff --git a/graphics/pokemon/bunnelby/footprint.png b/graphics/pokemon/bunnelby/footprint.png new file mode 100644 index 0000000000..b7ea8db099 Binary files /dev/null and b/graphics/pokemon/bunnelby/footprint.png differ diff --git a/graphics/pokemon/carbink/anim_front.png b/graphics/pokemon/carbink/anim_front.png new file mode 100644 index 0000000000..7d641afab6 Binary files /dev/null and b/graphics/pokemon/carbink/anim_front.png differ diff --git a/graphics/pokemon/carbink/footprint.png b/graphics/pokemon/carbink/footprint.png new file mode 100644 index 0000000000..9fcdf683ab Binary files /dev/null and b/graphics/pokemon/carbink/footprint.png differ diff --git a/graphics/pokemon/chesnaught/anim_front.png b/graphics/pokemon/chesnaught/anim_front.png new file mode 100644 index 0000000000..db9466c88d Binary files /dev/null and b/graphics/pokemon/chesnaught/anim_front.png differ diff --git a/graphics/pokemon/chesnaught/footprint.png b/graphics/pokemon/chesnaught/footprint.png new file mode 100644 index 0000000000..0f9d51ed70 Binary files /dev/null and b/graphics/pokemon/chesnaught/footprint.png differ diff --git a/graphics/pokemon/chespin/footprint.png b/graphics/pokemon/chespin/footprint.png new file mode 100644 index 0000000000..5b3235b712 Binary files /dev/null and b/graphics/pokemon/chespin/footprint.png differ diff --git a/graphics/pokemon/clauncher/anim_front.png b/graphics/pokemon/clauncher/anim_front.png new file mode 100644 index 0000000000..af2da8cc74 Binary files /dev/null and b/graphics/pokemon/clauncher/anim_front.png differ diff --git a/graphics/pokemon/clauncher/footprint.png b/graphics/pokemon/clauncher/footprint.png new file mode 100644 index 0000000000..201ec9bb67 Binary files /dev/null and b/graphics/pokemon/clauncher/footprint.png differ diff --git a/graphics/pokemon/clawitzer/anim_front.png b/graphics/pokemon/clawitzer/anim_front.png new file mode 100644 index 0000000000..1b8a276a71 Binary files /dev/null and b/graphics/pokemon/clawitzer/anim_front.png differ diff --git a/graphics/pokemon/clawitzer/footprint.png b/graphics/pokemon/clawitzer/footprint.png new file mode 100644 index 0000000000..9d7bc6a1a4 Binary files /dev/null and b/graphics/pokemon/clawitzer/footprint.png differ diff --git a/graphics/pokemon/cobalion/anim_front.png b/graphics/pokemon/cobalion/anim_front.png new file mode 100644 index 0000000000..4ed828e5bd Binary files /dev/null and b/graphics/pokemon/cobalion/anim_front.png differ diff --git a/graphics/pokemon/combee/anim_front.png b/graphics/pokemon/combee/anim_front.png index 45acd64e3a..2c07de3397 100644 Binary files a/graphics/pokemon/combee/anim_front.png and b/graphics/pokemon/combee/anim_front.png differ diff --git a/graphics/pokemon/combee/anim_frontf.png b/graphics/pokemon/combee/anim_frontf.png new file mode 100644 index 0000000000..45acd64e3a Binary files /dev/null and b/graphics/pokemon/combee/anim_frontf.png differ diff --git a/graphics/pokemon/crustle/anim_front.png b/graphics/pokemon/crustle/anim_front.png new file mode 100644 index 0000000000..91434933af Binary files /dev/null and b/graphics/pokemon/crustle/anim_front.png differ diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png b/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png new file mode 100644 index 0000000000..f09b978ea3 Binary files /dev/null and b/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png differ diff --git a/graphics/pokemon/dedenne/anim_front.png b/graphics/pokemon/dedenne/anim_front.png new file mode 100644 index 0000000000..b31e4382ba Binary files /dev/null and b/graphics/pokemon/dedenne/anim_front.png differ diff --git a/graphics/pokemon/dedenne/footprint.png b/graphics/pokemon/dedenne/footprint.png new file mode 100644 index 0000000000..275b3dc7b1 Binary files /dev/null and b/graphics/pokemon/dedenne/footprint.png differ diff --git a/graphics/pokemon/deerling/anim_front.png b/graphics/pokemon/deerling/anim_front.png new file mode 100644 index 0000000000..cfc1c74ea3 Binary files /dev/null and b/graphics/pokemon/deerling/anim_front.png differ diff --git a/graphics/pokemon/delphox/anim_front.png b/graphics/pokemon/delphox/anim_front.png new file mode 100644 index 0000000000..498086742e Binary files /dev/null and b/graphics/pokemon/delphox/anim_front.png differ diff --git a/graphics/pokemon/delphox/footprint.png b/graphics/pokemon/delphox/footprint.png new file mode 100644 index 0000000000..abb8462b30 Binary files /dev/null and b/graphics/pokemon/delphox/footprint.png differ diff --git a/graphics/pokemon/diancie/anim_front.png b/graphics/pokemon/diancie/anim_front.png new file mode 100644 index 0000000000..e5d0f97921 Binary files /dev/null and b/graphics/pokemon/diancie/anim_front.png differ diff --git a/graphics/pokemon/diancie/back.png b/graphics/pokemon/diancie/back.png index c66940525d..b5984ab4ac 100644 Binary files a/graphics/pokemon/diancie/back.png and b/graphics/pokemon/diancie/back.png differ diff --git a/graphics/pokemon/diancie/footprint.png b/graphics/pokemon/diancie/footprint.png new file mode 100644 index 0000000000..9f46f60037 Binary files /dev/null and b/graphics/pokemon/diancie/footprint.png differ diff --git a/graphics/pokemon/diancie/front.png b/graphics/pokemon/diancie/front.png index 397f80c239..c99768d64a 100644 Binary files a/graphics/pokemon/diancie/front.png and b/graphics/pokemon/diancie/front.png differ diff --git a/graphics/pokemon/diancie/normal.pal b/graphics/pokemon/diancie/normal.pal index 241553c5f5..42fbbf4340 100644 --- a/graphics/pokemon/diancie/normal.pal +++ b/graphics/pokemon/diancie/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 80 120 -16 16 16 +248 248 248 248 200 216 232 160 176 232 120 144 -248 248 248 -72 64 104 +144 80 120 168 160 208 -152 128 64 120 112 152 +72 64 104 +16 16 16 240 208 104 +152 128 64 224 40 72 +248 248 248 192 208 208 112 136 136 -248 248 248 diff --git a/graphics/pokemon/diancie/shiny.pal b/graphics/pokemon/diancie/shiny.pal index 9103495cef..f452ba5a39 100644 --- a/graphics/pokemon/diancie/shiny.pal +++ b/graphics/pokemon/diancie/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 80 120 -16 16 16 +248 248 248 248 200 216 232 160 176 232 120 144 -248 248 248 -48 48 48 +144 80 120 136 136 136 -152 128 64 88 88 88 +48 48 48 +0 0 0 240 208 104 +152 128 64 224 40 72 +200 72 128 168 48 104 112 40 72 -224 112 160 diff --git a/graphics/pokemon/diggersby/anim_front.png b/graphics/pokemon/diggersby/anim_front.png new file mode 100644 index 0000000000..f2a0998e88 Binary files /dev/null and b/graphics/pokemon/diggersby/anim_front.png differ diff --git a/graphics/pokemon/diggersby/footprint.png b/graphics/pokemon/diggersby/footprint.png new file mode 100644 index 0000000000..997244c7c4 Binary files /dev/null and b/graphics/pokemon/diggersby/footprint.png differ diff --git a/graphics/pokemon/doublade/anim_front.png b/graphics/pokemon/doublade/anim_front.png new file mode 100644 index 0000000000..e5eac3925a Binary files /dev/null and b/graphics/pokemon/doublade/anim_front.png differ diff --git a/graphics/pokemon/doublade/footprint.png b/graphics/pokemon/doublade/footprint.png new file mode 100644 index 0000000000..eac01614ef Binary files /dev/null and b/graphics/pokemon/doublade/footprint.png differ diff --git a/graphics/pokemon/dracovish/icon.png b/graphics/pokemon/dracovish/icon.png new file mode 100644 index 0000000000..f998dea501 Binary files /dev/null and b/graphics/pokemon/dracovish/icon.png differ diff --git a/graphics/pokemon/dracozolt/icon.png b/graphics/pokemon/dracozolt/icon.png new file mode 100644 index 0000000000..68c3fe7800 Binary files /dev/null and b/graphics/pokemon/dracozolt/icon.png differ diff --git a/graphics/pokemon/dragalge/anim_front.png b/graphics/pokemon/dragalge/anim_front.png new file mode 100644 index 0000000000..c5305dffbb Binary files /dev/null and b/graphics/pokemon/dragalge/anim_front.png differ diff --git a/graphics/pokemon/dragalge/footprint.png b/graphics/pokemon/dragalge/footprint.png new file mode 100644 index 0000000000..4320ad16da Binary files /dev/null and b/graphics/pokemon/dragalge/footprint.png differ diff --git a/graphics/pokemon/druddigon/anim_front.png b/graphics/pokemon/druddigon/anim_front.png new file mode 100644 index 0000000000..5c4989f1de Binary files /dev/null and b/graphics/pokemon/druddigon/anim_front.png differ diff --git a/graphics/pokemon/duosion/anim_front.png b/graphics/pokemon/duosion/anim_front.png new file mode 100644 index 0000000000..edd0ce9fab Binary files /dev/null and b/graphics/pokemon/duosion/anim_front.png differ diff --git a/graphics/pokemon/durant/anim_front.png b/graphics/pokemon/durant/anim_front.png new file mode 100644 index 0000000000..236346e11b Binary files /dev/null and b/graphics/pokemon/durant/anim_front.png differ diff --git a/graphics/pokemon/dustox/back.png b/graphics/pokemon/dustox/back.png index 6ea0c4752b..b096c87cfb 100644 Binary files a/graphics/pokemon/dustox/back.png and b/graphics/pokemon/dustox/back.png differ diff --git a/graphics/pokemon/dwebble/anim_front.png b/graphics/pokemon/dwebble/anim_front.png new file mode 100644 index 0000000000..ef81e4864b Binary files /dev/null and b/graphics/pokemon/dwebble/anim_front.png differ diff --git a/graphics/pokemon/espurr/anim_front.png b/graphics/pokemon/espurr/anim_front.png new file mode 100644 index 0000000000..5aa7b028c7 Binary files /dev/null and b/graphics/pokemon/espurr/anim_front.png differ diff --git a/graphics/pokemon/espurr/back.png b/graphics/pokemon/espurr/back.png index b100d858f8..d291dc0e60 100644 Binary files a/graphics/pokemon/espurr/back.png and b/graphics/pokemon/espurr/back.png differ diff --git a/graphics/pokemon/espurr/footprint.png b/graphics/pokemon/espurr/footprint.png new file mode 100644 index 0000000000..ce84d4ad31 Binary files /dev/null and b/graphics/pokemon/espurr/footprint.png differ diff --git a/graphics/pokemon/espurr/front.png b/graphics/pokemon/espurr/front.png index 6ac1dfb3f4..c07972d979 100644 Binary files a/graphics/pokemon/espurr/front.png and b/graphics/pokemon/espurr/front.png differ diff --git a/graphics/pokemon/espurr/normal.pal b/graphics/pokemon/espurr/normal.pal index 81768b1449..190223fd3e 100644 --- a/graphics/pokemon/espurr/normal.pal +++ b/graphics/pokemon/espurr/normal.pal @@ -13,7 +13,7 @@ JASC-PAL 200 192 192 224 152 216 56 48 136 -0 0 0 +152 96 136 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/espurr/shiny.pal b/graphics/pokemon/espurr/shiny.pal index bcdd163d11..22e5abe543 100644 --- a/graphics/pokemon/espurr/shiny.pal +++ b/graphics/pokemon/espurr/shiny.pal @@ -13,7 +13,7 @@ JASC-PAL 200 192 192 224 152 216 56 48 136 -0 0 0 +152 96 136 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/eternatus/eternamax/icon.png b/graphics/pokemon/eternatus/eternamax/icon.png new file mode 100644 index 0000000000..32f5548b70 Binary files /dev/null and b/graphics/pokemon/eternatus/eternamax/icon.png differ diff --git a/graphics/pokemon/fennekin/anim_front.png b/graphics/pokemon/fennekin/anim_front.png new file mode 100644 index 0000000000..55e8288684 Binary files /dev/null and b/graphics/pokemon/fennekin/anim_front.png differ diff --git a/graphics/pokemon/fennekin/footprint.png b/graphics/pokemon/fennekin/footprint.png new file mode 100644 index 0000000000..6d63066d1a Binary files /dev/null and b/graphics/pokemon/fennekin/footprint.png differ diff --git a/graphics/pokemon/flabebe/anim_front.png b/graphics/pokemon/flabebe/anim_front.png new file mode 100644 index 0000000000..6677d4137a Binary files /dev/null and b/graphics/pokemon/flabebe/anim_front.png differ diff --git a/graphics/pokemon/flabebe/footprint.png b/graphics/pokemon/flabebe/footprint.png new file mode 100644 index 0000000000..e36ead8b49 Binary files /dev/null and b/graphics/pokemon/flabebe/footprint.png differ diff --git a/graphics/pokemon/fletchinder/anim_front.png b/graphics/pokemon/fletchinder/anim_front.png new file mode 100644 index 0000000000..cb7d9c7b51 Binary files /dev/null and b/graphics/pokemon/fletchinder/anim_front.png differ diff --git a/graphics/pokemon/fletchinder/back.png b/graphics/pokemon/fletchinder/back.png index 3571267dcf..7eeb59bd06 100644 Binary files a/graphics/pokemon/fletchinder/back.png and b/graphics/pokemon/fletchinder/back.png differ diff --git a/graphics/pokemon/fletchinder/footprint.png b/graphics/pokemon/fletchinder/footprint.png new file mode 100644 index 0000000000..964998764a Binary files /dev/null and b/graphics/pokemon/fletchinder/footprint.png differ diff --git a/graphics/pokemon/fletchinder/front.png b/graphics/pokemon/fletchinder/front.png index b87c035beb..86ff4500f0 100644 Binary files a/graphics/pokemon/fletchinder/front.png and b/graphics/pokemon/fletchinder/front.png differ diff --git a/graphics/pokemon/fletchinder/normal.pal b/graphics/pokemon/fletchinder/normal.pal index 10f7f46d3c..a9588a9767 100644 --- a/graphics/pokemon/fletchinder/normal.pal +++ b/graphics/pokemon/fletchinder/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 128 160 192 216 160 32 136 96 16 -16 16 16 +88 96 104 diff --git a/graphics/pokemon/fletchinder/shiny.pal b/graphics/pokemon/fletchinder/shiny.pal index b22e5e4ff5..2baa872535 100644 --- a/graphics/pokemon/fletchinder/shiny.pal +++ b/graphics/pokemon/fletchinder/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 168 144 120 176 184 40 112 112 24 -16 16 16 +104 88 64 diff --git a/graphics/pokemon/fletchling/anim_front.png b/graphics/pokemon/fletchling/anim_front.png new file mode 100644 index 0000000000..87f110df95 Binary files /dev/null and b/graphics/pokemon/fletchling/anim_front.png differ diff --git a/graphics/pokemon/fletchling/footprint.png b/graphics/pokemon/fletchling/footprint.png new file mode 100644 index 0000000000..164e6b88fc Binary files /dev/null and b/graphics/pokemon/fletchling/footprint.png differ diff --git a/graphics/pokemon/fletchling/front.png b/graphics/pokemon/fletchling/front.png index 6aa6a125db..53713836d0 100644 Binary files a/graphics/pokemon/fletchling/front.png and b/graphics/pokemon/fletchling/front.png differ diff --git a/graphics/pokemon/floette/anim_front.png b/graphics/pokemon/floette/anim_front.png new file mode 100644 index 0000000000..43eae1911a Binary files /dev/null and b/graphics/pokemon/floette/anim_front.png differ diff --git a/graphics/pokemon/floette/back.png b/graphics/pokemon/floette/back.png index 52d3d367d0..4f76af315b 100644 Binary files a/graphics/pokemon/floette/back.png and b/graphics/pokemon/floette/back.png differ diff --git a/graphics/pokemon/floette/blue_flower/normal.pal b/graphics/pokemon/floette/blue_flower/normal.pal index 2582535a2f..f737958280 100644 --- a/graphics/pokemon/floette/blue_flower/normal.pal +++ b/graphics/pokemon/floette/blue_flower/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 198 198 188 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/blue_flower/shiny.pal b/graphics/pokemon/floette/blue_flower/shiny.pal index d1d0623bf8..2ebf3f2899 100644 --- a/graphics/pokemon/floette/blue_flower/shiny.pal +++ b/graphics/pokemon/floette/blue_flower/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 181 193 204 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/footprint.png b/graphics/pokemon/floette/footprint.png new file mode 100644 index 0000000000..fc6240d717 Binary files /dev/null and b/graphics/pokemon/floette/footprint.png differ diff --git a/graphics/pokemon/floette/front.png b/graphics/pokemon/floette/front.png index 9b1518a634..d8d85450b4 100644 Binary files a/graphics/pokemon/floette/front.png and b/graphics/pokemon/floette/front.png differ diff --git a/graphics/pokemon/floette/normal.pal b/graphics/pokemon/floette/normal.pal index a8671d3f98..6a421a9a31 100644 --- a/graphics/pokemon/floette/normal.pal +++ b/graphics/pokemon/floette/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 198 198 188 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/orange_flower/normal.pal b/graphics/pokemon/floette/orange_flower/normal.pal index a554efd6e4..e522972993 100644 --- a/graphics/pokemon/floette/orange_flower/normal.pal +++ b/graphics/pokemon/floette/orange_flower/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 198 198 188 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/orange_flower/shiny.pal b/graphics/pokemon/floette/orange_flower/shiny.pal index dd3bee9fcf..9099f1fe7f 100644 --- a/graphics/pokemon/floette/orange_flower/shiny.pal +++ b/graphics/pokemon/floette/orange_flower/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 181 193 204 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/shiny.pal b/graphics/pokemon/floette/shiny.pal index dcc4c0243d..0edcecfd9d 100644 --- a/graphics/pokemon/floette/shiny.pal +++ b/graphics/pokemon/floette/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 181 193 204 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/white_flower/normal.pal b/graphics/pokemon/floette/white_flower/normal.pal index 35e603aa3b..ed0f1307b9 100644 --- a/graphics/pokemon/floette/white_flower/normal.pal +++ b/graphics/pokemon/floette/white_flower/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 198 198 188 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/white_flower/shiny.pal b/graphics/pokemon/floette/white_flower/shiny.pal index 055d06dbac..d46c139db5 100644 --- a/graphics/pokemon/floette/white_flower/shiny.pal +++ b/graphics/pokemon/floette/white_flower/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 181 193 204 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/yellow_flower/normal.pal b/graphics/pokemon/floette/yellow_flower/normal.pal index 2b2e9bef92..8854e36d8f 100644 --- a/graphics/pokemon/floette/yellow_flower/normal.pal +++ b/graphics/pokemon/floette/yellow_flower/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 198 198 188 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/floette/yellow_flower/shiny.pal b/graphics/pokemon/floette/yellow_flower/shiny.pal index d637d96152..708aa77aad 100644 --- a/graphics/pokemon/floette/yellow_flower/shiny.pal +++ b/graphics/pokemon/floette/yellow_flower/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 181 193 204 254 254 254 191 168 86 -0 0 0 +224 64 48 diff --git a/graphics/pokemon/florges/anim_front.png b/graphics/pokemon/florges/anim_front.png new file mode 100644 index 0000000000..667f0a6d45 Binary files /dev/null and b/graphics/pokemon/florges/anim_front.png differ diff --git a/graphics/pokemon/florges/footprint.png b/graphics/pokemon/florges/footprint.png new file mode 100644 index 0000000000..09e52b3cdf Binary files /dev/null and b/graphics/pokemon/florges/footprint.png differ diff --git a/graphics/pokemon/florges/front.png b/graphics/pokemon/florges/front.png index 488a163597..fe77fe4e68 100644 Binary files a/graphics/pokemon/florges/front.png and b/graphics/pokemon/florges/front.png differ diff --git a/graphics/pokemon/florges/normal.pal b/graphics/pokemon/florges/normal.pal index f50958d99a..086f0ce5ac 100644 --- a/graphics/pokemon/florges/normal.pal +++ b/graphics/pokemon/florges/normal.pal @@ -3,10 +3,10 @@ JASC-PAL 16 0 183 239 191 57 68 -127 85 108 +144 80 112 247 111 120 -179 127 155 -244 210 217 +216 136 192 +248 192 200 15 76 63 51 170 144 18 18 20 diff --git a/graphics/pokemon/frillish/anim_frontf.png b/graphics/pokemon/frillish/anim_frontf.png new file mode 100644 index 0000000000..ae2c2ecee1 Binary files /dev/null and b/graphics/pokemon/frillish/anim_frontf.png differ diff --git a/graphics/pokemon/frillish/backf.png b/graphics/pokemon/frillish/backf.png new file mode 100644 index 0000000000..ac2074aa6d Binary files /dev/null and b/graphics/pokemon/frillish/backf.png differ diff --git a/graphics/pokemon/frillish/iconf.png b/graphics/pokemon/frillish/iconf.png new file mode 100644 index 0000000000..a0e102316b Binary files /dev/null and b/graphics/pokemon/frillish/iconf.png differ diff --git a/graphics/pokemon/frillish/normalf.pal b/graphics/pokemon/frillish/normalf.pal new file mode 100644 index 0000000000..252ae04b6c --- /dev/null +++ b/graphics/pokemon/frillish/normalf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 210 164 +132 87 106 +16 16 16 +185 166 216 +252 214 232 +190 139 198 +255 186 215 +255 255 255 +242 112 92 +115 149 209 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/frillish/shinyf.pal b/graphics/pokemon/frillish/shinyf.pal new file mode 100644 index 0000000000..e0fe6a29d3 --- /dev/null +++ b/graphics/pokemon/frillish/shinyf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 210 164 +130 71 71 +16 16 16 +207 164 214 +242 212 247 +196 119 138 +255 160 160 +255 255 255 +178 34 191 +74 156 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/froakie/anim_front.png b/graphics/pokemon/froakie/anim_front.png new file mode 100644 index 0000000000..a47a62f1a7 Binary files /dev/null and b/graphics/pokemon/froakie/anim_front.png differ diff --git a/graphics/pokemon/froakie/footprint.png b/graphics/pokemon/froakie/footprint.png new file mode 100644 index 0000000000..3c3ada42a7 Binary files /dev/null and b/graphics/pokemon/froakie/footprint.png differ diff --git a/graphics/pokemon/frogadier/anim_front.png b/graphics/pokemon/frogadier/anim_front.png new file mode 100644 index 0000000000..bf0d8a9a5a Binary files /dev/null and b/graphics/pokemon/frogadier/anim_front.png differ diff --git a/graphics/pokemon/frogadier/footprint.png b/graphics/pokemon/frogadier/footprint.png new file mode 100644 index 0000000000..d19aa2f7af Binary files /dev/null and b/graphics/pokemon/frogadier/footprint.png differ diff --git a/graphics/pokemon/furfrou/anim_front.png b/graphics/pokemon/furfrou/anim_front.png new file mode 100644 index 0000000000..0cd320c895 Binary files /dev/null and b/graphics/pokemon/furfrou/anim_front.png differ diff --git a/graphics/pokemon/furfrou/dandy_trim/anim_front.png b/graphics/pokemon/furfrou/dandy_trim/anim_front.png new file mode 100644 index 0000000000..a8395c4438 Binary files /dev/null and b/graphics/pokemon/furfrou/dandy_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/dandy_trim/back.png b/graphics/pokemon/furfrou/dandy_trim/back.png index f89400e9b9..7feb3479dc 100644 Binary files a/graphics/pokemon/furfrou/dandy_trim/back.png and b/graphics/pokemon/furfrou/dandy_trim/back.png differ diff --git a/graphics/pokemon/furfrou/dandy_trim/front.png b/graphics/pokemon/furfrou/dandy_trim/front.png index 23bbc115ea..ffb12c4f0d 100644 Binary files a/graphics/pokemon/furfrou/dandy_trim/front.png and b/graphics/pokemon/furfrou/dandy_trim/front.png differ diff --git a/graphics/pokemon/furfrou/dandy_trim/normal.pal b/graphics/pokemon/furfrou/dandy_trim/normal.pal index 2d136a9d88..40a8d11515 100644 --- a/graphics/pokemon/furfrou/dandy_trim/normal.pal +++ b/graphics/pokemon/furfrou/dandy_trim/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 153 211 165 -169 173 152 -72 73 64 +160 160 152 +64 64 64 122 119 97 -244 252 227 +224 224 216 204 209 181 16 16 16 52 73 34 77 122 42 110 168 63 -82 130 142 -104 98 95 +24 96 120 +72 80 64 255 255 255 -234 68 46 +184 0 48 0 0 0 0 0 0 diff --git a/graphics/pokemon/furfrou/debutante_trim/anim_front.png b/graphics/pokemon/furfrou/debutante_trim/anim_front.png new file mode 100644 index 0000000000..aa3a5489ea Binary files /dev/null and b/graphics/pokemon/furfrou/debutante_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/debutante_trim/back.png b/graphics/pokemon/furfrou/debutante_trim/back.png index 0cfd3da436..ec2567514a 100644 Binary files a/graphics/pokemon/furfrou/debutante_trim/back.png and b/graphics/pokemon/furfrou/debutante_trim/back.png differ diff --git a/graphics/pokemon/furfrou/debutante_trim/front.png b/graphics/pokemon/furfrou/debutante_trim/front.png index 0d200c9184..2ccf422ae6 100644 Binary files a/graphics/pokemon/furfrou/debutante_trim/front.png and b/graphics/pokemon/furfrou/debutante_trim/front.png differ diff --git a/graphics/pokemon/furfrou/debutante_trim/normal.pal b/graphics/pokemon/furfrou/debutante_trim/normal.pal index 2d691ed2b5..2d6b70f57c 100644 --- a/graphics/pokemon/furfrou/debutante_trim/normal.pal +++ b/graphics/pokemon/furfrou/debutante_trim/normal.pal @@ -3,15 +3,15 @@ JASC-PAL 16 153 211 165 72 73 64 -244 252 227 +224 224 216 16 16 16 -169 173 152 +160 160 152 142 119 82 255 240 173 206 189 111 -104 98 95 -82 130 142 -234 68 46 +72 80 64 +24 96 120 +184 0 48 255 255 255 233 234 234 0 0 0 diff --git a/graphics/pokemon/furfrou/diamond_trim/anim_front.png b/graphics/pokemon/furfrou/diamond_trim/anim_front.png new file mode 100644 index 0000000000..5db3800755 Binary files /dev/null and b/graphics/pokemon/furfrou/diamond_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/diamond_trim/back.png b/graphics/pokemon/furfrou/diamond_trim/back.png index b992d2bcf3..f3f8ae713e 100644 Binary files a/graphics/pokemon/furfrou/diamond_trim/back.png and b/graphics/pokemon/furfrou/diamond_trim/back.png differ diff --git a/graphics/pokemon/furfrou/diamond_trim/front.png b/graphics/pokemon/furfrou/diamond_trim/front.png index ffc81ee65e..393a405888 100644 Binary files a/graphics/pokemon/furfrou/diamond_trim/front.png and b/graphics/pokemon/furfrou/diamond_trim/front.png differ diff --git a/graphics/pokemon/furfrou/diamond_trim/normal.pal b/graphics/pokemon/furfrou/diamond_trim/normal.pal index 2496f88ef5..7fdb0b2628 100644 --- a/graphics/pokemon/furfrou/diamond_trim/normal.pal +++ b/graphics/pokemon/furfrou/diamond_trim/normal.pal @@ -3,16 +3,16 @@ JASC-PAL 16 153 211 165 72 73 64 -244 252 227 -169 173 152 +224 224 216 +160 160 152 122 119 97 16 16 16 127 78 38 242 171 89 193 111 38 -104 98 95 -82 130 142 -234 68 46 +72 80 64 +24 96 120 +184 0 48 255 255 255 233 234 234 0 0 0 diff --git a/graphics/pokemon/furfrou/footprint.png b/graphics/pokemon/furfrou/footprint.png new file mode 100644 index 0000000000..32ceac6818 Binary files /dev/null and b/graphics/pokemon/furfrou/footprint.png differ diff --git a/graphics/pokemon/furfrou/heart_trim/anim_front.png b/graphics/pokemon/furfrou/heart_trim/anim_front.png new file mode 100644 index 0000000000..5cbba5a5c7 Binary files /dev/null and b/graphics/pokemon/furfrou/heart_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/heart_trim/back.png b/graphics/pokemon/furfrou/heart_trim/back.png index a570bdb69d..de6a039026 100644 Binary files a/graphics/pokemon/furfrou/heart_trim/back.png and b/graphics/pokemon/furfrou/heart_trim/back.png differ diff --git a/graphics/pokemon/furfrou/heart_trim/front.png b/graphics/pokemon/furfrou/heart_trim/front.png index 9cf096422c..17b2f3dbb6 100644 Binary files a/graphics/pokemon/furfrou/heart_trim/front.png and b/graphics/pokemon/furfrou/heart_trim/front.png differ diff --git a/graphics/pokemon/furfrou/heart_trim/normal.pal b/graphics/pokemon/furfrou/heart_trim/normal.pal index baf4971b03..d8ddffcaab 100644 --- a/graphics/pokemon/furfrou/heart_trim/normal.pal +++ b/graphics/pokemon/furfrou/heart_trim/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 153 211 165 -72 73 64 -244 252 227 +64 64 64 +224 224 216 204 209 181 -122 119 97 -169 173 152 +120 120 112 +160 160 152 16 16 16 114 50 77 255 117 147 193 77 98 -82 130 142 -104 98 95 -234 68 46 +24 96 120 +72 80 64 +184 0 48 255 255 255 233 234 234 0 0 0 diff --git a/graphics/pokemon/furfrou/kabuki_trim/anim_front.png b/graphics/pokemon/furfrou/kabuki_trim/anim_front.png new file mode 100644 index 0000000000..9bcc9ea28b Binary files /dev/null and b/graphics/pokemon/furfrou/kabuki_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/kabuki_trim/back.png b/graphics/pokemon/furfrou/kabuki_trim/back.png index 2525d4f2b1..5904d6e419 100644 Binary files a/graphics/pokemon/furfrou/kabuki_trim/back.png and b/graphics/pokemon/furfrou/kabuki_trim/back.png differ diff --git a/graphics/pokemon/furfrou/kabuki_trim/front.png b/graphics/pokemon/furfrou/kabuki_trim/front.png index 3fc8de443a..c1efac1c08 100644 Binary files a/graphics/pokemon/furfrou/kabuki_trim/front.png and b/graphics/pokemon/furfrou/kabuki_trim/front.png differ diff --git a/graphics/pokemon/furfrou/kabuki_trim/normal.pal b/graphics/pokemon/furfrou/kabuki_trim/normal.pal index 92f07ae721..40203cfa48 100644 --- a/graphics/pokemon/furfrou/kabuki_trim/normal.pal +++ b/graphics/pokemon/furfrou/kabuki_trim/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 153 211 165 72 73 64 122 119 97 -244 252 227 +224 224 216 204 209 181 -169 173 152 +160 160 152 16 16 16 122 27 18 198 46 25 -82 130 142 +24 96 120 255 59 38 255 255 255 -234 68 46 -104 98 95 +184 0 48 +72 80 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/furfrou/la_reine_trim/anim_front.png b/graphics/pokemon/furfrou/la_reine_trim/anim_front.png new file mode 100644 index 0000000000..441e12750a Binary files /dev/null and b/graphics/pokemon/furfrou/la_reine_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/la_reine_trim/back.png b/graphics/pokemon/furfrou/la_reine_trim/back.png index 83d3937b92..66c9703460 100644 Binary files a/graphics/pokemon/furfrou/la_reine_trim/back.png and b/graphics/pokemon/furfrou/la_reine_trim/back.png differ diff --git a/graphics/pokemon/furfrou/la_reine_trim/front.png b/graphics/pokemon/furfrou/la_reine_trim/front.png index 389f2f246a..7527d59eca 100644 Binary files a/graphics/pokemon/furfrou/la_reine_trim/front.png and b/graphics/pokemon/furfrou/la_reine_trim/front.png differ diff --git a/graphics/pokemon/furfrou/la_reine_trim/normal.pal b/graphics/pokemon/furfrou/la_reine_trim/normal.pal index 803a0861fb..7f9c221dc5 100644 --- a/graphics/pokemon/furfrou/la_reine_trim/normal.pal +++ b/graphics/pokemon/furfrou/la_reine_trim/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 153 211 165 122 119 97 72 73 64 -244 252 227 -169 173 152 +224 224 216 +160 160 152 204 209 181 37 92 107 85 186 214 53 131 153 16 16 16 -82 130 142 +24 96 120 255 255 255 -234 68 46 -104 98 95 +184 0 48 +72 80 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/furfrou/matron_trim/anim_front.png b/graphics/pokemon/furfrou/matron_trim/anim_front.png new file mode 100644 index 0000000000..8c3fb41498 Binary files /dev/null and b/graphics/pokemon/furfrou/matron_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/matron_trim/back.png b/graphics/pokemon/furfrou/matron_trim/back.png index 802ec5e81e..c4d7eb1175 100644 Binary files a/graphics/pokemon/furfrou/matron_trim/back.png and b/graphics/pokemon/furfrou/matron_trim/back.png differ diff --git a/graphics/pokemon/furfrou/matron_trim/front.png b/graphics/pokemon/furfrou/matron_trim/front.png index 2f6bb4012e..afcb90c7a6 100644 Binary files a/graphics/pokemon/furfrou/matron_trim/front.png and b/graphics/pokemon/furfrou/matron_trim/front.png differ diff --git a/graphics/pokemon/furfrou/matron_trim/normal.pal b/graphics/pokemon/furfrou/matron_trim/normal.pal index ad20db4baf..a804bf092d 100644 --- a/graphics/pokemon/furfrou/matron_trim/normal.pal +++ b/graphics/pokemon/furfrou/matron_trim/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 153 211 165 122 119 97 72 73 64 -244 252 227 +224 224 216 150 90 126 107 56 86 191 135 174 -169 173 152 +160 160 152 16 16 16 204 209 181 -82 130 142 -104 98 95 +24 96 120 +72 80 64 255 255 255 -234 68 46 +184 0 48 190 105 141 0 0 0 diff --git a/graphics/pokemon/furfrou/pharaoh_trim/anim_front.png b/graphics/pokemon/furfrou/pharaoh_trim/anim_front.png new file mode 100644 index 0000000000..a929542a83 Binary files /dev/null and b/graphics/pokemon/furfrou/pharaoh_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/pharaoh_trim/back.png b/graphics/pokemon/furfrou/pharaoh_trim/back.png index 1050cbf27e..f0bfdcce39 100644 Binary files a/graphics/pokemon/furfrou/pharaoh_trim/back.png and b/graphics/pokemon/furfrou/pharaoh_trim/back.png differ diff --git a/graphics/pokemon/furfrou/pharaoh_trim/front.png b/graphics/pokemon/furfrou/pharaoh_trim/front.png index 82daed3c78..987c7a7a44 100644 Binary files a/graphics/pokemon/furfrou/pharaoh_trim/front.png and b/graphics/pokemon/furfrou/pharaoh_trim/front.png differ diff --git a/graphics/pokemon/furfrou/pharaoh_trim/normal.pal b/graphics/pokemon/furfrou/pharaoh_trim/normal.pal index 9ebf396378..4218a6758a 100644 --- a/graphics/pokemon/furfrou/pharaoh_trim/normal.pal +++ b/graphics/pokemon/furfrou/pharaoh_trim/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 153 211 165 72 73 64 -244 252 227 +224 224 216 204 209 181 -169 173 152 +160 160 152 122 119 97 31 62 96 33 127 196 16 16 16 23 90 137 -82 130 142 +24 96 120 255 255 255 -234 68 46 -104 98 95 +184 0 48 +72 80 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/furfrou/star_trim/anim_front.png b/graphics/pokemon/furfrou/star_trim/anim_front.png new file mode 100644 index 0000000000..117946c45d Binary files /dev/null and b/graphics/pokemon/furfrou/star_trim/anim_front.png differ diff --git a/graphics/pokemon/furfrou/star_trim/back.png b/graphics/pokemon/furfrou/star_trim/back.png index 191b1c8eb5..1e4dd296f5 100644 Binary files a/graphics/pokemon/furfrou/star_trim/back.png and b/graphics/pokemon/furfrou/star_trim/back.png differ diff --git a/graphics/pokemon/furfrou/star_trim/front.png b/graphics/pokemon/furfrou/star_trim/front.png index f787b5db10..a953143214 100644 Binary files a/graphics/pokemon/furfrou/star_trim/front.png and b/graphics/pokemon/furfrou/star_trim/front.png differ diff --git a/graphics/pokemon/furfrou/star_trim/normal.pal b/graphics/pokemon/furfrou/star_trim/normal.pal index 95c91bf5a4..1299c1639e 100644 --- a/graphics/pokemon/furfrou/star_trim/normal.pal +++ b/graphics/pokemon/furfrou/star_trim/normal.pal @@ -3,16 +3,16 @@ JASC-PAL 16 153 211 165 72 73 64 -244 252 227 +224 224 216 16 16 16 -169 173 152 +160 160 152 122 119 97 38 87 102 130 214 237 73 134 153 -82 130 142 -104 98 95 -234 68 46 +24 96 120 +72 80 64 +184 0 48 255 255 255 233 234 234 0 0 0 diff --git a/graphics/pokemon/garbodor/anim_front.png b/graphics/pokemon/garbodor/anim_front.png new file mode 100644 index 0000000000..c8cb7329cb Binary files /dev/null and b/graphics/pokemon/garbodor/anim_front.png differ diff --git a/graphics/pokemon/glastrier/icon.png b/graphics/pokemon/glastrier/icon.png new file mode 100644 index 0000000000..98bfdc8b45 Binary files /dev/null and b/graphics/pokemon/glastrier/icon.png differ diff --git a/graphics/pokemon/gogoat/anim_front.png b/graphics/pokemon/gogoat/anim_front.png new file mode 100644 index 0000000000..8ab08d5fdd Binary files /dev/null and b/graphics/pokemon/gogoat/anim_front.png differ diff --git a/graphics/pokemon/gogoat/footprint.png b/graphics/pokemon/gogoat/footprint.png new file mode 100644 index 0000000000..a741811237 Binary files /dev/null and b/graphics/pokemon/gogoat/footprint.png differ diff --git a/graphics/pokemon/goodra/anim_front.png b/graphics/pokemon/goodra/anim_front.png new file mode 100644 index 0000000000..80a42871aa Binary files /dev/null and b/graphics/pokemon/goodra/anim_front.png differ diff --git a/graphics/pokemon/goodra/footprint.png b/graphics/pokemon/goodra/footprint.png new file mode 100644 index 0000000000..875eae3322 Binary files /dev/null and b/graphics/pokemon/goodra/footprint.png differ diff --git a/graphics/pokemon/goomy/anim_front.png b/graphics/pokemon/goomy/anim_front.png new file mode 100644 index 0000000000..eb1e29d614 Binary files /dev/null and b/graphics/pokemon/goomy/anim_front.png differ diff --git a/graphics/pokemon/goomy/back.png b/graphics/pokemon/goomy/back.png index 906cd78713..33ea4fb843 100644 Binary files a/graphics/pokemon/goomy/back.png and b/graphics/pokemon/goomy/back.png differ diff --git a/graphics/pokemon/goomy/footprint.png b/graphics/pokemon/goomy/footprint.png new file mode 100644 index 0000000000..c7ccf57f37 Binary files /dev/null and b/graphics/pokemon/goomy/footprint.png differ diff --git a/graphics/pokemon/goomy/front.png b/graphics/pokemon/goomy/front.png index 20668e01c4..b61c3e2d37 100644 Binary files a/graphics/pokemon/goomy/front.png and b/graphics/pokemon/goomy/front.png differ diff --git a/graphics/pokemon/goomy/normal.pal b/graphics/pokemon/goomy/normal.pal index f2c152d549..6bdedf192d 100644 --- a/graphics/pokemon/goomy/normal.pal +++ b/graphics/pokemon/goomy/normal.pal @@ -12,8 +12,8 @@ JASC-PAL 104 96 144 152 136 192 64 56 88 -0 0 0 -0 0 0 +216 144 152 +160 88 96 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/goomy/shiny.pal b/graphics/pokemon/goomy/shiny.pal index e377365eae..bbc2641aad 100644 --- a/graphics/pokemon/goomy/shiny.pal +++ b/graphics/pokemon/goomy/shiny.pal @@ -12,8 +12,8 @@ JASC-PAL 208 104 120 240 160 168 120 72 80 -0 0 0 -0 0 0 +216 144 152 +160 88 96 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/gothita/anim_front.png b/graphics/pokemon/gothita/anim_front.png new file mode 100644 index 0000000000..46d451da6c Binary files /dev/null and b/graphics/pokemon/gothita/anim_front.png differ diff --git a/graphics/pokemon/gothitelle/anim_front.png b/graphics/pokemon/gothitelle/anim_front.png new file mode 100644 index 0000000000..4974cf0c38 Binary files /dev/null and b/graphics/pokemon/gothitelle/anim_front.png differ diff --git a/graphics/pokemon/gothorita/anim_front.png b/graphics/pokemon/gothorita/anim_front.png new file mode 100644 index 0000000000..0cd24f1bdf Binary files /dev/null and b/graphics/pokemon/gothorita/anim_front.png differ diff --git a/graphics/pokemon/gourgeist/anim_front.png b/graphics/pokemon/gourgeist/anim_front.png new file mode 100644 index 0000000000..2e2cf4fc37 Binary files /dev/null and b/graphics/pokemon/gourgeist/anim_front.png differ diff --git a/graphics/pokemon/gourgeist/footprint.png b/graphics/pokemon/gourgeist/footprint.png new file mode 100644 index 0000000000..847f141b37 Binary files /dev/null and b/graphics/pokemon/gourgeist/footprint.png differ diff --git a/graphics/pokemon/gourgeist/front.png b/graphics/pokemon/gourgeist/front.png index cdb02eab84..577d182b4e 100644 Binary files a/graphics/pokemon/gourgeist/front.png and b/graphics/pokemon/gourgeist/front.png differ diff --git a/graphics/pokemon/gourgeist/large/anim_front.png b/graphics/pokemon/gourgeist/large/anim_front.png new file mode 100644 index 0000000000..88008d298b Binary files /dev/null and b/graphics/pokemon/gourgeist/large/anim_front.png differ diff --git a/graphics/pokemon/gourgeist/small/anim_front.png b/graphics/pokemon/gourgeist/small/anim_front.png new file mode 100644 index 0000000000..f7c997cca6 Binary files /dev/null and b/graphics/pokemon/gourgeist/small/anim_front.png differ diff --git a/graphics/pokemon/gourgeist/super/anim_front.png b/graphics/pokemon/gourgeist/super/anim_front.png new file mode 100644 index 0000000000..cf10d24473 Binary files /dev/null and b/graphics/pokemon/gourgeist/super/anim_front.png differ diff --git a/graphics/pokemon/greedent/icon.png b/graphics/pokemon/greedent/icon.png new file mode 100644 index 0000000000..8e37b04677 Binary files /dev/null and b/graphics/pokemon/greedent/icon.png differ diff --git a/graphics/pokemon/greninja/anim_front.png b/graphics/pokemon/greninja/anim_front.png new file mode 100644 index 0000000000..6ba8ec1b12 Binary files /dev/null and b/graphics/pokemon/greninja/anim_front.png differ diff --git a/graphics/pokemon/greninja/ash/anim_front.png b/graphics/pokemon/greninja/ash/anim_front.png new file mode 100644 index 0000000000..477f26c193 Binary files /dev/null and b/graphics/pokemon/greninja/ash/anim_front.png differ diff --git a/graphics/pokemon/greninja/ash/back.png b/graphics/pokemon/greninja/ash/back.png index b93c9b1ac5..1c6eee5885 100644 Binary files a/graphics/pokemon/greninja/ash/back.png and b/graphics/pokemon/greninja/ash/back.png differ diff --git a/graphics/pokemon/greninja/ash/front.png b/graphics/pokemon/greninja/ash/front.png index 22b6d81014..a76b97dca9 100644 Binary files a/graphics/pokemon/greninja/ash/front.png and b/graphics/pokemon/greninja/ash/front.png differ diff --git a/graphics/pokemon/greninja/ash/normal.pal b/graphics/pokemon/greninja/ash/normal.pal index 67f019cb04..e7e1536442 100644 --- a/graphics/pokemon/greninja/ash/normal.pal +++ b/graphics/pokemon/greninja/ash/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 153 211 165 -13 54 95 -25 77 141 -16 16 16 -51 61 71 -127 49 63 -255 124 144 -21 108 181 +192 232 248 +8 64 144 +0 0 0 +48 64 72 +128 48 64 +248 120 144 +24 104 184 131 26 21 -221 41 37 -86 185 234 -198 83 102 -252 252 252 -150 150 150 -194 231 248 -180 172 131 +216 40 32 +88 184 232 +200 80 104 +248 248 248 +168 168 168 +248 248 192 +184 176 128 diff --git a/graphics/pokemon/greninja/ash/shiny.pal b/graphics/pokemon/greninja/ash/shiny.pal index ed671dd012..e40959e0e5 100644 --- a/graphics/pokemon/greninja/ash/shiny.pal +++ b/graphics/pokemon/greninja/ash/shiny.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 153 211 165 -21 29 34 +192 232 248 36 42 60 16 16 16 51 61 71 @@ -15,5 +15,5 @@ JASC-PAL 198 83 102 252 252 252 150 150 150 -194 231 248 +248 248 192 180 172 131 diff --git a/graphics/pokemon/greninja/footprint.png b/graphics/pokemon/greninja/footprint.png new file mode 100644 index 0000000000..c567377eaa Binary files /dev/null and b/graphics/pokemon/greninja/footprint.png differ diff --git a/graphics/pokemon/hawlucha/anim_front.png b/graphics/pokemon/hawlucha/anim_front.png new file mode 100644 index 0000000000..bd5e0696cf Binary files /dev/null and b/graphics/pokemon/hawlucha/anim_front.png differ diff --git a/graphics/pokemon/hawlucha/footprint.png b/graphics/pokemon/hawlucha/footprint.png new file mode 100644 index 0000000000..830e227100 Binary files /dev/null and b/graphics/pokemon/hawlucha/footprint.png differ diff --git a/graphics/pokemon/heliolisk/anim_front.png b/graphics/pokemon/heliolisk/anim_front.png new file mode 100644 index 0000000000..1f56b8487d Binary files /dev/null and b/graphics/pokemon/heliolisk/anim_front.png differ diff --git a/graphics/pokemon/heliolisk/back.png b/graphics/pokemon/heliolisk/back.png index 3866779b3f..f4ab74539f 100644 Binary files a/graphics/pokemon/heliolisk/back.png and b/graphics/pokemon/heliolisk/back.png differ diff --git a/graphics/pokemon/heliolisk/footprint.png b/graphics/pokemon/heliolisk/footprint.png new file mode 100644 index 0000000000..583bc7062e Binary files /dev/null and b/graphics/pokemon/heliolisk/footprint.png differ diff --git a/graphics/pokemon/heliolisk/front.png b/graphics/pokemon/heliolisk/front.png index abefc87644..4ec5b5c22b 100644 Binary files a/graphics/pokemon/heliolisk/front.png and b/graphics/pokemon/heliolisk/front.png differ diff --git a/graphics/pokemon/heliolisk/normal.pal b/graphics/pokemon/heliolisk/normal.pal index 3c2cc4dbd8..14765ecd28 100644 --- a/graphics/pokemon/heliolisk/normal.pal +++ b/graphics/pokemon/heliolisk/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 120 184 168 -24 32 32 +248 224 72 +168 152 64 +104 88 24 88 88 88 -40 40 40 +48 48 48 +232 152 72 +120 80 32 0 0 0 -0 112 144 248 248 248 208 208 208 +216 144 152 +160 88 96 +0 112 144 248 224 72 168 152 64 -232 152 72 -104 64 24 -168 112 56 -104 88 24 -168 152 64 -248 224 72 diff --git a/graphics/pokemon/heliolisk/shiny.pal b/graphics/pokemon/heliolisk/shiny.pal index 89b291bc71..656f672ec0 100644 --- a/graphics/pokemon/heliolisk/shiny.pal +++ b/graphics/pokemon/heliolisk/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 120 184 168 -24 32 32 +224 64 56 +136 32 32 +56 16 16 88 88 88 -40 40 40 +48 48 48 +248 216 96 +128 96 32 0 0 0 -0 112 144 248 248 248 208 208 208 +216 144 152 +160 88 96 +0 112 144 248 216 96 176 144 80 -248 216 96 -104 88 24 -176 144 80 -56 16 16 -136 32 32 -224 64 56 diff --git a/graphics/pokemon/helioptile/anim_front.png b/graphics/pokemon/helioptile/anim_front.png new file mode 100644 index 0000000000..aacc8f847e Binary files /dev/null and b/graphics/pokemon/helioptile/anim_front.png differ diff --git a/graphics/pokemon/helioptile/footprint.png b/graphics/pokemon/helioptile/footprint.png new file mode 100644 index 0000000000..40dddcd798 Binary files /dev/null and b/graphics/pokemon/helioptile/footprint.png differ diff --git a/graphics/pokemon/herdier/back.png b/graphics/pokemon/herdier/back.png index 995e3a6b63..3934a150f2 100644 Binary files a/graphics/pokemon/herdier/back.png and b/graphics/pokemon/herdier/back.png differ diff --git a/graphics/pokemon/hippopotas/anim_front.png b/graphics/pokemon/hippopotas/anim_front.png index 9a0d3ff157..8de30eae69 100644 Binary files a/graphics/pokemon/hippopotas/anim_front.png and b/graphics/pokemon/hippopotas/anim_front.png differ diff --git a/graphics/pokemon/hippopotas/anim_frontf.png b/graphics/pokemon/hippopotas/anim_frontf.png new file mode 100644 index 0000000000..8a0b675bb3 Binary files /dev/null and b/graphics/pokemon/hippopotas/anim_frontf.png differ diff --git a/graphics/pokemon/hippopotas/backf.png b/graphics/pokemon/hippopotas/backf.png new file mode 100644 index 0000000000..1a74136138 Binary files /dev/null and b/graphics/pokemon/hippopotas/backf.png differ diff --git a/graphics/pokemon/hippopotas/normalf.pal b/graphics/pokemon/hippopotas/normalf.pal new file mode 100644 index 0000000000..8cc92aae7c --- /dev/null +++ b/graphics/pokemon/hippopotas/normalf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +112 96 56 +16 16 16 +184 160 88 +232 208 128 +232 232 248 +64 40 16 +104 64 32 +176 136 64 +144 96 64 +136 120 112 +184 176 176 +89 53 56 +160 91 93 +224 136 136 +0 0 0 diff --git a/graphics/pokemon/hippopotas/shinyf.pal b/graphics/pokemon/hippopotas/shinyf.pal new file mode 100644 index 0000000000..1e125f0718 --- /dev/null +++ b/graphics/pokemon/hippopotas/shinyf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +64 56 40 +16 16 16 +192 176 128 +232 224 168 +232 232 248 +120 120 96 +104 96 48 +192 176 64 +144 136 48 +120 120 136 +184 184 200 +104 32 72 +170 68 119 +224 112 144 +0 0 0 diff --git a/graphics/pokemon/hippowdon/back.png b/graphics/pokemon/hippowdon/back.png index 8a9297b4da..f6a4cbf28c 100644 Binary files a/graphics/pokemon/hippowdon/back.png and b/graphics/pokemon/hippowdon/back.png differ diff --git a/graphics/pokemon/hippowdon/backf.png b/graphics/pokemon/hippowdon/backf.png new file mode 100644 index 0000000000..1cfc725e93 Binary files /dev/null and b/graphics/pokemon/hippowdon/backf.png differ diff --git a/graphics/pokemon/hippowdon/normalf.pal b/graphics/pokemon/hippowdon/normalf.pal new file mode 100644 index 0000000000..566672e452 --- /dev/null +++ b/graphics/pokemon/hippowdon/normalf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +48 48 56 +88 88 88 +16 16 16 +160 88 88 +57 57 66 +123 123 140 +88 48 56 +189 189 205 +128 120 120 +248 248 248 +208 72 72 +224 136 136 +90 90 99 +224 208 136 +176 160 104 diff --git a/graphics/pokemon/hippowdon/shinyf.pal b/graphics/pokemon/hippowdon/shinyf.pal new file mode 100644 index 0000000000..6e0015ed0e --- /dev/null +++ b/graphics/pokemon/hippowdon/shinyf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +64 72 40 +104 104 72 +16 16 16 +168 64 112 +96 88 80 +148 156 99 +104 32 72 +200 208 176 +144 152 96 +248 248 248 +216 80 48 +224 112 144 +106 106 74 +232 208 144 +176 160 128 diff --git a/graphics/pokemon/honedge/anim_front.png b/graphics/pokemon/honedge/anim_front.png new file mode 100644 index 0000000000..9a5dc75078 Binary files /dev/null and b/graphics/pokemon/honedge/anim_front.png differ diff --git a/graphics/pokemon/honedge/footprint.png b/graphics/pokemon/honedge/footprint.png new file mode 100644 index 0000000000..8b00665b79 Binary files /dev/null and b/graphics/pokemon/honedge/footprint.png differ diff --git a/graphics/pokemon/hoopa/anim_front.png b/graphics/pokemon/hoopa/anim_front.png new file mode 100644 index 0000000000..0a49818d48 Binary files /dev/null and b/graphics/pokemon/hoopa/anim_front.png differ diff --git a/graphics/pokemon/hoopa/back.png b/graphics/pokemon/hoopa/back.png index 1134e86c2c..a3d76883c7 100644 Binary files a/graphics/pokemon/hoopa/back.png and b/graphics/pokemon/hoopa/back.png differ diff --git a/graphics/pokemon/hoopa/footprint.png b/graphics/pokemon/hoopa/footprint.png new file mode 100644 index 0000000000..b7c5cea6a7 Binary files /dev/null and b/graphics/pokemon/hoopa/footprint.png differ diff --git a/graphics/pokemon/hoopa/unbound/anim_front.png b/graphics/pokemon/hoopa/unbound/anim_front.png new file mode 100644 index 0000000000..e0593d53a8 Binary files /dev/null and b/graphics/pokemon/hoopa/unbound/anim_front.png differ diff --git a/graphics/pokemon/inkay/anim_front.png b/graphics/pokemon/inkay/anim_front.png new file mode 100644 index 0000000000..6d250b3081 Binary files /dev/null and b/graphics/pokemon/inkay/anim_front.png differ diff --git a/graphics/pokemon/inkay/footprint.png b/graphics/pokemon/inkay/footprint.png new file mode 100644 index 0000000000..479353ffc3 Binary files /dev/null and b/graphics/pokemon/inkay/footprint.png differ diff --git a/graphics/pokemon/jellicent/anim_frontf.png b/graphics/pokemon/jellicent/anim_frontf.png new file mode 100644 index 0000000000..110df92f52 Binary files /dev/null and b/graphics/pokemon/jellicent/anim_frontf.png differ diff --git a/graphics/pokemon/jellicent/backf.png b/graphics/pokemon/jellicent/backf.png new file mode 100644 index 0000000000..6471d3bacb Binary files /dev/null and b/graphics/pokemon/jellicent/backf.png differ diff --git a/graphics/pokemon/jellicent/icon.png b/graphics/pokemon/jellicent/icon.png index 792c86334f..3b508d92ca 100644 Binary files a/graphics/pokemon/jellicent/icon.png and b/graphics/pokemon/jellicent/icon.png differ diff --git a/graphics/pokemon/jellicent/iconf.png b/graphics/pokemon/jellicent/iconf.png new file mode 100644 index 0000000000..a6abfa5ce5 Binary files /dev/null and b/graphics/pokemon/jellicent/iconf.png differ diff --git a/graphics/pokemon/jellicent/normalf.pal b/graphics/pokemon/jellicent/normalf.pal new file mode 100644 index 0000000000..8acd5fa05b --- /dev/null +++ b/graphics/pokemon/jellicent/normalf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 210 164 +105 135 191 +237 103 83 +255 222 247 +204 140 195 +122 83 97 +16 16 16 +177 173 206 +255 178 212 +247 220 242 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/jellicent/shinyf.pal b/graphics/pokemon/jellicent/shinyf.pal new file mode 100644 index 0000000000..b4d93cd751 --- /dev/null +++ b/graphics/pokemon/jellicent/shinyf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 210 164 +41 82 156 +234 84 217 +255 222 247 +152 128 214 +100 82 119 +16 16 16 +189 173 206 +207 178 255 +246 222 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/klefki/anim_front.png b/graphics/pokemon/klefki/anim_front.png new file mode 100644 index 0000000000..ea34c16c36 Binary files /dev/null and b/graphics/pokemon/klefki/anim_front.png differ diff --git a/graphics/pokemon/klefki/footprint.png b/graphics/pokemon/klefki/footprint.png new file mode 100644 index 0000000000..b0616c0ffc Binary files /dev/null and b/graphics/pokemon/klefki/footprint.png differ diff --git a/graphics/pokemon/kubfu/icon.png b/graphics/pokemon/kubfu/icon.png new file mode 100644 index 0000000000..ea6d8c10ed Binary files /dev/null and b/graphics/pokemon/kubfu/icon.png differ diff --git a/graphics/pokemon/landorus/anim_front.png b/graphics/pokemon/landorus/anim_front.png new file mode 100644 index 0000000000..db5da4a391 Binary files /dev/null and b/graphics/pokemon/landorus/anim_front.png differ diff --git a/graphics/pokemon/larvesta/anim_front.png b/graphics/pokemon/larvesta/anim_front.png new file mode 100644 index 0000000000..a727183a9f Binary files /dev/null and b/graphics/pokemon/larvesta/anim_front.png differ diff --git a/graphics/pokemon/litleo/anim_front.png b/graphics/pokemon/litleo/anim_front.png new file mode 100644 index 0000000000..494800e118 Binary files /dev/null and b/graphics/pokemon/litleo/anim_front.png differ diff --git a/graphics/pokemon/litleo/footprint.png b/graphics/pokemon/litleo/footprint.png new file mode 100644 index 0000000000..586e858ad8 Binary files /dev/null and b/graphics/pokemon/litleo/footprint.png differ diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/magnemite/anim_front.png index 7d3dc54ec6..ff31f3a2e8 100644 Binary files a/graphics/pokemon/magnemite/anim_front.png and b/graphics/pokemon/magnemite/anim_front.png differ diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/magnemite/back.png index ec42140103..e1b35043bb 100644 Binary files a/graphics/pokemon/magnemite/back.png and b/graphics/pokemon/magnemite/back.png differ diff --git a/graphics/pokemon/magnemite/front.png b/graphics/pokemon/magnemite/front.png index f39c25b7ab..2a262e550b 100644 Binary files a/graphics/pokemon/magnemite/front.png and b/graphics/pokemon/magnemite/front.png differ diff --git a/graphics/pokemon/magnemite/normal.pal b/graphics/pokemon/magnemite/normal.pal index e86b805111..b0e534a53f 100644 --- a/graphics/pokemon/magnemite/normal.pal +++ b/graphics/pokemon/magnemite/normal.pal @@ -3,7 +3,7 @@ JASC-PAL 16 152 208 160 136 136 136 -232 248 248 +255 255 255 208 208 208 80 72 72 16 16 16 @@ -16,4 +16,4 @@ JASC-PAL 96 184 208 32 112 152 168 168 168 -232 248 248 +220 244 244 diff --git a/graphics/pokemon/malamar/anim_front.png b/graphics/pokemon/malamar/anim_front.png new file mode 100644 index 0000000000..f688174419 Binary files /dev/null and b/graphics/pokemon/malamar/anim_front.png differ diff --git a/graphics/pokemon/malamar/footprint.png b/graphics/pokemon/malamar/footprint.png new file mode 100644 index 0000000000..9987a2282f Binary files /dev/null and b/graphics/pokemon/malamar/footprint.png differ diff --git a/graphics/pokemon/malamar/front.png b/graphics/pokemon/malamar/front.png index adfce694c5..bbb95da6c5 100644 Binary files a/graphics/pokemon/malamar/front.png and b/graphics/pokemon/malamar/front.png differ diff --git a/graphics/pokemon/marshadow/anim_front.png b/graphics/pokemon/marshadow/anim_front.png new file mode 100644 index 0000000000..866348de4b Binary files /dev/null and b/graphics/pokemon/marshadow/anim_front.png differ diff --git a/graphics/pokemon/marshadow/front.png b/graphics/pokemon/marshadow/front.png index 866348de4b..14a1503bda 100644 Binary files a/graphics/pokemon/marshadow/front.png and b/graphics/pokemon/marshadow/front.png differ diff --git a/graphics/pokemon/mega_gardevoir/front.png b/graphics/pokemon/mega_gardevoir/front.png index ba58dfca0c..c4edbffb77 100644 Binary files a/graphics/pokemon/mega_gardevoir/front.png and b/graphics/pokemon/mega_gardevoir/front.png differ diff --git a/graphics/pokemon/meloetta/anim_front.png b/graphics/pokemon/meloetta/anim_front.png new file mode 100644 index 0000000000..cb47885f27 Binary files /dev/null and b/graphics/pokemon/meloetta/anim_front.png differ diff --git a/graphics/pokemon/meowstic/anim_front.png b/graphics/pokemon/meowstic/anim_front.png new file mode 100644 index 0000000000..e4d9b1e43d Binary files /dev/null and b/graphics/pokemon/meowstic/anim_front.png differ diff --git a/graphics/pokemon/meowstic/female/anim_front.png b/graphics/pokemon/meowstic/female/anim_front.png new file mode 100644 index 0000000000..53b386c49d Binary files /dev/null and b/graphics/pokemon/meowstic/female/anim_front.png differ diff --git a/graphics/pokemon/meowstic/female/front.png b/graphics/pokemon/meowstic/female/front.png index 30271110f4..d654468934 100644 Binary files a/graphics/pokemon/meowstic/female/front.png and b/graphics/pokemon/meowstic/female/front.png differ diff --git a/graphics/pokemon/meowstic/footprint.png b/graphics/pokemon/meowstic/footprint.png new file mode 100644 index 0000000000..7570dd4016 Binary files /dev/null and b/graphics/pokemon/meowstic/footprint.png differ diff --git a/graphics/pokemon/meowstic/front.png b/graphics/pokemon/meowstic/front.png index d88b6407f9..5ec230fb75 100644 Binary files a/graphics/pokemon/meowstic/front.png and b/graphics/pokemon/meowstic/front.png differ diff --git a/graphics/pokemon/mienshao/anim_front.png b/graphics/pokemon/mienshao/anim_front.png index 6d7556bc4c..181f6570b5 100644 Binary files a/graphics/pokemon/mienshao/anim_front.png and b/graphics/pokemon/mienshao/anim_front.png differ diff --git a/graphics/pokemon/milotic/anim_front.png b/graphics/pokemon/milotic/anim_front.png index 078968ad2f..67f9c89d9c 100644 Binary files a/graphics/pokemon/milotic/anim_front.png and b/graphics/pokemon/milotic/anim_front.png differ diff --git a/graphics/pokemon/milotic/back.png b/graphics/pokemon/milotic/back.png index 651c14095f..7a701f79dc 100644 Binary files a/graphics/pokemon/milotic/back.png and b/graphics/pokemon/milotic/back.png differ diff --git a/graphics/pokemon/milotic/front.png b/graphics/pokemon/milotic/front.png index a805425f05..9ece7373e5 100644 Binary files a/graphics/pokemon/milotic/front.png and b/graphics/pokemon/milotic/front.png differ diff --git a/graphics/pokemon/milotic/normal.pal b/graphics/pokemon/milotic/normal.pal index 47739a4d46..46e53fc41c 100644 --- a/graphics/pokemon/milotic/normal.pal +++ b/graphics/pokemon/milotic/normal.pal @@ -14,6 +14,6 @@ JASC-PAL 248 240 224 240 96 112 16 16 32 -224 40 144 +176 56 72 176 56 72 0 0 0 diff --git a/graphics/pokemon/milotic/shiny.pal b/graphics/pokemon/milotic/shiny.pal index 2edba04c6e..7737a68870 100644 --- a/graphics/pokemon/milotic/shiny.pal +++ b/graphics/pokemon/milotic/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -240 80 64 -48 48 48 -176 56 32 -144 104 104 -248 216 160 -208 168 120 -192 128 0 -232 192 40 -48 72 120 -248 240 200 -176 192 248 +232 112 120 +56 48 56 +131 156 205 +120 104 64 +248 224 168 +216 192 136 +197 131 0 +238 189 0 +65 90 139 +248 240 224 +180 197 255 16 16 32 -128 224 240 -104 128 176 +180 74 90 +176 56 72 0 0 0 diff --git a/graphics/pokemon/moltres/galarian/icon.png b/graphics/pokemon/moltres/galarian/icon.png new file mode 100644 index 0000000000..90edae5219 Binary files /dev/null and b/graphics/pokemon/moltres/galarian/icon.png differ diff --git a/graphics/pokemon/musharna/anim_front.png b/graphics/pokemon/musharna/anim_front.png new file mode 100644 index 0000000000..7b00fd511a Binary files /dev/null and b/graphics/pokemon/musharna/anim_front.png differ diff --git a/graphics/pokemon/noibat/anim_front.png b/graphics/pokemon/noibat/anim_front.png new file mode 100644 index 0000000000..fcc5190a31 Binary files /dev/null and b/graphics/pokemon/noibat/anim_front.png differ diff --git a/graphics/pokemon/noibat/footprint.png b/graphics/pokemon/noibat/footprint.png new file mode 100644 index 0000000000..f89c164996 Binary files /dev/null and b/graphics/pokemon/noibat/footprint.png differ diff --git a/graphics/pokemon/noibat/front.png b/graphics/pokemon/noibat/front.png index 2a3fa63020..6934317f20 100644 Binary files a/graphics/pokemon/noibat/front.png and b/graphics/pokemon/noibat/front.png differ diff --git a/graphics/pokemon/noibat/normal.pal b/graphics/pokemon/noibat/normal.pal index 44c79f62ef..90bb619f50 100644 --- a/graphics/pokemon/noibat/normal.pal +++ b/graphics/pokemon/noibat/normal.pal @@ -2,11 +2,11 @@ JASC-PAL 0100 16 112 192 160 -48 8 56 -144 72 152 +64 32 64 +152 80 160 0 0 0 -88 32 88 -136 104 144 +120 56 128 +168 128 184 72 80 64 200 160 216 80 56 88 diff --git a/graphics/pokemon/noivern/anim_front.png b/graphics/pokemon/noivern/anim_front.png new file mode 100644 index 0000000000..e8a51e7e56 Binary files /dev/null and b/graphics/pokemon/noivern/anim_front.png differ diff --git a/graphics/pokemon/noivern/footprint.png b/graphics/pokemon/noivern/footprint.png new file mode 100644 index 0000000000..f83fb1d3e9 Binary files /dev/null and b/graphics/pokemon/noivern/footprint.png differ diff --git a/graphics/pokemon/noivern/front.png b/graphics/pokemon/noivern/front.png index 1b28494ef0..252a56fb46 100644 Binary files a/graphics/pokemon/noivern/front.png and b/graphics/pokemon/noivern/front.png differ diff --git a/graphics/pokemon/pancham/anim_front.png b/graphics/pokemon/pancham/anim_front.png new file mode 100644 index 0000000000..1434d92897 Binary files /dev/null and b/graphics/pokemon/pancham/anim_front.png differ diff --git a/graphics/pokemon/pancham/back.png b/graphics/pokemon/pancham/back.png index 82d3b77f61..b19f8338fd 100644 Binary files a/graphics/pokemon/pancham/back.png and b/graphics/pokemon/pancham/back.png differ diff --git a/graphics/pokemon/pancham/footprint.png b/graphics/pokemon/pancham/footprint.png new file mode 100644 index 0000000000..afb5d279db Binary files /dev/null and b/graphics/pokemon/pancham/footprint.png differ diff --git a/graphics/pokemon/pancham/front.png b/graphics/pokemon/pancham/front.png index 42cba4f1e1..79cd40df43 100644 Binary files a/graphics/pokemon/pancham/front.png and b/graphics/pokemon/pancham/front.png differ diff --git a/graphics/pokemon/pancham/normal.pal b/graphics/pokemon/pancham/normal.pal index cf3de1c0b3..59e164d299 100644 --- a/graphics/pokemon/pancham/normal.pal +++ b/graphics/pokemon/pancham/normal.pal @@ -15,5 +15,5 @@ JASC-PAL 112 112 112 168 160 128 208 200 184 -0 0 0 +168 96 80 0 0 0 diff --git a/graphics/pokemon/pancham/shiny.pal b/graphics/pokemon/pancham/shiny.pal index cb151f0bb9..3bb42e1cc4 100644 --- a/graphics/pokemon/pancham/shiny.pal +++ b/graphics/pokemon/pancham/shiny.pal @@ -15,5 +15,5 @@ JASC-PAL 168 104 88 168 160 128 208 200 184 -0 0 0 +168 96 80 0 0 0 diff --git a/graphics/pokemon/pangoro/anim_front.png b/graphics/pokemon/pangoro/anim_front.png new file mode 100644 index 0000000000..144466d0be Binary files /dev/null and b/graphics/pokemon/pangoro/anim_front.png differ diff --git a/graphics/pokemon/pangoro/back.png b/graphics/pokemon/pangoro/back.png index f648e01fcd..3cf38acb1a 100644 Binary files a/graphics/pokemon/pangoro/back.png and b/graphics/pokemon/pangoro/back.png differ diff --git a/graphics/pokemon/pangoro/footprint.png b/graphics/pokemon/pangoro/footprint.png new file mode 100644 index 0000000000..ddc474878c Binary files /dev/null and b/graphics/pokemon/pangoro/footprint.png differ diff --git a/graphics/pokemon/pangoro/front.png b/graphics/pokemon/pangoro/front.png index 1aa85edd84..9de90108a4 100644 Binary files a/graphics/pokemon/pangoro/front.png and b/graphics/pokemon/pangoro/front.png differ diff --git a/graphics/pokemon/pangoro/normal.pal b/graphics/pokemon/pangoro/normal.pal index 9e7f1d8914..377106efb4 100644 --- a/graphics/pokemon/pangoro/normal.pal +++ b/graphics/pokemon/pangoro/normal.pal @@ -14,6 +14,6 @@ JASC-PAL 40 48 48 72 80 88 64 64 72 -0 0 0 +248 248 248 0 0 0 0 0 0 diff --git a/graphics/pokemon/pangoro/shiny.pal b/graphics/pokemon/pangoro/shiny.pal index f6e2d82a1a..824edc8fb9 100644 --- a/graphics/pokemon/pangoro/shiny.pal +++ b/graphics/pokemon/pangoro/shiny.pal @@ -14,6 +14,6 @@ JASC-PAL 80 24 32 184 96 112 136 56 64 -0 0 0 +248 248 248 0 0 0 0 0 0 diff --git a/graphics/pokemon/pansear/anim_front.png b/graphics/pokemon/pansear/anim_front.png new file mode 100644 index 0000000000..dea9e1dffe Binary files /dev/null and b/graphics/pokemon/pansear/anim_front.png differ diff --git a/graphics/pokemon/phantump/anim_front.png b/graphics/pokemon/phantump/anim_front.png new file mode 100644 index 0000000000..baaa2b3a8f Binary files /dev/null and b/graphics/pokemon/phantump/anim_front.png differ diff --git a/graphics/pokemon/phantump/footprint.png b/graphics/pokemon/phantump/footprint.png new file mode 100644 index 0000000000..bd256edcd8 Binary files /dev/null and b/graphics/pokemon/phantump/footprint.png differ diff --git a/graphics/pokemon/phantump/front.png b/graphics/pokemon/phantump/front.png index 208159ff8b..2471e23010 100644 Binary files a/graphics/pokemon/phantump/front.png and b/graphics/pokemon/phantump/front.png differ diff --git a/graphics/pokemon/pichu/spiky_eared/back.png b/graphics/pokemon/pichu/spiky_eared/back.png index 72693a1026..4198a751e3 100644 Binary files a/graphics/pokemon/pichu/spiky_eared/back.png and b/graphics/pokemon/pichu/spiky_eared/back.png differ diff --git a/graphics/pokemon/pichu/spiky_eared/front.png b/graphics/pokemon/pichu/spiky_eared/front.png index c9f6152d3f..3eeb371a06 100644 Binary files a/graphics/pokemon/pichu/spiky_eared/front.png and b/graphics/pokemon/pichu/spiky_eared/front.png differ diff --git a/graphics/pokemon/pichu/spiky_eared/normal.pal b/graphics/pokemon/pichu/spiky_eared/normal.pal index eee034dbc9..e837eb8c32 100644 --- a/graphics/pokemon/pichu/spiky_eared/normal.pal +++ b/graphics/pokemon/pichu/spiky_eared/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -32 32 49 -65 65 82 -164 123 8 -197 172 16 -246 230 82 -131 90 41 -246 238 148 -98 74 16 +152 208 160 16 16 16 -148 139 123 -238 230 205 -230 123 148 -139 32 32 -189 41 41 +0 56 96 +144 120 64 +192 176 88 +248 232 112 +120 72 32 +248 232 168 +96 80 40 +144 136 120 +232 224 200 +224 136 136 +136 72 72 +200 96 96 +0 0 0 0 0 0 diff --git a/graphics/pokemon/pichu/spiky_eared/shiny.pal b/graphics/pokemon/pichu/spiky_eared/shiny.pal index a2523e2719..65504fdf95 100644 --- a/graphics/pokemon/pichu/spiky_eared/shiny.pal +++ b/graphics/pokemon/pichu/spiky_eared/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -32 32 49 -82 65 65 -189 123 0 -222 156 57 -255 213 0 -139 74 0 -255 238 106 -90 32 0 +152 208 160 16 16 16 -148 139 123 -238 230 205 -255 49 65 -139 32 32 -189 41 41 +88 64 64 +184 120 0 +216 152 56 +248 216 24 +112 72 40 +248 232 104 +88 40 16 +144 136 120 +232 224 200 +248 48 64 +136 32 32 +184 40 40 +0 0 0 0 0 0 diff --git a/graphics/pokemon/pincurchin/icon.png b/graphics/pokemon/pincurchin/icon.png new file mode 100644 index 0000000000..354d7d37d8 Binary files /dev/null and b/graphics/pokemon/pincurchin/icon.png differ diff --git a/graphics/pokemon/pumpkaboo/anim_front.png b/graphics/pokemon/pumpkaboo/anim_front.png new file mode 100644 index 0000000000..bbdbf0452d Binary files /dev/null and b/graphics/pokemon/pumpkaboo/anim_front.png differ diff --git a/graphics/pokemon/pumpkaboo/footprint.png b/graphics/pokemon/pumpkaboo/footprint.png new file mode 100644 index 0000000000..adb8b164d9 Binary files /dev/null and b/graphics/pokemon/pumpkaboo/footprint.png differ diff --git a/graphics/pokemon/pumpkaboo/large/anim_front.png b/graphics/pokemon/pumpkaboo/large/anim_front.png new file mode 100644 index 0000000000..68ccbd7eae Binary files /dev/null and b/graphics/pokemon/pumpkaboo/large/anim_front.png differ diff --git a/graphics/pokemon/pumpkaboo/small/anim_front.png b/graphics/pokemon/pumpkaboo/small/anim_front.png new file mode 100644 index 0000000000..61690764bb Binary files /dev/null and b/graphics/pokemon/pumpkaboo/small/anim_front.png differ diff --git a/graphics/pokemon/pumpkaboo/super/anim_front.png b/graphics/pokemon/pumpkaboo/super/anim_front.png new file mode 100644 index 0000000000..fa1e57e75f Binary files /dev/null and b/graphics/pokemon/pumpkaboo/super/anim_front.png differ diff --git a/graphics/pokemon/pyroar/anim_front.png b/graphics/pokemon/pyroar/anim_front.png new file mode 100644 index 0000000000..d36397ea6d Binary files /dev/null and b/graphics/pokemon/pyroar/anim_front.png differ diff --git a/graphics/pokemon/pyroar/anim_frontf.png b/graphics/pokemon/pyroar/anim_frontf.png new file mode 100644 index 0000000000..45a1063b3a Binary files /dev/null and b/graphics/pokemon/pyroar/anim_frontf.png differ diff --git a/graphics/pokemon/pyroar/back.png b/graphics/pokemon/pyroar/back.png index a6fe1438ef..4da26f34fd 100644 Binary files a/graphics/pokemon/pyroar/back.png and b/graphics/pokemon/pyroar/back.png differ diff --git a/graphics/pokemon/pyroar/backf.png b/graphics/pokemon/pyroar/backf.png new file mode 100644 index 0000000000..de161303d7 Binary files /dev/null and b/graphics/pokemon/pyroar/backf.png differ diff --git a/graphics/pokemon/pyroar/footprint.png b/graphics/pokemon/pyroar/footprint.png new file mode 100644 index 0000000000..6cf1f3c154 Binary files /dev/null and b/graphics/pokemon/pyroar/footprint.png differ diff --git a/graphics/pokemon/pyroar/frontf.png b/graphics/pokemon/pyroar/frontf.png new file mode 100644 index 0000000000..ff02e8d950 Binary files /dev/null and b/graphics/pokemon/pyroar/frontf.png differ diff --git a/graphics/pokemon/pyroar/icon.png b/graphics/pokemon/pyroar/icon.png index 937daa1da3..cd0b94401f 100644 Binary files a/graphics/pokemon/pyroar/icon.png and b/graphics/pokemon/pyroar/icon.png differ diff --git a/graphics/pokemon/pyroar/iconf.png b/graphics/pokemon/pyroar/iconf.png new file mode 100644 index 0000000000..aa640f6c0b Binary files /dev/null and b/graphics/pokemon/pyroar/iconf.png differ diff --git a/graphics/pokemon/pyroar/normalf.pal b/graphics/pokemon/pyroar/normalf.pal new file mode 100644 index 0000000000..63998f2958 --- /dev/null +++ b/graphics/pokemon/pyroar/normalf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +176 128 32 +120 0 0 +248 208 88 +224 80 64 +176 40 24 +32 24 24 +0 0 0 +88 72 64 +56 40 48 +176 128 80 +96 72 40 +232 176 112 +248 248 248 +0 168 192 +248 216 168 diff --git a/graphics/pokemon/pyroar/shiny.pal b/graphics/pokemon/pyroar/shiny.pal index 551e45a739..d39b2ea820 100644 --- a/graphics/pokemon/pyroar/shiny.pal +++ b/graphics/pokemon/pyroar/shiny.pal @@ -10,7 +10,7 @@ JASC-PAL 56 40 32 0 0 0 120 104 80 -80 72 48 +72 56 48 168 136 96 96 72 56 224 192 144 diff --git a/graphics/pokemon/pyroar/shinyf.pal b/graphics/pokemon/pyroar/shinyf.pal new file mode 100644 index 0000000000..d39b2ea820 --- /dev/null +++ b/graphics/pokemon/pyroar/shinyf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +184 96 32 +112 0 0 +248 168 88 +224 64 48 +176 40 0 +56 40 32 +0 0 0 +120 104 80 +72 56 48 +168 136 96 +96 72 56 +224 192 144 +248 248 248 +192 64 40 +248 216 168 diff --git a/graphics/pokemon/quilladin/anim_front.png b/graphics/pokemon/quilladin/anim_front.png new file mode 100644 index 0000000000..b88513904b Binary files /dev/null and b/graphics/pokemon/quilladin/anim_front.png differ diff --git a/graphics/pokemon/quilladin/footprint.png b/graphics/pokemon/quilladin/footprint.png new file mode 100644 index 0000000000..0c1295e1f0 Binary files /dev/null and b/graphics/pokemon/quilladin/footprint.png differ diff --git a/graphics/pokemon/regidrago/icon.png b/graphics/pokemon/regidrago/icon.png new file mode 100644 index 0000000000..b6cfa5d9d8 Binary files /dev/null and b/graphics/pokemon/regidrago/icon.png differ diff --git a/graphics/pokemon/regieleki/icon.png b/graphics/pokemon/regieleki/icon.png new file mode 100644 index 0000000000..268208caf9 Binary files /dev/null and b/graphics/pokemon/regieleki/icon.png differ diff --git a/graphics/pokemon/reuniclus/anim_front.png b/graphics/pokemon/reuniclus/anim_front.png new file mode 100644 index 0000000000..d83e335647 Binary files /dev/null and b/graphics/pokemon/reuniclus/anim_front.png differ diff --git a/graphics/pokemon/sawsbuck/anim_front.png b/graphics/pokemon/sawsbuck/anim_front.png new file mode 100644 index 0000000000..87f828dbff Binary files /dev/null and b/graphics/pokemon/sawsbuck/anim_front.png differ diff --git a/graphics/pokemon/scatterbug/anim_front.png b/graphics/pokemon/scatterbug/anim_front.png new file mode 100644 index 0000000000..22ea9418e7 Binary files /dev/null and b/graphics/pokemon/scatterbug/anim_front.png differ diff --git a/graphics/pokemon/scatterbug/footprint.png b/graphics/pokemon/scatterbug/footprint.png new file mode 100644 index 0000000000..a62c12a810 Binary files /dev/null and b/graphics/pokemon/scatterbug/footprint.png differ diff --git a/graphics/pokemon/scatterbug/front.png b/graphics/pokemon/scatterbug/front.png index 9af21a9bdb..0a8f680cac 100644 Binary files a/graphics/pokemon/scatterbug/front.png and b/graphics/pokemon/scatterbug/front.png differ diff --git a/graphics/pokemon/seismitoad/anim_front.png b/graphics/pokemon/seismitoad/anim_front.png new file mode 100644 index 0000000000..2db9eaf7a9 Binary files /dev/null and b/graphics/pokemon/seismitoad/anim_front.png differ diff --git a/graphics/pokemon/sigilyph/anim_front.png b/graphics/pokemon/sigilyph/anim_front.png new file mode 100644 index 0000000000..a9c0736cd8 Binary files /dev/null and b/graphics/pokemon/sigilyph/anim_front.png differ diff --git a/graphics/pokemon/simipour/anim_front.png b/graphics/pokemon/simipour/anim_front.png new file mode 100644 index 0000000000..f7a31691c2 Binary files /dev/null and b/graphics/pokemon/simipour/anim_front.png differ diff --git a/graphics/pokemon/simisage/anim_front.png b/graphics/pokemon/simisage/anim_front.png new file mode 100644 index 0000000000..1b3a09c149 Binary files /dev/null and b/graphics/pokemon/simisage/anim_front.png differ diff --git a/graphics/pokemon/simisear/anim_front.png b/graphics/pokemon/simisear/anim_front.png new file mode 100644 index 0000000000..89bdf1153a Binary files /dev/null and b/graphics/pokemon/simisear/anim_front.png differ diff --git a/graphics/pokemon/skiddo/anim_front.png b/graphics/pokemon/skiddo/anim_front.png new file mode 100644 index 0000000000..5705ded48b Binary files /dev/null and b/graphics/pokemon/skiddo/anim_front.png differ diff --git a/graphics/pokemon/skiddo/back.png b/graphics/pokemon/skiddo/back.png index 2c5140c16a..e0821bbdc4 100644 Binary files a/graphics/pokemon/skiddo/back.png and b/graphics/pokemon/skiddo/back.png differ diff --git a/graphics/pokemon/skiddo/footprint.png b/graphics/pokemon/skiddo/footprint.png new file mode 100644 index 0000000000..ddbc09b2cb Binary files /dev/null and b/graphics/pokemon/skiddo/footprint.png differ diff --git a/graphics/pokemon/skiddo/front.png b/graphics/pokemon/skiddo/front.png index 8f28948330..1f7d3545ec 100644 Binary files a/graphics/pokemon/skiddo/front.png and b/graphics/pokemon/skiddo/front.png differ diff --git a/graphics/pokemon/skiddo/normal.pal b/graphics/pokemon/skiddo/normal.pal index fe7db10ecd..fbb80925eb 100644 --- a/graphics/pokemon/skiddo/normal.pal +++ b/graphics/pokemon/skiddo/normal.pal @@ -8,7 +8,7 @@ JASC-PAL 40 32 24 64 56 48 112 88 72 -88 72 56 +128 56 40 0 64 32 0 184 88 0 112 56 diff --git a/graphics/pokemon/skiddo/shiny.pal b/graphics/pokemon/skiddo/shiny.pal index d5abbda272..2a4a00b8e8 100644 --- a/graphics/pokemon/skiddo/shiny.pal +++ b/graphics/pokemon/skiddo/shiny.pal @@ -2,13 +2,13 @@ JASC-PAL 0100 16 152 208 160 -64 64 0 -168 168 8 0 0 0 +168 168 8 +64 64 0 48 48 40 80 72 56 112 96 80 -104 88 72 +104 40 88 24 48 0 104 176 0 64 120 0 diff --git a/graphics/pokemon/skrelp/anim_front.png b/graphics/pokemon/skrelp/anim_front.png new file mode 100644 index 0000000000..c5b29d0cb4 Binary files /dev/null and b/graphics/pokemon/skrelp/anim_front.png differ diff --git a/graphics/pokemon/skrelp/footprint.png b/graphics/pokemon/skrelp/footprint.png new file mode 100644 index 0000000000..4320ad16da Binary files /dev/null and b/graphics/pokemon/skrelp/footprint.png differ diff --git a/graphics/pokemon/skwovet/icon.png b/graphics/pokemon/skwovet/icon.png new file mode 100644 index 0000000000..e7fc809164 Binary files /dev/null and b/graphics/pokemon/skwovet/icon.png differ diff --git a/graphics/pokemon/sliggoo/anim_front.png b/graphics/pokemon/sliggoo/anim_front.png new file mode 100644 index 0000000000..a6b839cdd0 Binary files /dev/null and b/graphics/pokemon/sliggoo/anim_front.png differ diff --git a/graphics/pokemon/sliggoo/back.png b/graphics/pokemon/sliggoo/back.png index a6726574cb..fbc2e4dca8 100644 Binary files a/graphics/pokemon/sliggoo/back.png and b/graphics/pokemon/sliggoo/back.png differ diff --git a/graphics/pokemon/sliggoo/footprint.png b/graphics/pokemon/sliggoo/footprint.png new file mode 100644 index 0000000000..f709e0796e Binary files /dev/null and b/graphics/pokemon/sliggoo/footprint.png differ diff --git a/graphics/pokemon/sliggoo/front.png b/graphics/pokemon/sliggoo/front.png index 6895ac4d0e..1a7f094cd4 100644 Binary files a/graphics/pokemon/sliggoo/front.png and b/graphics/pokemon/sliggoo/front.png differ diff --git a/graphics/pokemon/sliggoo/normal.pal b/graphics/pokemon/sliggoo/normal.pal index 188e373ffb..8aff002734 100644 --- a/graphics/pokemon/sliggoo/normal.pal +++ b/graphics/pokemon/sliggoo/normal.pal @@ -14,6 +14,6 @@ JASC-PAL 152 136 192 64 56 88 104 96 144 -0 0 0 -0 0 0 +200 128 136 +160 88 96 0 0 0 diff --git a/graphics/pokemon/sliggoo/shiny.pal b/graphics/pokemon/sliggoo/shiny.pal index 5ce4be50dd..9d7f10a8a4 100644 --- a/graphics/pokemon/sliggoo/shiny.pal +++ b/graphics/pokemon/sliggoo/shiny.pal @@ -14,6 +14,6 @@ JASC-PAL 240 160 168 120 72 80 208 104 120 -0 0 0 -0 0 0 +200 128 136 +160 88 96 0 0 0 diff --git a/graphics/pokemon/slowbro/galarian/icon.png b/graphics/pokemon/slowbro/galarian/icon.png new file mode 100644 index 0000000000..285681b2ab Binary files /dev/null and b/graphics/pokemon/slowbro/galarian/icon.png differ diff --git a/graphics/pokemon/slowking/galarian/icon.png b/graphics/pokemon/slowking/galarian/icon.png new file mode 100644 index 0000000000..4a69676fe3 Binary files /dev/null and b/graphics/pokemon/slowking/galarian/icon.png differ diff --git a/graphics/pokemon/slowpoke/galarian/icon.png b/graphics/pokemon/slowpoke/galarian/icon.png new file mode 100644 index 0000000000..0445174299 Binary files /dev/null and b/graphics/pokemon/slowpoke/galarian/icon.png differ diff --git a/graphics/pokemon/slurpuff/anim_front.png b/graphics/pokemon/slurpuff/anim_front.png new file mode 100644 index 0000000000..fa28b4d00a Binary files /dev/null and b/graphics/pokemon/slurpuff/anim_front.png differ diff --git a/graphics/pokemon/slurpuff/footprint.png b/graphics/pokemon/slurpuff/footprint.png new file mode 100644 index 0000000000..4d9cf09159 Binary files /dev/null and b/graphics/pokemon/slurpuff/footprint.png differ diff --git a/graphics/pokemon/slurpuff/front.png b/graphics/pokemon/slurpuff/front.png index 1040b2a5c1..fab831b363 100644 Binary files a/graphics/pokemon/slurpuff/front.png and b/graphics/pokemon/slurpuff/front.png differ diff --git a/graphics/pokemon/spectrier/icon.png b/graphics/pokemon/spectrier/icon.png new file mode 100644 index 0000000000..3cf118e295 Binary files /dev/null and b/graphics/pokemon/spectrier/icon.png differ diff --git a/graphics/pokemon/spewpa/anim_front.png b/graphics/pokemon/spewpa/anim_front.png new file mode 100644 index 0000000000..b760b6d647 Binary files /dev/null and b/graphics/pokemon/spewpa/anim_front.png differ diff --git a/graphics/pokemon/spewpa/footprint.png b/graphics/pokemon/spewpa/footprint.png new file mode 100644 index 0000000000..3d8347d75e Binary files /dev/null and b/graphics/pokemon/spewpa/footprint.png differ diff --git a/graphics/pokemon/spewpa/front.png b/graphics/pokemon/spewpa/front.png index edef3d8ac9..4f6a6269ef 100644 Binary files a/graphics/pokemon/spewpa/front.png and b/graphics/pokemon/spewpa/front.png differ diff --git a/graphics/pokemon/spritzee/anim_front.png b/graphics/pokemon/spritzee/anim_front.png new file mode 100644 index 0000000000..5e6e4deb65 Binary files /dev/null and b/graphics/pokemon/spritzee/anim_front.png differ diff --git a/graphics/pokemon/spritzee/footprint.png b/graphics/pokemon/spritzee/footprint.png new file mode 100644 index 0000000000..5fa3920400 Binary files /dev/null and b/graphics/pokemon/spritzee/footprint.png differ diff --git a/graphics/pokemon/swirlix/anim_front.png b/graphics/pokemon/swirlix/anim_front.png new file mode 100644 index 0000000000..1b64137bdd Binary files /dev/null and b/graphics/pokemon/swirlix/anim_front.png differ diff --git a/graphics/pokemon/swirlix/footprint.png b/graphics/pokemon/swirlix/footprint.png new file mode 100644 index 0000000000..5fa0c68a56 Binary files /dev/null and b/graphics/pokemon/swirlix/footprint.png differ diff --git a/graphics/pokemon/sylveon/anim_front.png b/graphics/pokemon/sylveon/anim_front.png new file mode 100644 index 0000000000..a840f7cf86 Binary files /dev/null and b/graphics/pokemon/sylveon/anim_front.png differ diff --git a/graphics/pokemon/sylveon/back.png b/graphics/pokemon/sylveon/back.png index 73eace27ae..3eb8577699 100644 Binary files a/graphics/pokemon/sylveon/back.png and b/graphics/pokemon/sylveon/back.png differ diff --git a/graphics/pokemon/sylveon/footprint.png b/graphics/pokemon/sylveon/footprint.png new file mode 100644 index 0000000000..286aa0f56a Binary files /dev/null and b/graphics/pokemon/sylveon/footprint.png differ diff --git a/graphics/pokemon/sylveon/front.png b/graphics/pokemon/sylveon/front.png index a6d27ffe9f..dbed231083 100644 Binary files a/graphics/pokemon/sylveon/front.png and b/graphics/pokemon/sylveon/front.png differ diff --git a/graphics/pokemon/sylveon/normal.pal b/graphics/pokemon/sylveon/normal.pal index 61893bc8a1..f97c5bee3d 100644 --- a/graphics/pokemon/sylveon/normal.pal +++ b/graphics/pokemon/sylveon/normal.pal @@ -12,8 +12,8 @@ JASC-PAL 144 96 152 248 248 248 200 80 112 -224 192 232 -16 16 16 -0 0 0 +240 216 248 +208 160 224 +240 136 120 0 0 0 0 0 0 diff --git a/graphics/pokemon/sylveon/shiny.pal b/graphics/pokemon/sylveon/shiny.pal index 398e0411fe..85f898000f 100644 --- a/graphics/pokemon/sylveon/shiny.pal +++ b/graphics/pokemon/sylveon/shiny.pal @@ -13,7 +13,7 @@ JASC-PAL 248 248 248 64 136 152 192 192 200 -16 16 16 -0 0 0 +168 168 184 +240 136 120 0 0 0 0 0 0 diff --git a/graphics/pokemon/talonflame/anim_front.png b/graphics/pokemon/talonflame/anim_front.png new file mode 100644 index 0000000000..db505ac63a Binary files /dev/null and b/graphics/pokemon/talonflame/anim_front.png differ diff --git a/graphics/pokemon/talonflame/back.png b/graphics/pokemon/talonflame/back.png index 56c27e43c5..e80745d218 100644 Binary files a/graphics/pokemon/talonflame/back.png and b/graphics/pokemon/talonflame/back.png differ diff --git a/graphics/pokemon/talonflame/footprint.png b/graphics/pokemon/talonflame/footprint.png new file mode 100644 index 0000000000..197f4f3e2f Binary files /dev/null and b/graphics/pokemon/talonflame/footprint.png differ diff --git a/graphics/pokemon/talonflame/front.png b/graphics/pokemon/talonflame/front.png index 8196abc045..2fd619c53e 100644 Binary files a/graphics/pokemon/talonflame/front.png and b/graphics/pokemon/talonflame/front.png differ diff --git a/graphics/pokemon/talonflame/normal.pal b/graphics/pokemon/talonflame/normal.pal index c4431c74cf..d846095ee2 100644 --- a/graphics/pokemon/talonflame/normal.pal +++ b/graphics/pokemon/talonflame/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 152 160 168 80 64 32 248 248 248 -0 0 0 +168 120 128 diff --git a/graphics/pokemon/talonflame/shiny.pal b/graphics/pokemon/talonflame/shiny.pal index ec6f9648e5..da33534336 100644 --- a/graphics/pokemon/talonflame/shiny.pal +++ b/graphics/pokemon/talonflame/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 200 144 104 80 64 32 248 248 248 -0 0 0 +168 120 128 diff --git a/graphics/pokemon/tapu_bulu/anim_front.png b/graphics/pokemon/tapu_bulu/anim_front.png new file mode 100644 index 0000000000..e5f6355bbc Binary files /dev/null and b/graphics/pokemon/tapu_bulu/anim_front.png differ diff --git a/graphics/pokemon/tapu_bulu/front.png b/graphics/pokemon/tapu_bulu/front.png index e5f6355bbc..ef0eb3357c 100644 Binary files a/graphics/pokemon/tapu_bulu/front.png and b/graphics/pokemon/tapu_bulu/front.png differ diff --git a/graphics/pokemon/tapu_fini/anim_front.png b/graphics/pokemon/tapu_fini/anim_front.png new file mode 100644 index 0000000000..ca583faab6 Binary files /dev/null and b/graphics/pokemon/tapu_fini/anim_front.png differ diff --git a/graphics/pokemon/tapu_fini/front.png b/graphics/pokemon/tapu_fini/front.png index ca583faab6..ccf8d39e9f 100644 Binary files a/graphics/pokemon/tapu_fini/front.png and b/graphics/pokemon/tapu_fini/front.png differ diff --git a/graphics/pokemon/tapu_koko/anim_front.png b/graphics/pokemon/tapu_koko/anim_front.png new file mode 100644 index 0000000000..f98c83b471 Binary files /dev/null and b/graphics/pokemon/tapu_koko/anim_front.png differ diff --git a/graphics/pokemon/tapu_koko/front.png b/graphics/pokemon/tapu_koko/front.png index f98c83b471..d6a5fd655a 100644 Binary files a/graphics/pokemon/tapu_koko/front.png and b/graphics/pokemon/tapu_koko/front.png differ diff --git a/graphics/pokemon/tapu_lele/anim_front.png b/graphics/pokemon/tapu_lele/anim_front.png new file mode 100644 index 0000000000..93a7038799 Binary files /dev/null and b/graphics/pokemon/tapu_lele/anim_front.png differ diff --git a/graphics/pokemon/tapu_lele/front.png b/graphics/pokemon/tapu_lele/front.png index 93a7038799..31f5d1c1ae 100644 Binary files a/graphics/pokemon/tapu_lele/front.png and b/graphics/pokemon/tapu_lele/front.png differ diff --git a/graphics/pokemon/terrakion/anim_front.png b/graphics/pokemon/terrakion/anim_front.png new file mode 100644 index 0000000000..5a16f12e5c Binary files /dev/null and b/graphics/pokemon/terrakion/anim_front.png differ diff --git a/graphics/pokemon/thundurus/anim_front.png b/graphics/pokemon/thundurus/anim_front.png new file mode 100644 index 0000000000..82089b2236 Binary files /dev/null and b/graphics/pokemon/thundurus/anim_front.png differ diff --git a/graphics/pokemon/tornadus/anim_front.png b/graphics/pokemon/tornadus/anim_front.png new file mode 100644 index 0000000000..6b9f6e4785 Binary files /dev/null and b/graphics/pokemon/tornadus/anim_front.png differ diff --git a/graphics/pokemon/toxel/icon.png b/graphics/pokemon/toxel/icon.png new file mode 100644 index 0000000000..b1989e50c8 Binary files /dev/null and b/graphics/pokemon/toxel/icon.png differ diff --git a/graphics/pokemon/trevenant/anim_front.png b/graphics/pokemon/trevenant/anim_front.png new file mode 100644 index 0000000000..3a51361f77 Binary files /dev/null and b/graphics/pokemon/trevenant/anim_front.png differ diff --git a/graphics/pokemon/trevenant/footprint.png b/graphics/pokemon/trevenant/footprint.png new file mode 100644 index 0000000000..97e1658e4a Binary files /dev/null and b/graphics/pokemon/trevenant/footprint.png differ diff --git a/graphics/pokemon/trevenant/front.png b/graphics/pokemon/trevenant/front.png index c4990c970d..5dae0e09a4 100644 Binary files a/graphics/pokemon/trevenant/front.png and b/graphics/pokemon/trevenant/front.png differ diff --git a/graphics/pokemon/trubbish/anim_front.png b/graphics/pokemon/trubbish/anim_front.png new file mode 100644 index 0000000000..46c3ba76e2 Binary files /dev/null and b/graphics/pokemon/trubbish/anim_front.png differ diff --git a/graphics/pokemon/tyrantrum/anim_front.png b/graphics/pokemon/tyrantrum/anim_front.png new file mode 100644 index 0000000000..22f83b3bcb Binary files /dev/null and b/graphics/pokemon/tyrantrum/anim_front.png differ diff --git a/graphics/pokemon/tyrantrum/back.png b/graphics/pokemon/tyrantrum/back.png index 47bdda8387..f857bfbfd1 100644 Binary files a/graphics/pokemon/tyrantrum/back.png and b/graphics/pokemon/tyrantrum/back.png differ diff --git a/graphics/pokemon/tyrantrum/footprint.png b/graphics/pokemon/tyrantrum/footprint.png new file mode 100644 index 0000000000..77ac61310c Binary files /dev/null and b/graphics/pokemon/tyrantrum/footprint.png differ diff --git a/graphics/pokemon/tyrantrum/front.png b/graphics/pokemon/tyrantrum/front.png index a8891254f1..3aa035a521 100644 Binary files a/graphics/pokemon/tyrantrum/front.png and b/graphics/pokemon/tyrantrum/front.png differ diff --git a/graphics/pokemon/tyrantrum/normal.pal b/graphics/pokemon/tyrantrum/normal.pal index 10388b77a4..6c396c09d1 100644 --- a/graphics/pokemon/tyrantrum/normal.pal +++ b/graphics/pokemon/tyrantrum/normal.pal @@ -15,5 +15,5 @@ JASC-PAL 24 24 16 200 120 136 192 192 192 -0 0 0 -0 0 0 +216 144 152 +160 88 96 diff --git a/graphics/pokemon/tyrantrum/shiny.pal b/graphics/pokemon/tyrantrum/shiny.pal index acde8f2c1c..a062093501 100644 --- a/graphics/pokemon/tyrantrum/shiny.pal +++ b/graphics/pokemon/tyrantrum/shiny.pal @@ -15,5 +15,5 @@ JASC-PAL 24 24 16 120 160 200 192 192 192 -0 0 0 -0 0 0 +216 144 152 +160 88 96 diff --git a/graphics/pokemon/tyrunt/anim_front.png b/graphics/pokemon/tyrunt/anim_front.png new file mode 100644 index 0000000000..240f7679ae Binary files /dev/null and b/graphics/pokemon/tyrunt/anim_front.png differ diff --git a/graphics/pokemon/tyrunt/footprint.png b/graphics/pokemon/tyrunt/footprint.png new file mode 100644 index 0000000000..04157d186e Binary files /dev/null and b/graphics/pokemon/tyrunt/footprint.png differ diff --git a/graphics/pokemon/unfezant/anim_front.png b/graphics/pokemon/unfezant/anim_front.png new file mode 100644 index 0000000000..59ff1e4d68 Binary files /dev/null and b/graphics/pokemon/unfezant/anim_front.png differ diff --git a/graphics/pokemon/unfezant/anim_frontf.png b/graphics/pokemon/unfezant/anim_frontf.png new file mode 100644 index 0000000000..bd39fc3d12 Binary files /dev/null and b/graphics/pokemon/unfezant/anim_frontf.png differ diff --git a/graphics/pokemon/unfezant/back.png b/graphics/pokemon/unfezant/back.png index 8bb437303b..829367c68c 100644 Binary files a/graphics/pokemon/unfezant/back.png and b/graphics/pokemon/unfezant/back.png differ diff --git a/graphics/pokemon/unfezant/backf.png b/graphics/pokemon/unfezant/backf.png new file mode 100644 index 0000000000..cded84b124 Binary files /dev/null and b/graphics/pokemon/unfezant/backf.png differ diff --git a/graphics/pokemon/unfezant/icon.png b/graphics/pokemon/unfezant/icon.png index 7911eb8cad..8b61d1bfba 100644 Binary files a/graphics/pokemon/unfezant/icon.png and b/graphics/pokemon/unfezant/icon.png differ diff --git a/graphics/pokemon/unfezant/iconf.png b/graphics/pokemon/unfezant/iconf.png new file mode 100644 index 0000000000..4c4a809ada Binary files /dev/null and b/graphics/pokemon/unfezant/iconf.png differ diff --git a/graphics/pokemon/unfezant/normal.pal b/graphics/pokemon/unfezant/normal.pal index 26ccf7974a..bb69c2c400 100644 --- a/graphics/pokemon/unfezant/normal.pal +++ b/graphics/pokemon/unfezant/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -152 56 72 +153 210 164 +170 97 108 +219 189 54 +109 68 29 +98 98 98 +51 165 110 +96 50 72 +132 127 132 +49 49 53 +48 122 82 +158 60 79 +221 79 108 +164 166 173 16 16 16 -216 72 104 -96 48 72 -72 72 80 -96 96 96 -160 160 168 -104 64 24 -152 104 48 -216 184 48 -248 248 248 -48 48 48 -128 120 128 -48 120 80 -48 160 104 +75 75 81 +255 255 255 diff --git a/graphics/pokemon/unfezant/normalf.pal b/graphics/pokemon/unfezant/normalf.pal new file mode 100644 index 0000000000..a878e4c533 --- /dev/null +++ b/graphics/pokemon/unfezant/normalf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 210 164 +170 97 108 +219 189 54 +98 98 98 +158 110 55 +0 0 0 +132 127 132 +109 68 29 +49 49 53 +16 16 16 +164 166 173 +75 75 81 +255 255 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/unfezant/shiny.pal b/graphics/pokemon/unfezant/shiny.pal index b4507abb04..375861cc96 100644 --- a/graphics/pokemon/unfezant/shiny.pal +++ b/graphics/pokemon/unfezant/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -120 64 160 -16 16 16 -200 104 208 -64 56 80 -88 72 48 -96 88 80 -208 208 184 -160 120 64 -216 168 72 -248 200 72 -248 248 248 -48 48 32 -168 160 128 +153 210 164 +255 66 123 +255 207 76 +164 123 65 +98 90 82 +57 148 139 +70 58 81 +172 164 131 +48 48 36 48 96 96 -56 144 136 +127 66 163 +202 110 209 +211 211 186 +16 16 16 +94 72 51 +255 255 255 diff --git a/graphics/pokemon/unfezant/shinyf.pal b/graphics/pokemon/unfezant/shinyf.pal new file mode 100644 index 0000000000..66ec84ee83 --- /dev/null +++ b/graphics/pokemon/unfezant/shinyf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 210 164 +255 66 123 +255 207 76 +98 90 82 +221 174 79 +0 0 0 +172 164 131 +160 120 64 +48 48 36 +16 16 16 +211 211 186 +94 72 51 +255 255 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/urshifu/icon.png b/graphics/pokemon/urshifu/icon.png new file mode 100644 index 0000000000..28f64a50ff Binary files /dev/null and b/graphics/pokemon/urshifu/icon.png differ diff --git a/graphics/pokemon/virizion/anim_front.png b/graphics/pokemon/virizion/anim_front.png new file mode 100644 index 0000000000..516c9423dd Binary files /dev/null and b/graphics/pokemon/virizion/anim_front.png differ diff --git a/graphics/pokemon/vivillon/anim_front.png b/graphics/pokemon/vivillon/anim_front.png new file mode 100644 index 0000000000..f4c3ee9cac Binary files /dev/null and b/graphics/pokemon/vivillon/anim_front.png differ diff --git a/graphics/pokemon/vivillon/archipelago/anim_front.png b/graphics/pokemon/vivillon/archipelago/anim_front.png new file mode 100644 index 0000000000..533118f356 Binary files /dev/null and b/graphics/pokemon/vivillon/archipelago/anim_front.png differ diff --git a/graphics/pokemon/vivillon/archipelago/back.png b/graphics/pokemon/vivillon/archipelago/back.png index 813c4c08bc..7d8e5b8908 100644 Binary files a/graphics/pokemon/vivillon/archipelago/back.png and b/graphics/pokemon/vivillon/archipelago/back.png differ diff --git a/graphics/pokemon/vivillon/archipelago/front.png b/graphics/pokemon/vivillon/archipelago/front.png index fa797126c0..7fb1becc1c 100644 Binary files a/graphics/pokemon/vivillon/archipelago/front.png and b/graphics/pokemon/vivillon/archipelago/front.png differ diff --git a/graphics/pokemon/vivillon/archipelago/normal.pal b/graphics/pokemon/vivillon/archipelago/normal.pal index c0c3ed4486..b79e6be2fe 100644 --- a/graphics/pokemon/vivillon/archipelago/normal.pal +++ b/graphics/pokemon/vivillon/archipelago/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -199 33 33 -255 56 56 -7 163 78 -226 199 170 +152 208 160 +48 40 40 +88 80 80 +168 16 16 +224 56 56 +224 112 16 +88 160 56 +224 200 168 +176 88 16 +0 0 0 +104 80 56 +48 48 40 +152 136 128 +248 248 248 +192 184 184 88 80 80 -80 72 40 -224 192 120 -221 113 15 -175 85 18 -127 127 127 -188 188 188 -196 113 148 -191 57 117 diff --git a/graphics/pokemon/vivillon/archipelago/shiny.pal b/graphics/pokemon/vivillon/archipelago/shiny.pal index 499a0faf22..06f874e9fc 100644 --- a/graphics/pokemon/vivillon/archipelago/shiny.pal +++ b/graphics/pokemon/vivillon/archipelago/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -199 33 33 -255 56 56 -7 163 78 -226 199 170 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +128 16 16 +168 24 24 +200 80 40 +96 152 72 224 192 120 -221 113 15 -175 85 18 -196 189 182 -252 252 252 -196 113 148 -191 57 117 +160 64 32 +0 0 0 +96 88 48 +48 48 40 +192 184 176 +248 248 248 +232 232 232 +144 136 136 diff --git a/graphics/pokemon/vivillon/back.png b/graphics/pokemon/vivillon/back.png index 1dd510fa4a..99ff947dfa 100644 Binary files a/graphics/pokemon/vivillon/back.png and b/graphics/pokemon/vivillon/back.png differ diff --git a/graphics/pokemon/vivillon/continental/anim_front.png b/graphics/pokemon/vivillon/continental/anim_front.png new file mode 100644 index 0000000000..269c3762c1 Binary files /dev/null and b/graphics/pokemon/vivillon/continental/anim_front.png differ diff --git a/graphics/pokemon/vivillon/continental/back.png b/graphics/pokemon/vivillon/continental/back.png index d11b51aba8..8fe8b49ca1 100644 Binary files a/graphics/pokemon/vivillon/continental/back.png and b/graphics/pokemon/vivillon/continental/back.png differ diff --git a/graphics/pokemon/vivillon/continental/front.png b/graphics/pokemon/vivillon/continental/front.png index 768fe597bf..785e6371ec 100644 Binary files a/graphics/pokemon/vivillon/continental/front.png and b/graphics/pokemon/vivillon/continental/front.png differ diff --git a/graphics/pokemon/vivillon/continental/normal.pal b/graphics/pokemon/vivillon/continental/normal.pal index 23e3ce820a..f96a428ef6 100644 --- a/graphics/pokemon/vivillon/continental/normal.pal +++ b/graphics/pokemon/vivillon/continental/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -166 57 11 -209 90 3 -255 171 45 +152 208 160 +48 40 40 88 80 80 -80 72 40 +168 56 16 +208 88 0 +248 176 48 +248 248 0 +0 0 0 +208 152 8 +200 32 32 +104 80 56 224 192 120 -255 225 0 -244 0 37 -204 155 9 -127 127 127 -188 188 188 -196 113 148 -191 57 117 +48 48 40 +152 136 128 +248 248 248 +192 184 184 diff --git a/graphics/pokemon/vivillon/continental/shiny.pal b/graphics/pokemon/vivillon/continental/shiny.pal index 1b46ac5c7e..816b554c2c 100644 --- a/graphics/pokemon/vivillon/continental/shiny.pal +++ b/graphics/pokemon/vivillon/continental/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -166 57 11 -209 90 3 -255 171 45 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +136 56 24 +192 96 48 +216 160 48 +232 232 64 +0 0 0 +184 176 56 +200 32 32 +96 88 48 224 192 120 -255 225 0 -244 0 37 -204 155 9 -196 189 182 -255 255 255 -196 113 148 -191 57 117 +48 48 40 +192 184 176 +248 248 248 +232 232 232 diff --git a/graphics/pokemon/vivillon/elegant/anim_front.png b/graphics/pokemon/vivillon/elegant/anim_front.png new file mode 100644 index 0000000000..bf3e2aabb9 Binary files /dev/null and b/graphics/pokemon/vivillon/elegant/anim_front.png differ diff --git a/graphics/pokemon/vivillon/elegant/back.png b/graphics/pokemon/vivillon/elegant/back.png index 118b9a5640..28beb285cd 100644 Binary files a/graphics/pokemon/vivillon/elegant/back.png and b/graphics/pokemon/vivillon/elegant/back.png differ diff --git a/graphics/pokemon/vivillon/elegant/front.png b/graphics/pokemon/vivillon/elegant/front.png index c4f1cb44e9..d4e09f2a7f 100644 Binary files a/graphics/pokemon/vivillon/elegant/front.png and b/graphics/pokemon/vivillon/elegant/front.png differ diff --git a/graphics/pokemon/vivillon/elegant/normal.pal b/graphics/pokemon/vivillon/elegant/normal.pal index f5a068728f..4e8aebf8d2 100644 --- a/graphics/pokemon/vivillon/elegant/normal.pal +++ b/graphics/pokemon/vivillon/elegant/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -69 48 111 -248 218 239 -198 113 196 -243 152 55 -117 53 179 +152 208 160 +48 40 40 88 80 80 -80 72 40 +248 216 240 +240 152 64 +200 112 200 +0 0 0 +120 56 176 +248 24 56 +72 48 112 +104 80 56 224 192 120 -255 23 58 -127 127 127 -188 188 188 -196 113 148 -191 57 117 +152 136 128 +248 248 248 +192 184 184 +216 144 184 diff --git a/graphics/pokemon/vivillon/elegant/shiny.pal b/graphics/pokemon/vivillon/elegant/shiny.pal index 71ba5a14a6..56a69e6f3c 100644 --- a/graphics/pokemon/vivillon/elegant/shiny.pal +++ b/graphics/pokemon/vivillon/elegant/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 +152 208 160 +48 48 40 88 80 80 -69 48 111 -248 218 239 -198 113 196 -243 152 55 -117 53 179 -145 140 140 -80 72 40 +224 184 208 +240 136 64 +176 112 168 +0 0 0 +128 80 120 +224 56 48 +80 48 120 +96 88 48 224 192 120 -255 23 58 -196 189 182 -252 252 252 -196 113 148 -191 57 117 +192 184 176 +248 248 248 +232 232 232 +192 144 184 diff --git a/graphics/pokemon/vivillon/fancy/anim_front.png b/graphics/pokemon/vivillon/fancy/anim_front.png new file mode 100644 index 0000000000..3a6cdae3a9 Binary files /dev/null and b/graphics/pokemon/vivillon/fancy/anim_front.png differ diff --git a/graphics/pokemon/vivillon/fancy/back.png b/graphics/pokemon/vivillon/fancy/back.png index e672375945..4ee61c5d19 100644 Binary files a/graphics/pokemon/vivillon/fancy/back.png and b/graphics/pokemon/vivillon/fancy/back.png differ diff --git a/graphics/pokemon/vivillon/fancy/front.png b/graphics/pokemon/vivillon/fancy/front.png index fd1ab6b373..ad26aa4798 100644 Binary files a/graphics/pokemon/vivillon/fancy/front.png and b/graphics/pokemon/vivillon/fancy/front.png differ diff --git a/graphics/pokemon/vivillon/fancy/normal.pal b/graphics/pokemon/vivillon/fancy/normal.pal index 1e8f33f3d3..881ac0c079 100644 --- a/graphics/pokemon/vivillon/fancy/normal.pal +++ b/graphics/pokemon/vivillon/fancy/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -80 72 40 -20 156 40 -143 202 100 -152 141 203 -224 192 120 +0 160 248 +48 40 40 88 80 80 -242 210 226 -250 61 99 -220 220 220 -127 127 127 -205 171 190 -231 137 161 +64 160 40 +152 200 72 +168 128 192 +240 216 128 0 0 0 +96 88 48 +248 192 224 +216 72 64 +200 136 168 +248 248 248 +152 136 128 +8 8 8 +192 184 184 diff --git a/graphics/pokemon/vivillon/fancy/shiny.pal b/graphics/pokemon/vivillon/fancy/shiny.pal index a46b0f1b4d..661800059e 100644 --- a/graphics/pokemon/vivillon/fancy/shiny.pal +++ b/graphics/pokemon/vivillon/fancy/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -80 72 40 -20 156 40 -143 202 100 -152 141 203 -224 192 120 -145 140 140 -242 210 226 -250 61 99 -220 220 220 -196 189 182 -205 171 190 -231 137 161 +0 160 248 +48 40 40 +88 80 80 +64 160 40 +152 200 72 +168 128 192 +240 216 128 0 0 0 +96 88 48 +248 192 224 +216 72 64 +200 136 168 +248 248 248 +192 184 176 +8 8 8 +232 232 232 diff --git a/graphics/pokemon/vivillon/footprint.png b/graphics/pokemon/vivillon/footprint.png new file mode 100644 index 0000000000..bc51948b82 Binary files /dev/null and b/graphics/pokemon/vivillon/footprint.png differ diff --git a/graphics/pokemon/vivillon/front.png b/graphics/pokemon/vivillon/front.png index cd2ca1a44d..cd1bdfbd7e 100644 Binary files a/graphics/pokemon/vivillon/front.png and b/graphics/pokemon/vivillon/front.png differ diff --git a/graphics/pokemon/vivillon/garden/anim_front.png b/graphics/pokemon/vivillon/garden/anim_front.png new file mode 100644 index 0000000000..7fab9a646d Binary files /dev/null and b/graphics/pokemon/vivillon/garden/anim_front.png differ diff --git a/graphics/pokemon/vivillon/garden/back.png b/graphics/pokemon/vivillon/garden/back.png index b2067cab92..06fb8e032c 100644 Binary files a/graphics/pokemon/vivillon/garden/back.png and b/graphics/pokemon/vivillon/garden/back.png differ diff --git a/graphics/pokemon/vivillon/garden/front.png b/graphics/pokemon/vivillon/garden/front.png index db74206226..bcdc18e854 100644 Binary files a/graphics/pokemon/vivillon/garden/front.png and b/graphics/pokemon/vivillon/garden/front.png differ diff --git a/graphics/pokemon/vivillon/garden/normal.pal b/graphics/pokemon/vivillon/garden/normal.pal index 55060d1636..a27457b65f 100644 --- a/graphics/pokemon/vivillon/garden/normal.pal +++ b/graphics/pokemon/vivillon/garden/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -1 71 50 -0 137 63 -3 175 123 +152 208 160 +48 40 40 88 80 80 -80 72 40 +16 80 40 +0 136 64 +0 176 120 +0 136 96 +0 0 0 +104 80 56 224 192 120 -155 202 104 -194 56 41 -2 136 96 -127 127 127 -188 188 188 -196 113 148 -191 57 117 +152 200 104 +192 56 40 +152 136 128 +248 248 248 +192 184 184 +16 80 40 diff --git a/graphics/pokemon/vivillon/garden/shiny.pal b/graphics/pokemon/vivillon/garden/shiny.pal index e42f836283..b983711695 100644 --- a/graphics/pokemon/vivillon/garden/shiny.pal +++ b/graphics/pokemon/vivillon/garden/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -1 71 50 -0 137 63 -3 175 123 -145 140 140 -80 72 40 +152 208 160 +48 40 40 +88 80 80 +32 64 8 +56 96 40 +24 144 96 +24 112 64 +0 0 0 +96 88 48 224 192 120 -155 202 104 -194 56 41 -2 136 96 -196 189 182 -252 252 252 -196 113 148 -191 57 117 +112 176 72 +152 40 40 +192 184 176 +248 248 248 +232 232 232 +16 80 40 diff --git a/graphics/pokemon/vivillon/high_plains/anim_front.png b/graphics/pokemon/vivillon/high_plains/anim_front.png new file mode 100644 index 0000000000..5302ef41be Binary files /dev/null and b/graphics/pokemon/vivillon/high_plains/anim_front.png differ diff --git a/graphics/pokemon/vivillon/high_plains/back.png b/graphics/pokemon/vivillon/high_plains/back.png index 0c4c685ed0..457fcdd9e7 100644 Binary files a/graphics/pokemon/vivillon/high_plains/back.png and b/graphics/pokemon/vivillon/high_plains/back.png differ diff --git a/graphics/pokemon/vivillon/high_plains/front.png b/graphics/pokemon/vivillon/high_plains/front.png index aff4eaf721..d8bae72c4e 100644 Binary files a/graphics/pokemon/vivillon/high_plains/front.png and b/graphics/pokemon/vivillon/high_plains/front.png differ diff --git a/graphics/pokemon/vivillon/high_plains/normal.pal b/graphics/pokemon/vivillon/high_plains/normal.pal index 79d64ab86b..3ac0c5b77e 100644 --- a/graphics/pokemon/vivillon/high_plains/normal.pal +++ b/graphics/pokemon/vivillon/high_plains/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -135 56 33 -230 128 68 +152 208 160 +48 40 40 88 80 80 -80 72 40 +136 56 32 +200 96 56 +232 128 72 +152 16 24 +0 0 0 +104 80 56 224 192 120 -199 45 92 -201 96 61 -127 127 127 -188 188 188 -196 113 148 -191 57 117 -250 216 20 -11 174 68 +152 136 128 +8 8 8 +248 248 248 +192 184 184 +16 176 72 +248 216 16 diff --git a/graphics/pokemon/vivillon/high_plains/shiny.pal b/graphics/pokemon/vivillon/high_plains/shiny.pal index 33a17f41aa..5bead557da 100644 --- a/graphics/pokemon/vivillon/high_plains/shiny.pal +++ b/graphics/pokemon/vivillon/high_plains/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -135 56 33 -230 128 68 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +136 72 32 +176 96 40 +224 128 64 +144 32 40 +0 0 0 +96 88 48 224 192 120 -199 45 92 -201 96 61 -196 189 182 -252 252 252 -196 113 148 -191 57 117 -250 216 20 -11 174 68 +192 184 176 +8 8 8 +248 248 248 +232 232 232 +48 120 56 +208 184 40 diff --git a/graphics/pokemon/vivillon/jungle/anim_front.png b/graphics/pokemon/vivillon/jungle/anim_front.png new file mode 100644 index 0000000000..5b8b385348 Binary files /dev/null and b/graphics/pokemon/vivillon/jungle/anim_front.png differ diff --git a/graphics/pokemon/vivillon/jungle/back.png b/graphics/pokemon/vivillon/jungle/back.png index 9aaa0190bd..03ebae21c9 100644 Binary files a/graphics/pokemon/vivillon/jungle/back.png and b/graphics/pokemon/vivillon/jungle/back.png differ diff --git a/graphics/pokemon/vivillon/jungle/front.png b/graphics/pokemon/vivillon/jungle/front.png index 64a90b4a18..1ab8f99eac 100644 Binary files a/graphics/pokemon/vivillon/jungle/front.png and b/graphics/pokemon/vivillon/jungle/front.png differ diff --git a/graphics/pokemon/vivillon/jungle/normal.pal b/graphics/pokemon/vivillon/jungle/normal.pal index 53338914d2..a65f3e73e8 100644 --- a/graphics/pokemon/vivillon/jungle/normal.pal +++ b/graphics/pokemon/vivillon/jungle/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -84 56 34 -77 134 105 -135 204 192 +152 208 160 +48 40 40 88 80 80 -80 72 40 +56 96 80 +80 136 104 +136 200 192 +0 0 0 +104 80 56 224 192 120 -58 97 85 -127 127 127 -188 188 188 -196 113 148 -191 57 117 -164 97 27 -233 183 125 +152 136 128 +8 8 8 +248 248 248 +192 184 184 +144 16 64 +160 96 32 +80 56 32 diff --git a/graphics/pokemon/vivillon/jungle/shiny.pal b/graphics/pokemon/vivillon/jungle/shiny.pal index 7a2767f7d1..6605f77542 100644 --- a/graphics/pokemon/vivillon/jungle/shiny.pal +++ b/graphics/pokemon/vivillon/jungle/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -84 56 34 -77 134 105 -135 204 192 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +56 96 80 +80 136 104 +136 200 192 +0 0 0 +96 88 48 224 192 120 -58 97 85 -196 189 182 -252 252 252 -196 113 148 -191 57 117 -164 97 27 -233 183 125 +192 184 176 +8 8 8 +248 248 248 +232 232 232 +144 24 80 +160 96 32 +80 56 32 diff --git a/graphics/pokemon/vivillon/marine/anim_front.png b/graphics/pokemon/vivillon/marine/anim_front.png new file mode 100644 index 0000000000..67b9959e77 Binary files /dev/null and b/graphics/pokemon/vivillon/marine/anim_front.png differ diff --git a/graphics/pokemon/vivillon/marine/back.png b/graphics/pokemon/vivillon/marine/back.png index 0f39160b0b..67146a43f1 100644 Binary files a/graphics/pokemon/vivillon/marine/back.png and b/graphics/pokemon/vivillon/marine/back.png differ diff --git a/graphics/pokemon/vivillon/marine/front.png b/graphics/pokemon/vivillon/marine/front.png index 50a2a13af8..5ec8a8c465 100644 Binary files a/graphics/pokemon/vivillon/marine/front.png and b/graphics/pokemon/vivillon/marine/front.png differ diff --git a/graphics/pokemon/vivillon/marine/normal.pal b/graphics/pokemon/vivillon/marine/normal.pal index 736002eb49..da925d4e9f 100644 --- a/graphics/pokemon/vivillon/marine/normal.pal +++ b/graphics/pokemon/vivillon/marine/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -14 51 84 -0 115 183 -3 199 255 +152 208 160 +48 40 40 88 80 80 -80 72 40 -224 192 120 -252 252 252 -12 157 232 -127 127 127 -188 188 188 -196 113 148 -191 57 117 +16 48 80 +0 112 184 +0 200 248 +16 160 232 0 0 0 +104 80 56 +224 192 120 +192 184 208 +248 248 248 +152 136 128 +192 184 184 +184 24 80 +88 80 80 diff --git a/graphics/pokemon/vivillon/marine/shiny.pal b/graphics/pokemon/vivillon/marine/shiny.pal index 79c0d57988..bdfd6908fc 100644 --- a/graphics/pokemon/vivillon/marine/shiny.pal +++ b/graphics/pokemon/vivillon/marine/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -14 51 84 -0 115 183 -3 199 255 -145 140 140 -80 72 40 -224 192 120 -251 251 251 -12 157 232 -196 189 182 -252 252 252 -196 113 148 -191 57 117 +152 208 160 +48 48 40 +88 80 80 +24 48 80 +40 64 160 +72 160 216 +32 112 168 0 0 0 +96 88 48 +224 192 120 +168 160 160 +248 248 248 +192 184 176 +232 232 232 +144 24 80 +144 136 136 diff --git a/graphics/pokemon/vivillon/meadow/anim_front.png b/graphics/pokemon/vivillon/meadow/anim_front.png new file mode 100644 index 0000000000..01f1afda78 Binary files /dev/null and b/graphics/pokemon/vivillon/meadow/anim_front.png differ diff --git a/graphics/pokemon/vivillon/meadow/back.png b/graphics/pokemon/vivillon/meadow/back.png index 2cbe8cf4be..3aed33d089 100644 Binary files a/graphics/pokemon/vivillon/meadow/back.png and b/graphics/pokemon/vivillon/meadow/back.png differ diff --git a/graphics/pokemon/vivillon/meadow/front.png b/graphics/pokemon/vivillon/meadow/front.png index 472340eace..698ac42333 100644 Binary files a/graphics/pokemon/vivillon/meadow/front.png and b/graphics/pokemon/vivillon/meadow/front.png differ diff --git a/graphics/pokemon/vivillon/meadow/normal.pal b/graphics/pokemon/vivillon/meadow/normal.pal index 87c862c6ee..837369adf4 100644 --- a/graphics/pokemon/vivillon/meadow/normal.pal +++ b/graphics/pokemon/vivillon/meadow/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -120 168 144 -0 0 0 -32 32 32 +152 208 160 +48 40 40 +88 80 80 152 24 64 184 56 112 -88 80 80 -248 144 184 -80 72 40 +240 144 184 +216 96 160 +0 0 0 +104 80 56 224 192 120 -0 152 176 -232 232 232 -192 112 144 -120 120 120 -184 184 184 +48 176 176 +120 216 208 +248 248 248 +152 136 128 +192 184 184 88 80 80 -32 32 32 diff --git a/graphics/pokemon/vivillon/meadow/shiny.pal b/graphics/pokemon/vivillon/meadow/shiny.pal index 62a4b7f9d0..2df596d4ce 100644 --- a/graphics/pokemon/vivillon/meadow/shiny.pal +++ b/graphics/pokemon/vivillon/meadow/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -120 168 144 -0 0 0 -64 56 56 -144 40 72 -184 72 120 +152 208 160 +48 48 40 88 80 80 -248 160 192 -80 72 40 +144 24 80 +184 56 112 +224 128 168 +184 104 136 +0 0 0 +96 88 48 224 192 120 -0 152 176 -232 232 232 -208 120 152 -192 184 176 +8 160 192 +120 224 248 248 248 248 +192 184 176 +232 232 232 144 136 136 -112 112 112 diff --git a/graphics/pokemon/vivillon/modern/anim_front.png b/graphics/pokemon/vivillon/modern/anim_front.png new file mode 100644 index 0000000000..43cda25e59 Binary files /dev/null and b/graphics/pokemon/vivillon/modern/anim_front.png differ diff --git a/graphics/pokemon/vivillon/modern/back.png b/graphics/pokemon/vivillon/modern/back.png index 5a02d2eb25..a1d309446d 100644 Binary files a/graphics/pokemon/vivillon/modern/back.png and b/graphics/pokemon/vivillon/modern/back.png differ diff --git a/graphics/pokemon/vivillon/modern/front.png b/graphics/pokemon/vivillon/modern/front.png index ebaedf86dc..2bf593a485 100644 Binary files a/graphics/pokemon/vivillon/modern/front.png and b/graphics/pokemon/vivillon/modern/front.png differ diff --git a/graphics/pokemon/vivillon/modern/normal.pal b/graphics/pokemon/vivillon/modern/normal.pal index c4806aaade..9cb55dd6e8 100644 --- a/graphics/pokemon/vivillon/modern/normal.pal +++ b/graphics/pokemon/vivillon/modern/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -186 31 43 -253 253 253 -51 161 219 +152 208 160 +48 40 40 88 80 80 -80 72 40 +176 160 184 +232 232 240 +48 160 216 +184 32 40 +0 0 0 +248 8 48 +248 248 0 +104 80 56 224 192 120 -255 9 46 -255 225 0 -127 127 127 -188 188 188 -196 113 148 -191 57 117 -158 31 67 +152 136 128 +192 184 184 +88 80 80 +248 248 240 diff --git a/graphics/pokemon/vivillon/modern/shiny.pal b/graphics/pokemon/vivillon/modern/shiny.pal index 9443f2d47c..166ba8f527 100644 --- a/graphics/pokemon/vivillon/modern/shiny.pal +++ b/graphics/pokemon/vivillon/modern/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -186 31 43 -253 253 253 -51 161 219 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +168 160 160 +232 232 248 +48 160 216 +184 32 40 +0 0 0 +248 8 48 +248 248 0 +96 88 48 224 192 120 -255 9 46 -255 225 0 -196 189 182 -252 252 252 -196 113 148 -191 57 117 -150 45 74 +192 184 176 +232 232 232 +144 136 136 +248 248 248 diff --git a/graphics/pokemon/vivillon/monsoon/anim_front.png b/graphics/pokemon/vivillon/monsoon/anim_front.png new file mode 100644 index 0000000000..c71d849936 Binary files /dev/null and b/graphics/pokemon/vivillon/monsoon/anim_front.png differ diff --git a/graphics/pokemon/vivillon/monsoon/back.png b/graphics/pokemon/vivillon/monsoon/back.png index db342c6467..e89b96057c 100644 Binary files a/graphics/pokemon/vivillon/monsoon/back.png and b/graphics/pokemon/vivillon/monsoon/back.png differ diff --git a/graphics/pokemon/vivillon/monsoon/front.png b/graphics/pokemon/vivillon/monsoon/front.png index 5feb3d097c..5dc6429009 100644 Binary files a/graphics/pokemon/vivillon/monsoon/front.png and b/graphics/pokemon/vivillon/monsoon/front.png differ diff --git a/graphics/pokemon/vivillon/monsoon/normal.pal b/graphics/pokemon/vivillon/monsoon/normal.pal index 0d815b8ce8..3436738453 100644 --- a/graphics/pokemon/vivillon/monsoon/normal.pal +++ b/graphics/pokemon/vivillon/monsoon/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -100 99 112 -245 245 245 +152 208 160 +48 40 40 88 80 80 -80 72 40 +168 160 160 +248 248 248 +0 0 0 +144 144 152 +96 88 48 224 192 120 -56 56 56 -97 219 233 -71 85 165 -127 127 127 -206 205 209 -188 188 188 -196 113 148 -191 57 117 +64 176 232 +56 72 160 +192 192 200 +152 136 128 +192 184 184 +184 24 80 +104 112 176 diff --git a/graphics/pokemon/vivillon/monsoon/shiny.pal b/graphics/pokemon/vivillon/monsoon/shiny.pal index be00a911c9..6836022b33 100644 --- a/graphics/pokemon/vivillon/monsoon/shiny.pal +++ b/graphics/pokemon/vivillon/monsoon/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -100 99 112 -245 245 245 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +168 160 160 +224 224 248 +0 0 0 +136 136 152 +96 88 48 224 192 120 -56 56 56 -97 219 233 -71 85 165 -196 189 182 -206 205 209 -252 252 252 -196 113 148 -191 57 117 +104 168 224 +80 72 152 +192 192 224 +192 184 176 +232 232 232 +144 24 80 +104 112 176 diff --git a/graphics/pokemon/vivillon/normal.pal b/graphics/pokemon/vivillon/normal.pal index 71bae3521b..ff76adcc7e 100644 --- a/graphics/pokemon/vivillon/normal.pal +++ b/graphics/pokemon/vivillon/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -125 129 114 -252 252 252 -209 204 203 +152 208 160 +48 40 40 88 80 80 -80 72 40 +192 192 208 +248 248 248 +208 216 224 +136 152 160 +0 0 0 +96 88 48 224 192 120 -225 225 225 -127 127 127 -179 171 170 -188 188 188 -196 113 148 -191 57 117 -119 109 104 +120 120 120 +152 136 128 +8 8 8 +192 184 184 +184 24 80 +104 80 56 diff --git a/graphics/pokemon/vivillon/ocean/anim_front.png b/graphics/pokemon/vivillon/ocean/anim_front.png new file mode 100644 index 0000000000..d0cfcc35be Binary files /dev/null and b/graphics/pokemon/vivillon/ocean/anim_front.png differ diff --git a/graphics/pokemon/vivillon/ocean/back.png b/graphics/pokemon/vivillon/ocean/back.png index 0eabb12f85..bcf68c4ba7 100644 Binary files a/graphics/pokemon/vivillon/ocean/back.png and b/graphics/pokemon/vivillon/ocean/back.png differ diff --git a/graphics/pokemon/vivillon/ocean/front.png b/graphics/pokemon/vivillon/ocean/front.png index abbaf935a3..fcdcf11a7b 100644 Binary files a/graphics/pokemon/vivillon/ocean/front.png and b/graphics/pokemon/vivillon/ocean/front.png differ diff --git a/graphics/pokemon/vivillon/ocean/normal.pal b/graphics/pokemon/vivillon/ocean/normal.pal index a1029fc21a..7fdbf77c7b 100644 --- a/graphics/pokemon/vivillon/ocean/normal.pal +++ b/graphics/pokemon/vivillon/ocean/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -80 72 40 -239 63 37 -239 137 63 -255 244 98 +152 208 160 +48 40 40 88 80 80 +152 40 0 +240 64 40 +240 144 72 224 192 120 -127 127 127 -99 188 235 -188 188 188 -196 113 148 -191 57 117 -36 136 179 +240 232 104 0 0 0 +152 136 128 +96 192 232 +72 160 224 +248 248 248 +192 184 184 +32 136 176 +88 80 80 diff --git a/graphics/pokemon/vivillon/ocean/shiny.pal b/graphics/pokemon/vivillon/ocean/shiny.pal index 8fc0750455..25d3ad1484 100644 --- a/graphics/pokemon/vivillon/ocean/shiny.pal +++ b/graphics/pokemon/vivillon/ocean/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -80 72 40 -239 63 37 -239 137 63 -255 244 98 -145 140 140 +152 208 160 +48 48 40 +88 80 80 +160 32 24 +224 56 48 +240 136 64 224 192 120 -196 189 182 -99 188 235 -252 252 252 -196 113 148 -191 57 117 -36 136 179 +232 232 128 0 0 0 +192 184 176 +120 184 224 +96 144 176 +248 248 248 +232 232 232 +48 96 136 +144 136 136 diff --git a/graphics/pokemon/vivillon/poke_ball/anim_front.png b/graphics/pokemon/vivillon/poke_ball/anim_front.png new file mode 100644 index 0000000000..4fca83e978 Binary files /dev/null and b/graphics/pokemon/vivillon/poke_ball/anim_front.png differ diff --git a/graphics/pokemon/vivillon/poke_ball/back.png b/graphics/pokemon/vivillon/poke_ball/back.png index 521336e477..eae833dcf1 100644 Binary files a/graphics/pokemon/vivillon/poke_ball/back.png and b/graphics/pokemon/vivillon/poke_ball/back.png differ diff --git a/graphics/pokemon/vivillon/poke_ball/front.png b/graphics/pokemon/vivillon/poke_ball/front.png index 99f826faf1..c474cf54c2 100644 Binary files a/graphics/pokemon/vivillon/poke_ball/front.png and b/graphics/pokemon/vivillon/poke_ball/front.png differ diff --git a/graphics/pokemon/vivillon/poke_ball/normal.pal b/graphics/pokemon/vivillon/poke_ball/normal.pal index dbb6a64a16..fc8cca6b0a 100644 --- a/graphics/pokemon/vivillon/poke_ball/normal.pal +++ b/graphics/pokemon/vivillon/poke_ball/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -96 34 54 -157 20 9 -199 55 58 +0 168 248 +48 48 40 88 80 80 -80 72 40 +96 32 56 +160 24 8 +200 56 56 +0 0 0 +104 80 56 224 192 120 -219 115 107 -251 251 251 -127 127 127 -188 188 188 -196 113 148 -191 57 117 -205 207 206 +216 112 104 +248 248 248 +152 152 152 +152 136 128 +216 208 208 +192 184 184 +48 40 40 diff --git a/graphics/pokemon/vivillon/poke_ball/shiny.pal b/graphics/pokemon/vivillon/poke_ball/shiny.pal index 059288f3e6..e9428b604d 100644 --- a/graphics/pokemon/vivillon/poke_ball/shiny.pal +++ b/graphics/pokemon/vivillon/poke_ball/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -96 34 54 -157 20 9 -199 55 58 -145 140 140 -80 72 40 +0 168 248 +48 48 40 +88 80 80 +88 8 16 +104 32 16 +176 40 32 +0 0 0 +104 80 56 224 192 120 -219 115 107 -251 251 251 -196 189 182 -252 252 252 -196 113 148 -191 57 117 -205 207 206 +216 80 64 +248 248 248 +152 144 144 +192 184 176 +216 208 208 +232 232 232 +48 40 40 diff --git a/graphics/pokemon/vivillon/polar/anim_front.png b/graphics/pokemon/vivillon/polar/anim_front.png new file mode 100644 index 0000000000..d6c1c1a50d Binary files /dev/null and b/graphics/pokemon/vivillon/polar/anim_front.png differ diff --git a/graphics/pokemon/vivillon/polar/back.png b/graphics/pokemon/vivillon/polar/back.png index 045def3b83..b0b7bd93ef 100644 Binary files a/graphics/pokemon/vivillon/polar/back.png and b/graphics/pokemon/vivillon/polar/back.png differ diff --git a/graphics/pokemon/vivillon/polar/front.png b/graphics/pokemon/vivillon/polar/front.png index 560f77acf9..2f182203e7 100644 Binary files a/graphics/pokemon/vivillon/polar/front.png and b/graphics/pokemon/vivillon/polar/front.png differ diff --git a/graphics/pokemon/vivillon/polar/normal.pal b/graphics/pokemon/vivillon/polar/normal.pal index 4c3b5694b3..29f0fd3327 100644 --- a/graphics/pokemon/vivillon/polar/normal.pal +++ b/graphics/pokemon/vivillon/polar/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -7 16 76 -11 87 202 -251 251 251 +152 208 160 +48 40 40 88 80 80 -80 72 40 +24 56 144 +16 88 200 +184 192 192 +0 0 0 +248 248 248 +48 80 184 +104 80 56 224 192 120 -22 56 148 -127 127 127 -189 190 193 -188 188 188 -196 113 148 -191 57 117 -124 152 203 +120 152 200 +152 136 128 +8 8 8 +168 16 48 +192 184 184 diff --git a/graphics/pokemon/vivillon/polar/shiny.pal b/graphics/pokemon/vivillon/polar/shiny.pal index da092f7bba..8c59a0c604 100644 --- a/graphics/pokemon/vivillon/polar/shiny.pal +++ b/graphics/pokemon/vivillon/polar/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -7 16 76 -11 87 202 -251 251 251 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +48 40 112 +64 48 144 +184 184 184 +0 0 0 +248 248 248 +48 80 184 +96 88 48 224 192 120 -22 56 148 -196 189 182 -189 190 193 -252 252 252 -196 113 148 -191 57 117 -124 152 203 +96 120 208 +192 184 176 +8 8 8 +168 16 48 +232 232 232 diff --git a/graphics/pokemon/vivillon/river/anim_front.png b/graphics/pokemon/vivillon/river/anim_front.png new file mode 100644 index 0000000000..e0544c089d Binary files /dev/null and b/graphics/pokemon/vivillon/river/anim_front.png differ diff --git a/graphics/pokemon/vivillon/river/back.png b/graphics/pokemon/vivillon/river/back.png index fb65dd0383..01e70a38fe 100644 Binary files a/graphics/pokemon/vivillon/river/back.png and b/graphics/pokemon/vivillon/river/back.png differ diff --git a/graphics/pokemon/vivillon/river/front.png b/graphics/pokemon/vivillon/river/front.png index 4de5b11de4..18cf0efd27 100644 Binary files a/graphics/pokemon/vivillon/river/front.png and b/graphics/pokemon/vivillon/river/front.png differ diff --git a/graphics/pokemon/vivillon/river/normal.pal b/graphics/pokemon/vivillon/river/normal.pal index bf2b4c3215..e143ce0ecf 100644 --- a/graphics/pokemon/vivillon/river/normal.pal +++ b/graphics/pokemon/vivillon/river/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -80 72 40 -199 118 7 -53 69 31 +152 208 160 +48 48 40 88 80 80 +200 120 8 +240 160 48 +0 0 0 224 192 120 -119 103 11 -127 127 127 -188 188 188 -196 113 148 -191 57 117 -7 106 205 -0 75 113 -107 186 194 +120 104 8 +152 136 128 +8 8 8 +248 248 248 +192 184 184 +144 16 64 +8 104 200 +104 184 192 +0 76 112 diff --git a/graphics/pokemon/vivillon/river/shiny.pal b/graphics/pokemon/vivillon/river/shiny.pal index dc5165d33a..44bbdfff42 100644 --- a/graphics/pokemon/vivillon/river/shiny.pal +++ b/graphics/pokemon/vivillon/river/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -80 72 40 -199 118 7 -53 69 31 -145 140 140 +152 208 160 +48 48 40 +88 80 80 +200 120 8 +240 160 48 +0 0 0 224 192 120 -119 103 11 -196 189 182 -252 252 252 -196 113 148 -191 57 117 -7 106 205 -0 75 113 -107 186 194 +120 112 32 +192 184 176 +8 8 8 +248 248 248 +232 232 232 +144 24 80 +8 104 200 +104 184 192 +0 76 112 diff --git a/graphics/pokemon/vivillon/sandstorm/anim_front.png b/graphics/pokemon/vivillon/sandstorm/anim_front.png new file mode 100644 index 0000000000..71ce2181cc Binary files /dev/null and b/graphics/pokemon/vivillon/sandstorm/anim_front.png differ diff --git a/graphics/pokemon/vivillon/sandstorm/back.png b/graphics/pokemon/vivillon/sandstorm/back.png index 53163d7a23..8ea7993625 100644 Binary files a/graphics/pokemon/vivillon/sandstorm/back.png and b/graphics/pokemon/vivillon/sandstorm/back.png differ diff --git a/graphics/pokemon/vivillon/sandstorm/front.png b/graphics/pokemon/vivillon/sandstorm/front.png index a672d05ba2..7c9158050a 100644 Binary files a/graphics/pokemon/vivillon/sandstorm/front.png and b/graphics/pokemon/vivillon/sandstorm/front.png differ diff --git a/graphics/pokemon/vivillon/sandstorm/normal.pal b/graphics/pokemon/vivillon/sandstorm/normal.pal index 99315cc81d..2c04875261 100644 --- a/graphics/pokemon/vivillon/sandstorm/normal.pal +++ b/graphics/pokemon/vivillon/sandstorm/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -101 77 31 -216 191 124 +152 208 160 +48 48 40 88 80 80 -80 72 40 -224 192 120 -142 124 58 -177 148 103 -127 127 127 -188 188 188 -196 113 148 -191 57 117 -188 106 71 +192 152 96 +232 200 128 +96 88 56 0 0 0 +168 112 80 +224 192 120 +160 152 64 +152 136 128 +8 8 8 +248 248 248 +192 184 184 +144 24 80 +152 144 104 diff --git a/graphics/pokemon/vivillon/sandstorm/shiny.pal b/graphics/pokemon/vivillon/sandstorm/shiny.pal index b76f3d74bc..4ef39f10bd 100644 --- a/graphics/pokemon/vivillon/sandstorm/shiny.pal +++ b/graphics/pokemon/vivillon/sandstorm/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -101 77 31 -216 191 124 -145 140 140 -80 72 40 -224 192 120 -142 124 58 -177 148 103 -196 189 182 -252 252 252 -196 113 148 -191 57 117 -188 106 71 +152 208 160 +48 48 40 +88 80 80 +184 160 88 +224 200 104 +104 96 48 0 0 0 +168 120 80 +224 192 120 +160 152 64 +192 184 176 +8 8 8 +248 248 248 +232 232 232 +144 24 80 +152 144 104 diff --git a/graphics/pokemon/vivillon/savanna/anim_front.png b/graphics/pokemon/vivillon/savanna/anim_front.png new file mode 100644 index 0000000000..86090c1c39 Binary files /dev/null and b/graphics/pokemon/vivillon/savanna/anim_front.png differ diff --git a/graphics/pokemon/vivillon/savanna/back.png b/graphics/pokemon/vivillon/savanna/back.png index 9ef1fcf98a..fd46e21110 100644 Binary files a/graphics/pokemon/vivillon/savanna/back.png and b/graphics/pokemon/vivillon/savanna/back.png differ diff --git a/graphics/pokemon/vivillon/savanna/front.png b/graphics/pokemon/vivillon/savanna/front.png index 4023a2c94c..dab3efbec9 100644 Binary files a/graphics/pokemon/vivillon/savanna/front.png and b/graphics/pokemon/vivillon/savanna/front.png differ diff --git a/graphics/pokemon/vivillon/savanna/normal.pal b/graphics/pokemon/vivillon/savanna/normal.pal index 8853a6def2..2a367c7c0a 100644 --- a/graphics/pokemon/vivillon/savanna/normal.pal +++ b/graphics/pokemon/vivillon/savanna/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -12 95 101 -4 106 189 -250 217 33 -35 184 188 +152 208 160 +48 40 40 88 80 80 -80 72 40 -224 192 120 -35 143 152 -127 127 127 -188 188 188 -196 113 148 -191 57 117 +0 104 192 +32 184 184 +48 104 96 +248 232 96 +200 176 56 +32 144 152 0 0 0 +104 80 56 +224 192 120 +152 136 128 +248 248 248 +192 184 184 +184 24 80 diff --git a/graphics/pokemon/vivillon/savanna/shiny.pal b/graphics/pokemon/vivillon/savanna/shiny.pal index 9a306d3481..f04cdca39e 100644 --- a/graphics/pokemon/vivillon/savanna/shiny.pal +++ b/graphics/pokemon/vivillon/savanna/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -12 95 101 -4 106 189 -250 217 33 -35 184 188 -145 140 140 -80 72 40 -224 192 120 -35 143 152 -196 189 182 -252 252 252 -196 113 148 -191 57 117 +152 208 160 +48 48 40 +88 80 80 +48 64 152 +104 176 160 +56 104 80 +240 240 72 +152 192 80 +80 144 112 0 0 0 +96 88 48 +224 192 120 +192 184 176 +248 248 248 +232 232 232 +144 24 80 diff --git a/graphics/pokemon/vivillon/shiny.pal b/graphics/pokemon/vivillon/shiny.pal index 308ee3940e..534f237b8d 100644 --- a/graphics/pokemon/vivillon/shiny.pal +++ b/graphics/pokemon/vivillon/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -125 129 114 -250 250 250 -209 204 203 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +200 208 208 +248 248 248 +224 232 224 +152 168 160 +0 0 0 +96 88 48 224 192 120 -252 252 252 -225 225 225 -196 189 182 -179 171 170 -196 113 148 -191 57 117 -119 109 104 +128 128 128 +192 184 176 +8 8 8 +232 232 232 +144 24 80 +104 80 56 diff --git a/graphics/pokemon/vivillon/sun/anim_front.png b/graphics/pokemon/vivillon/sun/anim_front.png new file mode 100644 index 0000000000..be28b3b4c3 Binary files /dev/null and b/graphics/pokemon/vivillon/sun/anim_front.png differ diff --git a/graphics/pokemon/vivillon/sun/back.png b/graphics/pokemon/vivillon/sun/back.png index c0b81c2aaa..7e5acd4ad0 100644 Binary files a/graphics/pokemon/vivillon/sun/back.png and b/graphics/pokemon/vivillon/sun/back.png differ diff --git a/graphics/pokemon/vivillon/sun/front.png b/graphics/pokemon/vivillon/sun/front.png index c8a984227e..532b4a0191 100644 Binary files a/graphics/pokemon/vivillon/sun/front.png and b/graphics/pokemon/vivillon/sun/front.png differ diff --git a/graphics/pokemon/vivillon/sun/normal.pal b/graphics/pokemon/vivillon/sun/normal.pal index 4a6dd3b8b9..7e80840a16 100644 --- a/graphics/pokemon/vivillon/sun/normal.pal +++ b/graphics/pokemon/vivillon/sun/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -179 63 13 -243 143 52 -231 50 96 +152 208 160 +48 40 40 88 80 80 -80 72 40 +136 32 40 +232 72 96 +240 128 48 +0 0 0 +240 232 72 +104 80 56 224 192 120 -242 219 55 -225 85 26 -179 32 69 -127 127 127 -188 188 188 -196 113 148 -191 57 117 +152 136 128 +8 8 8 +184 40 72 +248 248 248 +192 184 184 +144 24 80 diff --git a/graphics/pokemon/vivillon/sun/shiny.pal b/graphics/pokemon/vivillon/sun/shiny.pal index 89fa3b0227..9cafe74e29 100644 --- a/graphics/pokemon/vivillon/sun/shiny.pal +++ b/graphics/pokemon/vivillon/sun/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -179 63 13 -243 143 52 -231 50 96 -145 140 140 -80 72 40 +152 208 160 +48 48 40 +88 80 80 +136 32 56 +208 64 96 +240 136 64 +0 0 0 +232 232 72 +96 88 48 224 192 120 -242 219 55 -225 85 26 -179 32 69 -196 189 182 -252 252 252 -196 113 148 -191 57 117 +192 184 176 +8 8 8 +168 56 80 +248 248 248 +232 232 232 +144 24 80 diff --git a/graphics/pokemon/vivillon/tundra/anim_front.png b/graphics/pokemon/vivillon/tundra/anim_front.png new file mode 100644 index 0000000000..fe7d7739cf Binary files /dev/null and b/graphics/pokemon/vivillon/tundra/anim_front.png differ diff --git a/graphics/pokemon/vivillon/tundra/back.png b/graphics/pokemon/vivillon/tundra/back.png index c169392b3e..b95140c11b 100644 Binary files a/graphics/pokemon/vivillon/tundra/back.png and b/graphics/pokemon/vivillon/tundra/back.png differ diff --git a/graphics/pokemon/vivillon/tundra/front.png b/graphics/pokemon/vivillon/tundra/front.png index ad040d80ed..36239fbe94 100644 Binary files a/graphics/pokemon/vivillon/tundra/front.png and b/graphics/pokemon/vivillon/tundra/front.png differ diff --git a/graphics/pokemon/vivillon/tundra/normal.pal b/graphics/pokemon/vivillon/tundra/normal.pal index a83d1c357b..e23661e2db 100644 --- a/graphics/pokemon/vivillon/tundra/normal.pal +++ b/graphics/pokemon/vivillon/tundra/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -32 32 32 -50 90 135 -162 209 232 -248 248 248 +152 208 160 +48 48 40 88 80 80 -80 72 40 -224 192 120 -116 171 211 -127 127 127 -188 188 188 -196 113 148 -191 57 117 -63 114 171 +64 104 152 +72 128 176 +168 216 240 +248 248 248 0 0 0 +104 80 56 +224 192 120 +224 208 216 +152 136 128 +8 8 8 +120 176 200 +144 16 64 +192 184 184 diff --git a/graphics/pokemon/vivillon/tundra/shiny.pal b/graphics/pokemon/vivillon/tundra/shiny.pal index e75ae64ef2..c4925e41af 100644 --- a/graphics/pokemon/vivillon/tundra/shiny.pal +++ b/graphics/pokemon/vivillon/tundra/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -121 169 145 -16 16 16 -66 58 58 -50 90 135 -162 209 232 +152 208 160 +48 48 40 +88 80 80 +64 96 200 +96 152 232 +176 216 248 248 248 248 -145 140 140 -80 72 40 -224 192 120 -116 171 211 -196 189 182 -252 252 252 -196 113 148 -191 57 117 -63 114 171 0 0 0 +96 88 48 +224 192 120 +208 232 248 +192 184 176 +8 8 8 +136 184 248 +144 16 64 +232 232 232 diff --git a/graphics/pokemon/volcanion/anim_front.png b/graphics/pokemon/volcanion/anim_front.png new file mode 100644 index 0000000000..af2f7e37f8 Binary files /dev/null and b/graphics/pokemon/volcanion/anim_front.png differ diff --git a/graphics/pokemon/volcanion/back.png b/graphics/pokemon/volcanion/back.png index c65b707d4d..21a33f9c6d 100644 Binary files a/graphics/pokemon/volcanion/back.png and b/graphics/pokemon/volcanion/back.png differ diff --git a/graphics/pokemon/volcanion/footprint.png b/graphics/pokemon/volcanion/footprint.png new file mode 100644 index 0000000000..3ad8671163 Binary files /dev/null and b/graphics/pokemon/volcanion/footprint.png differ diff --git a/graphics/pokemon/volcanion/front.png b/graphics/pokemon/volcanion/front.png index 7344442ca3..2a35f607d3 100644 Binary files a/graphics/pokemon/volcanion/front.png and b/graphics/pokemon/volcanion/front.png differ diff --git a/graphics/pokemon/volcanion/normal.pal b/graphics/pokemon/volcanion/normal.pal index 7738d6b8e2..5958f3e683 100644 --- a/graphics/pokemon/volcanion/normal.pal +++ b/graphics/pokemon/volcanion/normal.pal @@ -7,7 +7,7 @@ JASC-PAL 248 208 96 168 56 56 224 80 80 -184 136 40 +128 96 24 56 136 152 16 16 16 56 248 248 @@ -16,4 +16,4 @@ JASC-PAL 192 136 48 248 168 64 184 112 40 -200 200 208 +248 248 248 diff --git a/graphics/pokemon/volcanion/shiny.pal b/graphics/pokemon/volcanion/shiny.pal index 27e1cd3d92..fe3c63ee75 100644 --- a/graphics/pokemon/volcanion/shiny.pal +++ b/graphics/pokemon/volcanion/shiny.pal @@ -2,12 +2,12 @@ JASC-PAL 0100 16 152 208 160 -136 24 104 +136 72 24 96 96 32 248 96 192 168 168 56 224 224 80 -168 72 128 +136 24 104 56 136 152 16 16 16 56 248 248 @@ -16,4 +16,4 @@ JASC-PAL 168 72 128 248 168 64 184 112 40 -200 200 208 +248 248 248 diff --git a/graphics/pokemon/volcarona/anim_front.png b/graphics/pokemon/volcarona/anim_front.png new file mode 100644 index 0000000000..9475a4064d Binary files /dev/null and b/graphics/pokemon/volcarona/anim_front.png differ diff --git a/graphics/pokemon/xerneas/active/anim_front.png b/graphics/pokemon/xerneas/active/anim_front.png new file mode 100644 index 0000000000..aef6378170 Binary files /dev/null and b/graphics/pokemon/xerneas/active/anim_front.png differ diff --git a/graphics/pokemon/xerneas/active/front.png b/graphics/pokemon/xerneas/active/front.png index 14f6dc1091..b291e10f4f 100644 Binary files a/graphics/pokemon/xerneas/active/front.png and b/graphics/pokemon/xerneas/active/front.png differ diff --git a/graphics/pokemon/xerneas/active/normal.pal b/graphics/pokemon/xerneas/active/normal.pal index 2ae0f78631..57086e6518 100644 --- a/graphics/pokemon/xerneas/active/normal.pal +++ b/graphics/pokemon/xerneas/active/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -25 25 25 +152 208 168 +0 0 0 64 64 64 -38 38 38 -128 118 89 -91 139 228 -204 189 143 -255 236 178 -54 50 98 -68 90 161 -119 79 79 -239 159 79 -255 85 85 -159 95 191 -0 162 232 -255 255 34 +40 40 40 +128 120 88 +88 136 224 +200 184 144 +248 232 176 +56 48 96 +64 88 160 +120 80 80 +240 160 80 +248 80 80 +160 96 192 +0 160 232 +248 248 32 diff --git a/graphics/pokemon/xerneas/footprint.png b/graphics/pokemon/xerneas/footprint.png new file mode 100644 index 0000000000..d66c012562 Binary files /dev/null and b/graphics/pokemon/xerneas/footprint.png differ diff --git a/graphics/pokemon/yveltal/anim_front.png b/graphics/pokemon/yveltal/anim_front.png new file mode 100644 index 0000000000..cf09975e12 Binary files /dev/null and b/graphics/pokemon/yveltal/anim_front.png differ diff --git a/graphics/pokemon/yveltal/footprint.png b/graphics/pokemon/yveltal/footprint.png new file mode 100644 index 0000000000..0f8d4fd8b1 Binary files /dev/null and b/graphics/pokemon/yveltal/footprint.png differ diff --git a/graphics/pokemon/zapdos/galarian/icon.png b/graphics/pokemon/zapdos/galarian/icon.png new file mode 100644 index 0000000000..df9bb29b5c Binary files /dev/null and b/graphics/pokemon/zapdos/galarian/icon.png differ diff --git a/graphics/pokemon/zarude/dada/icon.png b/graphics/pokemon/zarude/dada/icon.png new file mode 100644 index 0000000000..e3a39e36d4 Binary files /dev/null and b/graphics/pokemon/zarude/dada/icon.png differ diff --git a/graphics/pokemon/zarude/icon.png b/graphics/pokemon/zarude/icon.png new file mode 100644 index 0000000000..58dfa077b4 Binary files /dev/null and b/graphics/pokemon/zarude/icon.png differ diff --git a/graphics/pokemon/zoroark/anim_front.png b/graphics/pokemon/zoroark/anim_front.png new file mode 100644 index 0000000000..4ab1b07696 Binary files /dev/null and b/graphics/pokemon/zoroark/anim_front.png differ diff --git a/graphics/pokemon/zorua/anim_front.png b/graphics/pokemon/zorua/anim_front.png new file mode 100644 index 0000000000..6b16f5c234 Binary files /dev/null and b/graphics/pokemon/zorua/anim_front.png differ diff --git a/graphics/pokemon/zygarde/10_percent/anim_front.png b/graphics/pokemon/zygarde/10_percent/anim_front.png new file mode 100644 index 0000000000..88643c991c Binary files /dev/null and b/graphics/pokemon/zygarde/10_percent/anim_front.png differ diff --git a/graphics/pokemon/zygarde/anim_front.png b/graphics/pokemon/zygarde/anim_front.png new file mode 100644 index 0000000000..bfcf3c32e8 Binary files /dev/null and b/graphics/pokemon/zygarde/anim_front.png differ diff --git a/graphics/pokemon/zygarde/complete/anim_front.png b/graphics/pokemon/zygarde/complete/anim_front.png new file mode 100644 index 0000000000..a1a81bad6d Binary files /dev/null and b/graphics/pokemon/zygarde/complete/anim_front.png differ diff --git a/graphics/pokemon/zygarde/complete/normal.pal b/graphics/pokemon/zygarde/complete/normal.pal index b811fe953d..f9aca87fbd 100644 --- a/graphics/pokemon/zygarde/complete/normal.pal +++ b/graphics/pokemon/zygarde/complete/normal.pal @@ -5,7 +5,7 @@ JASC-PAL 32 24 16 80 64 72 56 48 40 -16 16 16 +0 0 0 168 200 72 184 184 136 248 248 248 diff --git a/graphics/pokemon/zygarde/footprint.png b/graphics/pokemon/zygarde/footprint.png new file mode 100644 index 0000000000..36541a36f5 Binary files /dev/null and b/graphics/pokemon/zygarde/footprint.png differ diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index fc01562d75..a5197a1f2a 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -388,6 +388,15 @@ #define EVO_MODE_ITEM_USE 2 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +// Form change types +#define FORM_CHANGE_END 0 +#define FORM_ITEM_HOLD 1 +#define FORM_ITEM_USE 2 +#define FORM_MOVE 3 +#define FORM_WITHDRAW 4 +#define FORM_ITEM_HOLD_ABILITY 5 +#define FORM_ITEM_USE_TIME 6 + #define NUM_MALE_LINK_FACILITY_CLASSES 8 #define NUM_FEMALE_LINK_FACILITY_CLASSES 8 diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index a14ac688a9..6d45eb9be8 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -16,6 +16,7 @@ #define P_UPDATED_STATS GEN_8 // Since Gen 6, Pokémon stats are updated with each passing generation. #define P_UPDATED_ABILITIES GEN_8 // Since Gen 6, certain Pokémon have their abilities changed. Requires BATTLE_ENGINE for Gen4+ abilities. #define P_UPDATED_EGG_GROUPS GEN_8 // Since Gen 8, certain Pokémon have gained new egg groups. +#define P_SHEDINJA_BALL GEN_8 // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball. #ifndef ITEM_EXPANSION //Item Definitions for gEvolutionTable @@ -95,6 +96,78 @@ #define ITEM_RAZOR_FANG ITEM_NONE #define ITEM_RAZOR_CLAW ITEM_NONE #define ITEM_OVAL_STONE ITEM_NONE -#endif + +//FORM_ITEM_HOLD +#define ITEM_GRISEOUS_ORB ITEM_NONE +#define ITEM_DRACO_PLATE ITEM_NONE +#define ITEM_DREAD_PLATE ITEM_NONE +#define ITEM_EARTH_PLATE ITEM_NONE +#define ITEM_FIST_PLATE ITEM_NONE +#define ITEM_FLAME_PLATE ITEM_NONE +#define ITEM_ICICLE_PLATE ITEM_NONE +#define ITEM_INSECT_PLATE ITEM_NONE +#define ITEM_IRON_PLATE ITEM_NONE +#define ITEM_MEADOW_PLATE ITEM_NONE +#define ITEM_MIND_PLATE ITEM_NONE +#define ITEM_PIXIE_PLATE ITEM_NONE +#define ITEM_SKY_PLATE ITEM_NONE +#define ITEM_SPLASH_PLATE ITEM_NONE +#define ITEM_SPOOKY_PLATE ITEM_NONE +#define ITEM_STONE_PLATE ITEM_NONE +#define ITEM_TOXIC_PLATE ITEM_NONE +#define ITEM_ZAP_PLATE ITEM_NONE +#define ITEM_FIGHTINIUM_Z ITEM_NONE +#define ITEM_FLYINIUM_Z ITEM_NONE +#define ITEM_POISONIUM_Z ITEM_NONE +#define ITEM_GROUNDIUM_Z ITEM_NONE +#define ITEM_ROCKIUM_Z ITEM_NONE +#define ITEM_BUGINIUM_Z ITEM_NONE +#define ITEM_GHOSTIUM_Z ITEM_NONE +#define ITEM_STEELIUM_Z ITEM_NONE +#define ITEM_FIRIUM_Z ITEM_NONE +#define ITEM_WATERIUM_Z ITEM_NONE +#define ITEM_GRASSIUM_Z ITEM_NONE +#define ITEM_ELECTRIUM_Z ITEM_NONE +#define ITEM_PSYCHIUM_Z ITEM_NONE +#define ITEM_ICIUM_Z ITEM_NONE +#define ITEM_DRAGONIUM_Z ITEM_NONE +#define ITEM_DARKINIUM_Z ITEM_NONE +#define ITEM_FAIRIUM_Z ITEM_NONE +#define ITEM_DOUSE_DRIVE ITEM_NONE +#define ITEM_SHOCK_DRIVE ITEM_NONE +#define ITEM_BURN_DRIVE ITEM_NONE +#define ITEM_CHILL_DRIVE ITEM_NONE +#define ITEM_BUG_MEMORY ITEM_NONE +#define ITEM_DARK_MEMORY ITEM_NONE +#define ITEM_DRAGON_MEMORY ITEM_NONE +#define ITEM_ELECTRIC_MEMORY ITEM_NONE +#define ITEM_FAIRY_MEMORY ITEM_NONE +#define ITEM_FIGHTING_MEMORY ITEM_NONE +#define ITEM_FIRE_MEMORY ITEM_NONE +#define ITEM_FLYING_MEMORY ITEM_NONE +#define ITEM_GHOST_MEMORY ITEM_NONE +#define ITEM_GRASS_MEMORY ITEM_NONE +#define ITEM_GROUND_MEMORY ITEM_NONE +#define ITEM_ICE_MEMORY ITEM_NONE +#define ITEM_POISON_MEMORY ITEM_NONE +#define ITEM_PSYCHIC_MEMORY ITEM_NONE +#define ITEM_ROCK_MEMORY ITEM_NONE +#define ITEM_STEEL_MEMORY ITEM_NONE +#define ITEM_WATER_MEMORY ITEM_NONE + +//FORM_ITEM_USE +#define ITEM_GRACIDEA ITEM_NONE +// #define ITEM_REVEAL_GLASS ITEM_NONE +// #define ITEM_PRISON_BOTTLE ITEM_NONE +#define ITEM_RED_NECTAR ITEM_NONE +#define ITEM_YELLOW_NECTAR ITEM_NONE +#define ITEM_PINK_NECTAR ITEM_NONE +#define ITEM_PURPLE_NECTAR ITEM_NONE +#endif // ITEM_EXPANSION + +#ifndef BATTLE_ENGINE +#define ABILITY_MULTITYPE ABILITY_NONE +#define ABILITY_RKS_SYSTEM ABILITY_NONE +#endif // BATTLE_ENGINE #endif // GUARD_CONSTANTS_POKEMON_CONFIG_H diff --git a/include/decompress.h b/include/decompress.h index bddbe96ac6..81f1425010 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -18,6 +18,8 @@ bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species); +void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality); + void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality); void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); diff --git a/include/graphics.h b/include/graphics.h index e5657f2b7f..15c5bd6759 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -483,6 +483,7 @@ extern const u32 gMonFrontPic_Burmy[]; extern const u32 gMonFrontPic_Wormadam[]; extern const u32 gMonFrontPic_Mothim[]; extern const u32 gMonFrontPic_Combee[]; +extern const u32 gMonFrontPic_CombeeF[]; extern const u32 gMonFrontPic_Vespiquen[]; extern const u32 gMonFrontPic_Pachirisu[]; extern const u32 gMonFrontPic_Buizel[]; @@ -517,6 +518,7 @@ extern const u32 gMonFrontPic_Munchlax[]; extern const u32 gMonFrontPic_Riolu[]; extern const u32 gMonFrontPic_Lucario[]; extern const u32 gMonFrontPic_Hippopotas[]; +extern const u32 gMonFrontPic_HippopotasF[]; extern const u32 gMonFrontPic_Hippowdon[]; extern const u32 gMonFrontPic_Skorupi[]; extern const u32 gMonFrontPic_Drapion[]; @@ -589,6 +591,7 @@ extern const u32 gMonFrontPic_Musharna[]; extern const u32 gMonFrontPic_Pidove[]; extern const u32 gMonFrontPic_Tranquill[]; extern const u32 gMonFrontPic_Unfezant[]; +extern const u32 gMonFrontPic_UnfezantF[]; extern const u32 gMonFrontPic_Blitzle[]; extern const u32 gMonFrontPic_Zebstrika[]; extern const u32 gMonFrontPic_Roggenrola[]; @@ -660,7 +663,9 @@ extern const u32 gMonFrontPic_Escavalier[]; extern const u32 gMonFrontPic_Foongus[]; extern const u32 gMonFrontPic_Amoonguss[]; extern const u32 gMonFrontPic_Frillish[]; +extern const u32 gMonFrontPic_FrillishF[]; extern const u32 gMonFrontPic_Jellicent[]; +extern const u32 gMonFrontPic_JellicentF[]; extern const u32 gMonFrontPic_Alomomola[]; extern const u32 gMonFrontPic_Joltik[]; extern const u32 gMonFrontPic_Galvantula[]; @@ -736,6 +741,7 @@ extern const u32 gMonFrontPic_Spewpa[]; extern const u32 gMonFrontPic_Vivillon[]; extern const u32 gMonFrontPic_Litleo[]; extern const u32 gMonFrontPic_Pyroar[]; +extern const u32 gMonFrontPic_PyroarF[]; extern const u32 gMonFrontPic_Flabebe[]; extern const u32 gMonFrontPic_Floette[]; extern const u32 gMonFrontPic_Florges[]; @@ -1657,7 +1663,9 @@ extern const u32 gMonBackPic_Munchlax[]; extern const u32 gMonBackPic_Riolu[]; extern const u32 gMonBackPic_Lucario[]; extern const u32 gMonBackPic_Hippopotas[]; +extern const u32 gMonBackPic_HippopotasF[]; extern const u32 gMonBackPic_Hippowdon[]; +extern const u32 gMonBackPic_HippowdonF[]; extern const u32 gMonBackPic_Skorupi[]; extern const u32 gMonBackPic_Drapion[]; extern const u32 gMonBackPic_Croagunk[]; @@ -1729,6 +1737,7 @@ extern const u32 gMonBackPic_Musharna[]; extern const u32 gMonBackPic_Pidove[]; extern const u32 gMonBackPic_Tranquill[]; extern const u32 gMonBackPic_Unfezant[]; +extern const u32 gMonBackPic_UnfezantF[]; extern const u32 gMonBackPic_Blitzle[]; extern const u32 gMonBackPic_Zebstrika[]; extern const u32 gMonBackPic_Roggenrola[]; @@ -1800,7 +1809,9 @@ extern const u32 gMonBackPic_Escavalier[]; extern const u32 gMonBackPic_Foongus[]; extern const u32 gMonBackPic_Amoonguss[]; extern const u32 gMonBackPic_Frillish[]; +extern const u32 gMonBackPic_FrillishF[]; extern const u32 gMonBackPic_Jellicent[]; +extern const u32 gMonBackPic_JellicentF[]; extern const u32 gMonBackPic_Alomomola[]; extern const u32 gMonBackPic_Joltik[]; extern const u32 gMonBackPic_Galvantula[]; @@ -1876,6 +1887,7 @@ extern const u32 gMonBackPic_Spewpa[]; extern const u32 gMonBackPic_Vivillon[]; extern const u32 gMonBackPic_Litleo[]; extern const u32 gMonBackPic_Pyroar[]; +extern const u32 gMonBackPic_PyroarF[]; extern const u32 gMonBackPic_Flabebe[]; extern const u32 gMonBackPic_Floette[]; extern const u32 gMonBackPic_Florges[]; @@ -2795,7 +2807,9 @@ extern const u32 gMonPalette_Munchlax[]; extern const u32 gMonPalette_Riolu[]; extern const u32 gMonPalette_Lucario[]; extern const u32 gMonPalette_Hippopotas[]; +extern const u32 gMonPalette_HippopotasF[]; extern const u32 gMonPalette_Hippowdon[]; +extern const u32 gMonPalette_HippowdonF[]; extern const u32 gMonPalette_Skorupi[]; extern const u32 gMonPalette_Drapion[]; extern const u32 gMonPalette_Croagunk[]; @@ -2867,6 +2881,7 @@ extern const u32 gMonPalette_Musharna[]; extern const u32 gMonPalette_Pidove[]; extern const u32 gMonPalette_Tranquill[]; extern const u32 gMonPalette_Unfezant[]; +extern const u32 gMonPalette_UnfezantF[]; extern const u32 gMonPalette_Blitzle[]; extern const u32 gMonPalette_Zebstrika[]; extern const u32 gMonPalette_Roggenrola[]; @@ -2938,7 +2953,9 @@ extern const u32 gMonPalette_Escavalier[]; extern const u32 gMonPalette_Foongus[]; extern const u32 gMonPalette_Amoonguss[]; extern const u32 gMonPalette_Frillish[]; +extern const u32 gMonPalette_FrillishF[]; extern const u32 gMonPalette_Jellicent[]; +extern const u32 gMonPalette_JellicentF[]; extern const u32 gMonPalette_Alomomola[]; extern const u32 gMonPalette_Joltik[]; extern const u32 gMonPalette_Galvantula[]; @@ -3014,6 +3031,7 @@ extern const u32 gMonPalette_Spewpa[]; extern const u32 gMonPalette_Vivillon[]; extern const u32 gMonPalette_Litleo[]; extern const u32 gMonPalette_Pyroar[]; +extern const u32 gMonPalette_PyroarF[]; extern const u32 gMonPalette_Flabebe[]; extern const u32 gMonPalette_Floette[]; extern const u32 gMonPalette_Florges[]; @@ -3960,6 +3978,9 @@ extern const u32 gMonShinyPalette_Munchlax[]; extern const u32 gMonShinyPalette_Riolu[]; extern const u32 gMonShinyPalette_Lucario[]; extern const u32 gMonShinyPalette_Hippopotas[]; +extern const u32 gMonShinyPalette_HippopotasF[]; +extern const u32 gMonShinyPalette_Hippowdon[]; +extern const u32 gMonShinyPalette_HippowdonF[]; extern const u32 gMonShinyPalette_Hippowdon[]; extern const u32 gMonShinyPalette_Skorupi[]; extern const u32 gMonShinyPalette_Drapion[]; @@ -4032,6 +4053,7 @@ extern const u32 gMonShinyPalette_Musharna[]; extern const u32 gMonShinyPalette_Pidove[]; extern const u32 gMonShinyPalette_Tranquill[]; extern const u32 gMonShinyPalette_Unfezant[]; +extern const u32 gMonShinyPalette_UnfezantF[]; extern const u32 gMonShinyPalette_Blitzle[]; extern const u32 gMonShinyPalette_Zebstrika[]; extern const u32 gMonShinyPalette_Roggenrola[]; @@ -4103,7 +4125,9 @@ extern const u32 gMonShinyPalette_Escavalier[]; extern const u32 gMonShinyPalette_Foongus[]; extern const u32 gMonShinyPalette_Amoonguss[]; extern const u32 gMonShinyPalette_Frillish[]; +extern const u32 gMonShinyPalette_FrillishF[]; extern const u32 gMonShinyPalette_Jellicent[]; +extern const u32 gMonShinyPalette_JellicentF[]; extern const u32 gMonShinyPalette_Alomomola[]; extern const u32 gMonShinyPalette_Joltik[]; extern const u32 gMonShinyPalette_Galvantula[]; @@ -4179,6 +4203,7 @@ extern const u32 gMonShinyPalette_Spewpa[]; extern const u32 gMonShinyPalette_Vivillon[]; extern const u32 gMonShinyPalette_Litleo[]; extern const u32 gMonShinyPalette_Pyroar[]; +extern const u32 gMonShinyPalette_PyroarF[]; extern const u32 gMonShinyPalette_Flabebe[]; extern const u32 gMonShinyPalette_Floette[]; extern const u32 gMonShinyPalette_Florges[]; @@ -5189,6 +5214,7 @@ extern const u8 gMonIcon_Musharna[]; extern const u8 gMonIcon_Pidove[]; extern const u8 gMonIcon_Tranquill[]; extern const u8 gMonIcon_Unfezant[]; +extern const u8 gMonIcon_UnfezantF[]; extern const u8 gMonIcon_Blitzle[]; extern const u8 gMonIcon_Zebstrika[]; extern const u8 gMonIcon_Roggenrola[]; @@ -5260,7 +5286,9 @@ extern const u8 gMonIcon_Escavalier[]; extern const u8 gMonIcon_Foongus[]; extern const u8 gMonIcon_Amoonguss[]; extern const u8 gMonIcon_Frillish[]; +extern const u8 gMonIcon_FrillishF[]; extern const u8 gMonIcon_Jellicent[]; +extern const u8 gMonIcon_JellicentF[]; extern const u8 gMonIcon_Alomomola[]; extern const u8 gMonIcon_Joltik[]; extern const u8 gMonIcon_Galvantula[]; @@ -5336,6 +5364,7 @@ extern const u8 gMonIcon_Spewpa[]; extern const u8 gMonIcon_Vivillon[]; extern const u8 gMonIcon_Litleo[]; extern const u8 gMonIcon_Pyroar[]; +extern const u8 gMonIcon_PyroarF[]; extern const u8 gMonIcon_Flabebe[]; extern const u8 gMonIcon_Floette[]; extern const u8 gMonIcon_Florges[]; @@ -5486,8 +5515,8 @@ 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_Skwovet[]; +extern const u8 gMonIcon_Greedent[]; extern const u8 gMonIcon_Rookidee[]; extern const u8 gMonIcon_Corvisquire[]; extern const u8 gMonIcon_Corviknight[]; @@ -5513,9 +5542,9 @@ 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_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[]; @@ -5536,9 +5565,9 @@ 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_Alcremie[]; extern const u8 gMonIcon_Falinks[]; -//extern const u8 gMonIcon_Pincurchin[]; +extern const u8 gMonIcon_Pincurchin[]; extern const u8 gMonIcon_Snom[]; extern const u8 gMonIcon_Frosmoth[]; extern const u8 gMonIcon_Stonjourner[]; @@ -5547,10 +5576,10 @@ 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_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[]; @@ -5558,13 +5587,13 @@ 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_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[]; @@ -5637,15 +5666,15 @@ 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_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_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[]; @@ -5716,7 +5745,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_DarmanitanZenModeGalarian[]; extern const u8 gMonIcon_DeerlingSummer[]; extern const u8 gMonIcon_DeerlingAutumn[]; extern const u8 gMonIcon_DeerlingWinter[]; @@ -5812,9 +5841,8 @@ 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_EternatusEternamax[]; +extern const u8 gMonIcon_ZarudeDada[]; //extern const u8 gMonIcon_CalyrexIceRider[]; //extern const u8 gMonIcon_CalyrexShadowRider[]; extern const u8 gMonIcon_Egg[]; @@ -6469,6 +6497,78 @@ extern const u8 gMonFootprint_Kyurem[]; extern const u8 gMonFootprint_Keldeo[]; extern const u8 gMonFootprint_Meloetta[]; extern const u8 gMonFootprint_Genesect[]; +extern const u8 gMonFootprint_Chespin[]; +extern const u8 gMonFootprint_Quilladin[]; +extern const u8 gMonFootprint_Chesnaught[]; +extern const u8 gMonFootprint_Fennekin[]; +extern const u8 gMonFootprint_Braixen[]; +extern const u8 gMonFootprint_Delphox[]; +extern const u8 gMonFootprint_Froakie[]; +extern const u8 gMonFootprint_Frogadier[]; +extern const u8 gMonFootprint_Greninja[]; +extern const u8 gMonFootprint_Bunnelby[]; +extern const u8 gMonFootprint_Diggersby[]; +extern const u8 gMonFootprint_Fletchling[]; +extern const u8 gMonFootprint_Fletchinder[]; +extern const u8 gMonFootprint_Talonflame[]; +extern const u8 gMonFootprint_Scatterbug[]; +extern const u8 gMonFootprint_Spewpa[]; +extern const u8 gMonFootprint_Vivillon[]; +extern const u8 gMonFootprint_Litleo[]; +extern const u8 gMonFootprint_Pyroar[]; +extern const u8 gMonFootprint_Flabebe[]; +extern const u8 gMonFootprint_Floette[]; +extern const u8 gMonFootprint_Florges[]; +extern const u8 gMonFootprint_Skiddo[]; +extern const u8 gMonFootprint_Gogoat[]; +extern const u8 gMonFootprint_Pancham[]; +extern const u8 gMonFootprint_Pangoro[]; +extern const u8 gMonFootprint_Furfrou[]; +extern const u8 gMonFootprint_Espurr[]; +extern const u8 gMonFootprint_Meowstic[]; +extern const u8 gMonFootprint_Honedge[]; +extern const u8 gMonFootprint_Doublade[]; +extern const u8 gMonFootprint_Aegislash[]; +extern const u8 gMonFootprint_Spritzee[]; +extern const u8 gMonFootprint_Aromatisse[]; +extern const u8 gMonFootprint_Swirlix[]; +extern const u8 gMonFootprint_Slurpuff[]; +extern const u8 gMonFootprint_Inkay[]; +extern const u8 gMonFootprint_Malamar[]; +extern const u8 gMonFootprint_Binacle[]; +extern const u8 gMonFootprint_Barbaracle[]; +extern const u8 gMonFootprint_Skrelp[]; +extern const u8 gMonFootprint_Dragalge[]; +extern const u8 gMonFootprint_Clauncher[]; +extern const u8 gMonFootprint_Clawitzer[]; +extern const u8 gMonFootprint_Helioptile[]; +extern const u8 gMonFootprint_Heliolisk[]; +extern const u8 gMonFootprint_Tyrunt[]; +extern const u8 gMonFootprint_Tyrantrum[]; +extern const u8 gMonFootprint_Amaura[]; +extern const u8 gMonFootprint_Aurorus[]; +extern const u8 gMonFootprint_Sylveon[]; +extern const u8 gMonFootprint_Hawlucha[]; +extern const u8 gMonFootprint_Dedenne[]; +extern const u8 gMonFootprint_Carbink[]; +extern const u8 gMonFootprint_Goomy[]; +extern const u8 gMonFootprint_Sliggoo[]; +extern const u8 gMonFootprint_Goodra[]; +extern const u8 gMonFootprint_Klefki[]; +extern const u8 gMonFootprint_Phantump[]; +extern const u8 gMonFootprint_Trevenant[]; +extern const u8 gMonFootprint_Pumpkaboo[]; +extern const u8 gMonFootprint_Gourgeist[]; +extern const u8 gMonFootprint_Bergmite[]; +extern const u8 gMonFootprint_Avalugg[]; +extern const u8 gMonFootprint_Noibat[]; +extern const u8 gMonFootprint_Noivern[]; +extern const u8 gMonFootprint_Xerneas[]; +extern const u8 gMonFootprint_Yveltal[]; +extern const u8 gMonFootprint_Zygarde[]; +extern const u8 gMonFootprint_Diancie[]; +extern const u8 gMonFootprint_Hoopa[]; +extern const u8 gMonFootprint_Volcanion[]; // trainer sprites extern const u32 gTrainerFrontPic_Hiker[]; diff --git a/include/item_use.h b/include/item_use.h index 5cb3148d00..ca3195157e 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -24,6 +24,8 @@ void ItemUseOutOfBattle_BlackWhiteFlute(u8); void ItemUseOutOfBattle_EvolutionStone(u8); void ItemUseOutOfBattle_Berry(u8); void ItemUseOutOfBattle_EnigmaBerry(u8); +void ItemUseOutOfBattle_FormChange(u8); +void ItemUseOutOfBattle_FormChange_ConsumedOnUse(u8); void ItemUseOutOfBattle_CannotUse(u8); void ItemUseInBattle_PokeBall(u8); void ItemUseInBattle_StatIncrease(u8); diff --git a/include/party_menu.h b/include/party_menu.h index 845db5222f..a23ec4a41d 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -60,6 +60,8 @@ void ItemUseCB_TMHM(u8 taskId, TaskFunc task); void ItemUseCB_RareCandy(u8 taskId, TaskFunc task); void ItemUseCB_SacredAsh(u8 taskId, TaskFunc task); void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc task); +void ItemUseCB_FormChange(u8 taskId, TaskFunc task); +void ItemUseCB_FormChange_ConsumedOnUse(u8 taskId, TaskFunc task); u8 GetItemEffectType(u16 item); void CB2_PartyMenuFromStartMenu(void); void CB2_ChooseMonToGiveItem(void); diff --git a/include/pokemon.h b/include/pokemon.h index f87b3da82b..4a3d7e7f7e 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -268,6 +268,13 @@ struct Evolution u16 targetSpecies; }; +struct FormChange { + u16 method; + u16 targetSpecies; + u16 param1; + u16 param2; +}; + #define NUM_UNOWN_FORMS 28 #define GET_UNOWN_LETTER(personality) (( \ @@ -449,5 +456,6 @@ void DestroyMonSpritesGfxManager(u8 managerId); u8 *MonSpritesGfxManager_GetSpritePtr(u8 managerId, u8 spriteNum); u16 GetFormSpeciesId(u16 speciesId, u8 formId); u8 GetFormIdFromFormSpeciesId(u16 formSpeciesId); +u16 GetFormChangeTargetSpecies(struct Pokemon *mon, u16 method, u32 arg); #endif // GUARD_POKEMON_H diff --git a/include/strings.h b/include/strings.h index a22aa307bb..6ace70c4d7 100644 --- a/include/strings.h +++ b/include/strings.h @@ -477,6 +477,7 @@ extern const u8 gText_PkmnBurnHealed[]; extern const u8 gText_PkmnThawedOut[]; extern const u8 gText_PkmnCuredOfParalysis[]; extern const u8 gText_PkmnGotOverInfatuation[]; +extern const u8 gText_PkmnTransformed[]; extern const u8 gText_PkmnBecameHealthy[]; extern const u8 gText_HP3[]; extern const u8 gText_SpAtk3[]; diff --git a/src/data.c b/src/data.c index 3dc8dc85ca..e551ddcce6 100644 --- a/src/data.c +++ b/src/data.c @@ -305,6 +305,13 @@ const union AnimCmd *const gAnims_MonPic[] = const bool8 SpeciesHasGenderDifference[NUM_SPECIES] = { [SPECIES_EEVEE] = TRUE, + [SPECIES_COMBEE] = TRUE, + [SPECIES_HIPPOPOTAS] = TRUE, + [SPECIES_HIPPOWDON] = TRUE, + [SPECIES_UNFEZANT] = TRUE, + [SPECIES_FRILLISH] = TRUE, + [SPECIES_JELLICENT] = TRUE, + [SPECIES_PYROAR] = TRUE, }; #include "data/pokemon_graphics/front_pic_coordinates.h" diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 25c9e25342..9ae0ad3669 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -416,6 +416,7 @@ const u32 gMonFrontPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4 const u32 gMonFrontPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz"); const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz"); +const u32 gMonFrontPic_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz"); @@ -450,6 +451,7 @@ const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/anim_f const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/anim_front.4bpp.lz"); const u32 gMonFrontPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_front.4bpp.lz"); +const u32 gMonFrontPic_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/anim_front.4bpp.lz"); const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/anim_front.4bpp.lz"); @@ -512,16 +514,17 @@ const u32 gMonFrontPic_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/anim const u32 gMonFrontPic_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/anim_front.4bpp.lz"); const u32 gMonFrontPic_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/front.4bpp.lz"); -const u32 gMonFrontPic_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/front.4bpp.lz"); -const u32 gMonFrontPic_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/front.4bpp.lz"); +const u32 gMonFrontPic_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/anim_front.4bpp.lz"); const u32 gMonFrontPic_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/front.4bpp.lz"); +const u32 gMonFrontPic_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/anim_front.4bpp.lz"); const u32 gMonFrontPic_Munna[] = INCBIN_U32("graphics/pokemon/munna/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/front.4bpp.lz"); +const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/anim_front.4bpp.lz"); const u32 gMonFrontPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/front.4bpp.lz"); +const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/anim_front.4bpp.lz"); +const u32 gMonFrontPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/anim_front.4bpp.lz"); const u32 gMonFrontPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/anim_front.4bpp.lz"); const u32 gMonFrontPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/anim_front.4bpp.lz"); @@ -537,7 +540,7 @@ const u32 gMonFrontPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/anim_fro const u32 gMonFrontPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/anim_front.4bpp.lz"); const u32 gMonFrontPic_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/anim_front.4bpp.lz"); const u32 gMonFrontPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/front.4bpp.lz"); +const u32 gMonFrontPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/anim_front.4bpp.lz"); const u32 gMonFrontPic_Throh[] = INCBIN_U32("graphics/pokemon/throh/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/anim_front.4bpp.lz"); @@ -550,50 +553,52 @@ const u32 gMonFrontPic_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/anim_f const u32 gMonFrontPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/anim_front.4bpp.lz"); const u32 gMonFrontPic_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Basculin[] = INCBIN_U32("graphics/pokemon/basculin/front.4bpp.lz"); +const u32 gMonFrontPic_Basculin[] = INCBIN_U32("graphics/pokemon/basculin/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/anim_front.4bpp.lz"); const u32 gMonFrontPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/anim_front.4bpp.lz"); const u32 gMonFrontPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/anim_front.4bpp.lz"); const u32 gMonFrontPic_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/anim_front.4bpp.lz"); const u32 gMonFrontPic_Darmanitan[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front.4bpp.lz"); const u32 gMonFrontPic_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/front.4bpp.lz"); -const u32 gMonFrontPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/front.4bpp.lz"); +const u32 gMonFrontPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/anim_front.4bpp.lz"); const u32 gMonFrontPic_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/anim_front.4bpp.lz"); const u32 gMonFrontPic_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/front.4bpp.lz"); +const u32 gMonFrontPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/anim_front.4bpp.lz"); const u32 gMonFrontPic_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/anim_front.4bpp.lz"); const u32 gMonFrontPic_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/anim_front.4bpp.lz"); const u32 gMonFrontPic_Archen[] = INCBIN_U32("graphics/pokemon/archen/anim_front.4bpp.lz"); const u32 gMonFrontPic_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/front.4bpp.lz"); -const u32 gMonFrontPic_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/front.4bpp.lz"); -const u32 gMonFrontPic_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/front.4bpp.lz"); -const u32 gMonFrontPic_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/front.4bpp.lz"); +const u32 gMonFrontPic_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/anim_front.4bpp.lz"); const u32 gMonFrontPic_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/front.4bpp.lz"); -const u32 gMonFrontPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/front.4bpp.lz"); -const u32 gMonFrontPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/front.4bpp.lz"); +const u32 gMonFrontPic_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/anim_front.4bpp.lz"); const u32 gMonFrontPic_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/front.4bpp.lz"); -const u32 gMonFrontPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/front.4bpp.lz"); +const u32 gMonFrontPic_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/anim_front.4bpp.lz"); const u32 gMonFrontPic_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/anim_front.4bpp.lz"); const u32 gMonFrontPic_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/anim_front.4bpp.lz"); const u32 gMonFrontPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/anim_front.4bpp.lz"); const u32 gMonFrontPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/front.4bpp.lz"); -const u32 gMonFrontPic_Sawsbuck[] = INCBIN_U32("graphics/pokemon/sawsbuck/front.4bpp.lz"); +const u32 gMonFrontPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sawsbuck[] = INCBIN_U32("graphics/pokemon/sawsbuck/anim_front.4bpp.lz"); const u32 gMonFrontPic_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/anim_front.4bpp.lz"); const u32 gMonFrontPic_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/anim_front.4bpp.lz"); const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/anim_front.4bpp.lz"); const u32 gMonFrontPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/anim_front.4bpp.lz"); const u32 gMonFrontPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/anim_front.4bpp.lz"); +const u32 gMonFrontPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/anim_front.4bpp.lz"); const u32 gMonFrontPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/anim_front.4bpp.lz"); const u32 gMonFrontPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/anim_front.4bpp.lz"); @@ -621,7 +626,7 @@ const u32 gMonFrontPic_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/anim_f const u32 gMonFrontPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/front.4bpp.lz"); +const u32 gMonFrontPic_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Golett[] = INCBIN_U32("graphics/pokemon/golett/anim_front.4bpp.lz"); const u32 gMonFrontPic_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/anim_front.4bpp.lz"); @@ -632,96 +637,97 @@ const u32 gMonFrontPic_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/anim_f const u32 gMonFrontPic_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/anim_front.4bpp.lz"); const u32 gMonFrontPic_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Durant[] = INCBIN_U32("graphics/pokemon/durant/front.4bpp.lz"); +const u32 gMonFrontPic_Durant[] = INCBIN_U32("graphics/pokemon/durant/anim_front.4bpp.lz"); const u32 gMonFrontPic_Deino[] = INCBIN_U32("graphics/pokemon/deino/anim_front.4bpp.lz"); const u32 gMonFrontPic_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/anim_front.4bpp.lz"); const u32 gMonFrontPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/front.4bpp.lz"); -const u32 gMonFrontPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/front.4bpp.lz"); -const u32 gMonFrontPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/front.4bpp.lz"); -const u32 gMonFrontPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/front.4bpp.lz"); -const u32 gMonFrontPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/front.4bpp.lz"); -const u32 gMonFrontPic_Tornadus[] = INCBIN_U32("graphics/pokemon/tornadus/front.4bpp.lz"); -const u32 gMonFrontPic_Thundurus[] = INCBIN_U32("graphics/pokemon/thundurus/front.4bpp.lz"); +const u32 gMonFrontPic_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tornadus[] = INCBIN_U32("graphics/pokemon/tornadus/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Thundurus[] = INCBIN_U32("graphics/pokemon/thundurus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/anim_front.4bpp.lz"); const u32 gMonFrontPic_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Landorus[] = INCBIN_U32("graphics/pokemon/landorus/front.4bpp.lz"); +const u32 gMonFrontPic_Landorus[] = INCBIN_U32("graphics/pokemon/landorus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/anim_front.4bpp.lz"); const u32 gMonFrontPic_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/front.4bpp.lz"); +const u32 gMonFrontPic_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/anim_front.4bpp.lz"); const u32 gMonFrontPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/anim_front.4bpp.lz"); const u32 gMonFrontPic_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/front.4bpp.lz"); -const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/front.4bpp.lz"); -const u32 gMonFrontPic_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/front.4bpp.lz"); -const u32 gMonFrontPic_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/front.4bpp.lz"); -const u32 gMonFrontPic_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/front.4bpp.lz"); -const u32 gMonFrontPic_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/front.4bpp.lz"); -const u32 gMonFrontPic_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/front.4bpp.lz"); -const u32 gMonFrontPic_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/front.4bpp.lz"); -const u32 gMonFrontPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/front.4bpp.lz"); -const u32 gMonFrontPic_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/front.4bpp.lz"); -const u32 gMonFrontPic_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/front.4bpp.lz"); -const u32 gMonFrontPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/front.4bpp.lz"); -const u32 gMonFrontPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/front.4bpp.lz"); -const u32 gMonFrontPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/front.4bpp.lz"); -const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/front.4bpp.lz"); -const u32 gMonFrontPic_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/front.4bpp.lz"); -const u32 gMonFrontPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/front.4bpp.lz"); -const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/front.4bpp.lz"); -const u32 gMonFrontPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/front.4bpp.lz"); -const u32 gMonFrontPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/front.4bpp.lz"); -const u32 gMonFrontPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/front.4bpp.lz"); -const u32 gMonFrontPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/front.4bpp.lz"); -const u32 gMonFrontPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/front.4bpp.lz"); -const u32 gMonFrontPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/front.4bpp.lz"); -const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/front.4bpp.lz"); -const u32 gMonFrontPic_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/front.4bpp.lz"); -const u32 gMonFrontPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/front.4bpp.lz"); -const u32 gMonFrontPic_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/front.4bpp.lz"); -const u32 gMonFrontPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/front.4bpp.lz"); -const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/front.4bpp.lz"); -const u32 gMonFrontPic_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/front.4bpp.lz"); -const u32 gMonFrontPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/front.4bpp.lz"); -const u32 gMonFrontPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/front.4bpp.lz"); -const u32 gMonFrontPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/front.4bpp.lz"); -const u32 gMonFrontPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/front.4bpp.lz"); -const u32 gMonFrontPic_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/front.4bpp.lz"); -const u32 gMonFrontPic_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/front.4bpp.lz"); -const u32 gMonFrontPic_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/front.4bpp.lz"); -const u32 gMonFrontPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/front.4bpp.lz"); -const u32 gMonFrontPic_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/front.4bpp.lz"); -const u32 gMonFrontPic_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/front.4bpp.lz"); -const u32 gMonFrontPic_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/front.4bpp.lz"); -const u32 gMonFrontPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/front.4bpp.lz"); -const u32 gMonFrontPic_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/front.4bpp.lz"); -const u32 gMonFrontPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/front.4bpp.lz"); -const u32 gMonFrontPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/front.4bpp.lz"); -const u32 gMonFrontPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/front.4bpp.lz"); -const u32 gMonFrontPic_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/front.4bpp.lz"); -const u32 gMonFrontPic_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/front.4bpp.lz"); -const u32 gMonFrontPic_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/front.4bpp.lz"); -const u32 gMonFrontPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/front.4bpp.lz"); -const u32 gMonFrontPic_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/front.4bpp.lz"); -const u32 gMonFrontPic_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/front.4bpp.lz"); -const u32 gMonFrontPic_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/front.4bpp.lz"); -const u32 gMonFrontPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/front.4bpp.lz"); -const u32 gMonFrontPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/front.4bpp.lz"); -const u32 gMonFrontPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/front.4bpp.lz"); -const u32 gMonFrontPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/front.4bpp.lz"); -const u32 gMonFrontPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/front.4bpp.lz"); -const u32 gMonFrontPic_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/front.4bpp.lz"); -const u32 gMonFrontPic_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/front.4bpp.lz"); -const u32 gMonFrontPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/front.4bpp.lz"); -const u32 gMonFrontPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/front.4bpp.lz"); -const u32 gMonFrontPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/front.4bpp.lz"); -const u32 gMonFrontPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/front.4bpp.lz"); +const u32 gMonFrontPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/anim_frontf.4bpp.lz"); +const u32 gMonFrontPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/anim_front.4bpp.lz"); const u32 gMonFrontPic_Xerneas[] = INCBIN_U32("graphics/pokemon/xerneas/front.4bpp.lz"); -const u32 gMonFrontPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/front.4bpp.lz"); -const u32 gMonFrontPic_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/front.4bpp.lz"); -const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/front.4bpp.lz"); -const u32 gMonFrontPic_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/front.4bpp.lz"); -const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/front.4bpp.lz"); +const u32 gMonFrontPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/anim_front.4bpp.lz"); const u32 gMonFrontPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/front.4bpp.lz"); const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/front.4bpp.lz"); const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/front.4bpp.lz"); @@ -785,10 +791,10 @@ const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front. const u32 gMonFrontPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); const u32 gMonFrontPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); const u32 gMonFrontPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); -const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); -const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); -const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); -const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); +const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/anim_front.4bpp.lz"); +const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/anim_front.4bpp.lz"); +const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/front.4bpp.lz"); const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz"); const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz"); @@ -802,7 +808,7 @@ const u32 gMonFrontPic_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/front.4b const u32 gMonFrontPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/front.4bpp.lz"); const u32 gMonFrontPic_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/front.4bpp.lz"); const u32 gMonFrontPic_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/front.4bpp.lz"); -const u32 gMonFrontPic_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/front.4bpp.lz"); +const u32 gMonFrontPic_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/anim_front.4bpp.lz"); const u32 gMonFrontPic_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/front.4bpp.lz"); const u32 gMonFrontPic_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/front.4bpp.lz"); const u32 gMonFrontPic_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/front.4bpp.lz"); @@ -1061,48 +1067,48 @@ const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/anim_front.4bpp.lz"); const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/front.4bpp.lz"); const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/front.4bpp.lz"); -const u32 gMonFrontPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/front.4bpp.lz"); -const u32 gMonFrontPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/front.4bpp.lz"); +const u32 gMonFrontPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/anim_front.4bpp.lz"); const u32 gMonFrontPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/front.4bpp.lz"); -const u32 gMonFrontPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/front.4bpp.lz"); -const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/front.4bpp.lz"); -const u32 gMonFrontPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/front.4bpp.lz"); -const u32 gMonFrontPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/pumpkaboo/small/front.4bpp.lz"); -const u32 gMonFrontPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/pumpkaboo/large/front.4bpp.lz"); -const u32 gMonFrontPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/pumpkaboo/super/front.4bpp.lz"); -const u32 gMonFrontPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gourgeist/small/front.4bpp.lz"); -const u32 gMonFrontPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gourgeist/large/front.4bpp.lz"); -const u32 gMonFrontPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gourgeist/super/front.4bpp.lz"); -const u32 gMonFrontPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/front.4bpp.lz"); -const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/front.4bpp.lz"); -const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/front.4bpp.lz"); -const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/anim_front.4bpp.lz"); +const u32 gMonFrontPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/pumpkaboo/small/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/pumpkaboo/large/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/pumpkaboo/super/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gourgeist/small/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gourgeist/large/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gourgeist/super/anim_front.4bpp.lz"); +const u32 gMonFrontPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/anim_front.4bpp.lz"); +const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/anim_front.4bpp.lz"); const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz"); const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/front.4bpp.lz"); @@ -1590,7 +1596,9 @@ const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/back.4b const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/back.4bpp.lz"); const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/back.4bpp.lz"); const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/back.4bpp.lz"); +const u32 gMonBackPic_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/backf.4bpp.lz"); const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/back.4bpp.lz"); +const u32 gMonBackPic_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/backf.4bpp.lz"); const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/back.4bpp.lz"); const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/back.4bpp.lz"); const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/back.4bpp.lz"); @@ -1662,6 +1670,7 @@ const u32 gMonBackPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/back.4b const u32 gMonBackPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/back.4bpp.lz"); const u32 gMonBackPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/back.4bpp.lz"); const u32 gMonBackPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/back.4bpp.lz"); +const u32 gMonBackPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/backf.4bpp.lz"); const u32 gMonBackPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/back.4bpp.lz"); const u32 gMonBackPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/back.4bpp.lz"); const u32 gMonBackPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/back.4bpp.lz"); @@ -1733,7 +1742,9 @@ const u32 gMonBackPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/bac const u32 gMonBackPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/back.4bpp.lz"); const u32 gMonBackPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/back.4bpp.lz"); const u32 gMonBackPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/back.4bpp.lz"); +const u32 gMonBackPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/backf.4bpp.lz"); const u32 gMonBackPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/back.4bpp.lz"); +const u32 gMonBackPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/backf.4bpp.lz"); const u32 gMonBackPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/back.4bpp.lz"); const u32 gMonBackPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/back.4bpp.lz"); const u32 gMonBackPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/back.4bpp.lz"); @@ -1809,6 +1820,7 @@ const u32 gMonBackPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/back.4bpp.l const u32 gMonBackPic_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/back.4bpp.lz"); const u32 gMonBackPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/back.4bpp.lz"); const u32 gMonBackPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/back.4bpp.lz"); +const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/backf.4bpp.lz"); const u32 gMonBackPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/back.4bpp.lz"); const u32 gMonBackPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/back.4bpp.lz"); const u32 gMonBackPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/back.4bpp.lz"); @@ -2728,7 +2740,9 @@ const u32 gMonPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/normal. const u32 gMonPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/normal.gbapal.lz"); const u32 gMonPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/normal.gbapal.lz"); const u32 gMonPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/normal.gbapal.lz"); +const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/normalf.gbapal.lz"); const u32 gMonPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/normal.gbapal.lz"); +const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/normalf.gbapal.lz"); const u32 gMonPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/normal.gbapal.lz"); const u32 gMonPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/normal.gbapal.lz"); const u32 gMonPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/normal.gbapal.lz"); @@ -2800,6 +2814,7 @@ const u32 gMonPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/normal. const u32 gMonPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/normal.gbapal.lz"); const u32 gMonPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/normal.gbapal.lz"); const u32 gMonPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/normal.gbapal.lz"); +const u32 gMonPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/normalf.gbapal.lz"); const u32 gMonPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/normal.gbapal.lz"); const u32 gMonPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/normal.gbapal.lz"); const u32 gMonPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/normal.gbapal.lz"); @@ -2871,7 +2886,9 @@ const u32 gMonPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/nor const u32 gMonPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/normal.gbapal.lz"); const u32 gMonPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/normal.gbapal.lz"); const u32 gMonPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/normal.gbapal.lz"); +const u32 gMonPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/normalf.gbapal.lz"); const u32 gMonPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/normal.gbapal.lz"); +const u32 gMonPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/normalf.gbapal.lz"); const u32 gMonPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/normal.gbapal.lz"); const u32 gMonPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/normal.gbapal.lz"); const u32 gMonPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/normal.gbapal.lz"); @@ -2947,6 +2964,7 @@ const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/normal.gbap const u32 gMonPalette_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/normal.gbapal.lz"); const u32 gMonPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/normal.gbapal.lz"); const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/normal.gbapal.lz"); +const u32 gMonPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/normalf.gbapal.lz"); const u32 gMonPalette_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz"); const u32 gMonPalette_Floette[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz"); const u32 gMonPalette_Florges[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz"); @@ -3893,7 +3911,9 @@ const u32 gMonShinyPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/sh const u32 gMonShinyPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/shiny.gbapal.lz"); const u32 gMonShinyPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/shiny.gbapal.lz"); +const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/shinyf.gbapal.lz"); const u32 gMonShinyPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/shiny.gbapal.lz"); +const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/shinyf.gbapal.lz"); const u32 gMonShinyPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/shiny.gbapal.lz"); const u32 gMonShinyPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/shiny.gbapal.lz"); @@ -3965,6 +3985,7 @@ const u32 gMonShinyPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/sh const u32 gMonShinyPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/shiny.gbapal.lz"); const u32 gMonShinyPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/shiny.gbapal.lz"); const u32 gMonShinyPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/shiny.gbapal.lz"); +const u32 gMonShinyPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/shinyf.gbapal.lz"); const u32 gMonShinyPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/shiny.gbapal.lz"); const u32 gMonShinyPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/shiny.gbapal.lz"); const u32 gMonShinyPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/shiny.gbapal.lz"); @@ -4036,7 +4057,9 @@ const u32 gMonShinyPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalie const u32 gMonShinyPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/shiny.gbapal.lz"); const u32 gMonShinyPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/shiny.gbapal.lz"); +const u32 gMonShinyPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/shinyf.gbapal.lz"); const u32 gMonShinyPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/shiny.gbapal.lz"); +const u32 gMonShinyPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/shinyf.gbapal.lz"); const u32 gMonShinyPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/shiny.gbapal.lz"); const u32 gMonShinyPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/shiny.gbapal.lz"); const u32 gMonShinyPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/shiny.gbapal.lz"); @@ -4112,6 +4135,7 @@ const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/shiny. const u32 gMonShinyPalette_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/shiny.gbapal.lz"); +const u32 gMonShinyPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/shinyf.gbapal.lz"); const u32 gMonShinyPalette_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz"); const u32 gMonShinyPalette_Floette[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz"); const u32 gMonShinyPalette_Florges[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz"); @@ -5122,6 +5146,7 @@ const u8 gMonIcon_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/icon.4bpp"); const u8 gMonIcon_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/icon.4bpp"); const u8 gMonIcon_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/icon.4bpp"); const u8 gMonIcon_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/icon.4bpp"); +const u8 gMonIcon_UnfezantF[] = INCBIN_U8("graphics/pokemon/unfezant/iconf.4bpp"); const u8 gMonIcon_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/icon.4bpp"); const u8 gMonIcon_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/icon.4bpp"); const u8 gMonIcon_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/icon.4bpp"); @@ -5193,7 +5218,9 @@ const u8 gMonIcon_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/icon.4bp const u8 gMonIcon_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/icon.4bpp"); const u8 gMonIcon_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/icon.4bpp"); const u8 gMonIcon_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/icon.4bpp"); +const u8 gMonIcon_FrillishF[] = INCBIN_U8("graphics/pokemon/frillish/iconf.4bpp"); const u8 gMonIcon_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/icon.4bpp"); +const u8 gMonIcon_JellicentF[] = INCBIN_U8("graphics/pokemon/jellicent/iconf.4bpp"); const u8 gMonIcon_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/icon.4bpp"); const u8 gMonIcon_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/icon.4bpp"); const u8 gMonIcon_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/icon.4bpp"); @@ -5269,6 +5296,7 @@ const u8 gMonIcon_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/icon.4bpp"); const u8 gMonIcon_Vivillon[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp"); const u8 gMonIcon_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/icon.4bpp"); const u8 gMonIcon_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/icon.4bpp"); +const u8 gMonIcon_PyroarF[] = INCBIN_U8("graphics/pokemon/pyroar/iconf.4bpp"); const u8 gMonIcon_Flabebe[] = INCBIN_U8("graphics/pokemon/flabebe/icon.4bpp"); const u8 gMonIcon_Floette[] = INCBIN_U8("graphics/pokemon/floette/icon.4bpp"); const u8 gMonIcon_Florges[] = INCBIN_U8("graphics/pokemon/florges/icon.4bpp"); @@ -5419,8 +5447,8 @@ 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_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"); @@ -5446,9 +5474,9 @@ 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_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"); @@ -5469,9 +5497,9 @@ 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_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_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"); @@ -5480,10 +5508,10 @@ 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_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"); @@ -5491,13 +5519,13 @@ 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_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"); @@ -5570,15 +5598,15 @@ const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/alolan_marowak/i 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_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_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"); @@ -5649,7 +5677,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_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"); @@ -5745,9 +5773,8 @@ const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/indeedee/female 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_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/eternamax/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"); @@ -6402,3 +6429,75 @@ const u8 gMonFootprint_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/footprint.1 const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1bpp"); const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp"); const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/footprint.1bpp"); +const u8 gMonFootprint_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/footprint.1bpp"); +const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/footprint.1bpp"); +const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/footprint.1bpp"); +const u8 gMonFootprint_Fennekin[] = INCBIN_U8("graphics/pokemon/fennekin/footprint.1bpp"); +const u8 gMonFootprint_Braixen[] = INCBIN_U8("graphics/pokemon/braixen/footprint.1bpp"); +const u8 gMonFootprint_Delphox[] = INCBIN_U8("graphics/pokemon/delphox/footprint.1bpp"); +const u8 gMonFootprint_Froakie[] = INCBIN_U8("graphics/pokemon/froakie/footprint.1bpp"); +const u8 gMonFootprint_Frogadier[] = INCBIN_U8("graphics/pokemon/frogadier/footprint.1bpp"); +const u8 gMonFootprint_Greninja[] = INCBIN_U8("graphics/pokemon/greninja/footprint.1bpp"); +const u8 gMonFootprint_Bunnelby[] = INCBIN_U8("graphics/pokemon/bunnelby/footprint.1bpp"); +const u8 gMonFootprint_Diggersby[] = INCBIN_U8("graphics/pokemon/diggersby/footprint.1bpp"); +const u8 gMonFootprint_Fletchling[] = INCBIN_U8("graphics/pokemon/fletchling/footprint.1bpp"); +const u8 gMonFootprint_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/footprint.1bpp"); +const u8 gMonFootprint_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/footprint.1bpp"); +const u8 gMonFootprint_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/footprint.1bpp"); +const u8 gMonFootprint_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/footprint.1bpp"); +const u8 gMonFootprint_Vivillon[] = INCBIN_U8("graphics/pokemon/vivillon/footprint.1bpp"); +const u8 gMonFootprint_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/footprint.1bpp"); +const u8 gMonFootprint_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/footprint.1bpp"); +const u8 gMonFootprint_Flabebe[] = INCBIN_U8("graphics/pokemon/flabebe/footprint.1bpp"); +const u8 gMonFootprint_Floette[] = INCBIN_U8("graphics/pokemon/floette/footprint.1bpp"); +const u8 gMonFootprint_Florges[] = INCBIN_U8("graphics/pokemon/florges/footprint.1bpp"); +const u8 gMonFootprint_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/footprint.1bpp"); +const u8 gMonFootprint_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/footprint.1bpp"); +const u8 gMonFootprint_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/footprint.1bpp"); +const u8 gMonFootprint_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/footprint.1bpp"); +const u8 gMonFootprint_Furfrou[] = INCBIN_U8("graphics/pokemon/furfrou/footprint.1bpp"); +const u8 gMonFootprint_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/footprint.1bpp"); +const u8 gMonFootprint_Meowstic[] = INCBIN_U8("graphics/pokemon/meowstic/footprint.1bpp"); +const u8 gMonFootprint_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/footprint.1bpp"); +const u8 gMonFootprint_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/footprint.1bpp"); +const u8 gMonFootprint_Aegislash[] = INCBIN_U8("graphics/pokemon/aegislash/footprint.1bpp"); +const u8 gMonFootprint_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/footprint.1bpp"); +const u8 gMonFootprint_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/footprint.1bpp"); +const u8 gMonFootprint_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/footprint.1bpp"); +const u8 gMonFootprint_Slurpuff[] = INCBIN_U8("graphics/pokemon/slurpuff/footprint.1bpp"); +const u8 gMonFootprint_Inkay[] = INCBIN_U8("graphics/pokemon/inkay/footprint.1bpp"); +const u8 gMonFootprint_Malamar[] = INCBIN_U8("graphics/pokemon/malamar/footprint.1bpp"); +const u8 gMonFootprint_Binacle[] = INCBIN_U8("graphics/pokemon/binacle/footprint.1bpp"); +const u8 gMonFootprint_Barbaracle[] = INCBIN_U8("graphics/pokemon/barbaracle/footprint.1bpp"); +const u8 gMonFootprint_Skrelp[] = INCBIN_U8("graphics/pokemon/skrelp/footprint.1bpp"); +const u8 gMonFootprint_Dragalge[] = INCBIN_U8("graphics/pokemon/dragalge/footprint.1bpp"); +const u8 gMonFootprint_Clauncher[] = INCBIN_U8("graphics/pokemon/clauncher/footprint.1bpp"); +const u8 gMonFootprint_Clawitzer[] = INCBIN_U8("graphics/pokemon/clawitzer/footprint.1bpp"); +const u8 gMonFootprint_Helioptile[] = INCBIN_U8("graphics/pokemon/helioptile/footprint.1bpp"); +const u8 gMonFootprint_Heliolisk[] = INCBIN_U8("graphics/pokemon/heliolisk/footprint.1bpp"); +const u8 gMonFootprint_Tyrunt[] = INCBIN_U8("graphics/pokemon/tyrunt/footprint.1bpp"); +const u8 gMonFootprint_Tyrantrum[] = INCBIN_U8("graphics/pokemon/tyrantrum/footprint.1bpp"); +const u8 gMonFootprint_Amaura[] = INCBIN_U8("graphics/pokemon/amaura/footprint.1bpp"); +const u8 gMonFootprint_Aurorus[] = INCBIN_U8("graphics/pokemon/aurorus/footprint.1bpp"); +const u8 gMonFootprint_Sylveon[] = INCBIN_U8("graphics/pokemon/sylveon/footprint.1bpp"); +const u8 gMonFootprint_Hawlucha[] = INCBIN_U8("graphics/pokemon/hawlucha/footprint.1bpp"); +const u8 gMonFootprint_Dedenne[] = INCBIN_U8("graphics/pokemon/dedenne/footprint.1bpp"); +const u8 gMonFootprint_Carbink[] = INCBIN_U8("graphics/pokemon/carbink/footprint.1bpp"); +const u8 gMonFootprint_Goomy[] = INCBIN_U8("graphics/pokemon/goomy/footprint.1bpp"); +const u8 gMonFootprint_Sliggoo[] = INCBIN_U8("graphics/pokemon/sliggoo/footprint.1bpp"); +const u8 gMonFootprint_Goodra[] = INCBIN_U8("graphics/pokemon/goodra/footprint.1bpp"); +const u8 gMonFootprint_Klefki[] = INCBIN_U8("graphics/pokemon/klefki/footprint.1bpp"); +const u8 gMonFootprint_Phantump[] = INCBIN_U8("graphics/pokemon/phantump/footprint.1bpp"); +const u8 gMonFootprint_Trevenant[] = INCBIN_U8("graphics/pokemon/trevenant/footprint.1bpp"); +const u8 gMonFootprint_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/pumpkaboo/footprint.1bpp"); +const u8 gMonFootprint_Gourgeist[] = INCBIN_U8("graphics/pokemon/gourgeist/footprint.1bpp"); +const u8 gMonFootprint_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/footprint.1bpp"); +const u8 gMonFootprint_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/footprint.1bpp"); +const u8 gMonFootprint_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/footprint.1bpp"); +const u8 gMonFootprint_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/footprint.1bpp"); +const u8 gMonFootprint_Xerneas[] = INCBIN_U8("graphics/pokemon/xerneas/footprint.1bpp"); +const u8 gMonFootprint_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/footprint.1bpp"); +const u8 gMonFootprint_Zygarde[] = INCBIN_U8("graphics/pokemon/zygarde/footprint.1bpp"); +const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/footprint.1bpp"); +const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/footprint.1bpp"); +const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/footprint.1bpp"); diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 8801482c69..f5fdda6179 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -254,6 +254,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_METAGROSS] = {{EVO_MEGA_EVOLUTION, ITEM_METAGROSSITE, SPECIES_METAGROSS_MEGA}}, [SPECIES_LATIAS] = {{EVO_MEGA_EVOLUTION, ITEM_LATIASITE, SPECIES_LATIAS_MEGA}}, [SPECIES_LATIOS] = {{EVO_MEGA_EVOLUTION, ITEM_LATIOSITE, SPECIES_LATIOS_MEGA}}, + [SPECIES_KYOGRE] = {{EVO_PRIMAL_REVERSION, ITEM_BLUE_ORB, SPECIES_KYOGRE_PRIMAL}}, + [SPECIES_GROUDON] = {{EVO_PRIMAL_REVERSION, ITEM_RED_ORB, SPECIES_GROUDON_PRIMAL}}, [SPECIES_RAYQUAZA] = {{EVO_MOVE_MEGA_EVOLUTION, MOVE_DRAGON_ASCENT, SPECIES_RAYQUAZA_MEGA}}, // Gens 4-7 @@ -284,7 +286,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GLAMEOW] = {{EVO_LEVEL, 38, SPECIES_PURUGLY}}, [SPECIES_CHINGLING] = {{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_CHIMECHO}}, [SPECIES_STUNKY] = {{EVO_LEVEL, 34, SPECIES_SKUNTANK}}, - [SPECIES_BRONZOR] = {{EVO_LEVEL, 35, SPECIES_BRONZONG}}, + [SPECIES_BRONZOR] = {{EVO_LEVEL, 33, SPECIES_BRONZONG}}, [SPECIES_BONSLY] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}}, [SPECIES_MIME_JR] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}}, [SPECIES_HAPPINY] = {{EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}}, diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h new file mode 100644 index 0000000000..777b174a4e --- /dev/null +++ b/src/data/pokemon/form_change_table_pointers.h @@ -0,0 +1,61 @@ +const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = +{ + [SPECIES_GIRATINA] = sGiratinaFormChangeTable, + [SPECIES_SHAYMIN] = sShayminFormChangeTable, + [SPECIES_SHAYMIN_SKY] = sShayminSkyFormChangeTable, + [SPECIES_ARCEUS] = sArceusFormChangeTable, + [SPECIES_ARCEUS_FIGHTING] = sArceusFormChangeTable, + [SPECIES_ARCEUS_FLYING] = sArceusFormChangeTable, + [SPECIES_ARCEUS_POISON] = sArceusFormChangeTable, + [SPECIES_ARCEUS_ROCK] = sArceusFormChangeTable, + [SPECIES_ARCEUS_GROUND] = sArceusFormChangeTable, + [SPECIES_ARCEUS_BUG] = sArceusFormChangeTable, + [SPECIES_ARCEUS_GHOST] = sArceusFormChangeTable, + [SPECIES_ARCEUS_STEEL] = sArceusFormChangeTable, + [SPECIES_ARCEUS_FIRE] = sArceusFormChangeTable, + [SPECIES_ARCEUS_WATER] = sArceusFormChangeTable, + [SPECIES_ARCEUS_GRASS] = sArceusFormChangeTable, + [SPECIES_ARCEUS_ELECTRIC] = sArceusFormChangeTable, + [SPECIES_ARCEUS_PSYCHIC] = sArceusFormChangeTable, + [SPECIES_ARCEUS_ICE] = sArceusFormChangeTable, + [SPECIES_ARCEUS_DRAGON] = sArceusFormChangeTable, + [SPECIES_ARCEUS_DARK] = sArceusFormChangeTable, + [SPECIES_ARCEUS_FAIRY] = sArceusFormChangeTable, + [SPECIES_TORNADUS] = sTornadusFormChangeTable, + [SPECIES_TORNADUS_THERIAN] = sTornadusTherianFormChangeTable, + [SPECIES_THUNDURUS] = sThundurusFormChangeTable, + [SPECIES_THUNDURUS_THERIAN] = sThundurusTherianFormChangeTable, + [SPECIES_LANDORUS] = sLandorusFormChangeTable, + [SPECIES_LANDORUS_THERIAN] = sLandorusTherianFormChangeTable, + [SPECIES_KELDEO] = sKeldeoFormChangeTable, + [SPECIES_KELDEO_RESOLUTE] = sKeldeoResoluteFormChangeTable, + [SPECIES_GENESECT] = sGenesectFormChangeTable, + [SPECIES_GENESECT_DOUSE_DRIVE] = sGenesectFormChangeTable, + [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormChangeTable, + [SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormChangeTable, + [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormChangeTable, + [SPECIES_HOOPA] = sHoopaFormChangeTable, + [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundFormChangeTable, + [SPECIES_ORICORIO] = sOricorioFormChangeTable, + [SPECIES_ORICORIO_POM_POM] = sOricorioFormChangeTable, + [SPECIES_ORICORIO_PAU] = sOricorioFormChangeTable, + [SPECIES_ORICORIO_SENSU] = sOricorioFormChangeTable, + [SPECIES_SILVALLY] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_BUG] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_DARK] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_DRAGON] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_ELECTRIC] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_FAIRY] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_FIGHTING] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_FIRE] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_FLYING] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_GHOST] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_GRASS] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_GROUND] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_ICE] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_POISON] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_PSYCHIC] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_ROCK] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable, + [SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable, +}; diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h new file mode 100644 index 0000000000..a84d376b04 --- /dev/null +++ b/src/data/pokemon/form_change_tables.h @@ -0,0 +1,186 @@ +/* +FORM_ITEM_HOLD: + Form change activates when the item is given to or taken from the selected Pokémon. + param1 = item to hold + +FORM_ITEM_USE: + Form change activates when the item is used on the selected Pokémon. + param1 = item to use + +FORM_MOVE: + Form change activates when the Pokémon learns or forgets the move. + param1 = move to check for + param2 = WHEN_LEARNED if form change activates when move is forgotten + WHEN_FORGOTTEN if form change activates when move is learned + +FORM_WITHDRAW: + Form change activates when the Pokémon is withdrawn from the PC or Daycare. + no parameters + +FORM_ITEM_HOLD_ABILITY: + Form change activates when the item is used on the selected Pokémon that has + a particular ability. + param1 = item to use + param2 = ability to check for + +FORM_ITEM_USE_TIME: + Form change activates when the item is used on the selected Pokémon at the + appropriate time of day. + param1 = item to use + param2 = DAY if form change activates in the daytime + NIGHT if form change activates at nighttime +*/ + +// FORM_MOVE param2 Arguments +#define WHEN_LEARNED 0 +#define WHEN_FORGOTTEN 1 + +// FORM_ITEM_USE_TIME param2 Arguments +#define DAY 0 +#define NIGHT 1 + +static const struct FormChange sGiratinaFormChangeTable[] = { + {FORM_ITEM_HOLD, SPECIES_GIRATINA_ORIGIN, ITEM_GRISEOUS_ORB}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sShayminFormChangeTable[] = { + {FORM_ITEM_USE_TIME, SPECIES_SHAYMIN_SKY, ITEM_GRACIDEA, DAY}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sShayminSkyFormChangeTable[] = { + {FORM_WITHDRAW, SPECIES_SHAYMIN}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sArceusFormChangeTable[] = { + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS, ITEM_NONE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FIGHTING, ITEM_FIST_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FIGHTING, ITEM_FIGHTINIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FLYING, ITEM_SKY_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FLYING, ITEM_FLYINIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_POISON, ITEM_TOXIC_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_POISON, ITEM_POISONIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_ROCK, ITEM_STONE_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_ROCK, ITEM_ROCKIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_GROUND, ITEM_EARTH_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_GROUND, ITEM_GROUNDIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_BUG, ITEM_INSECT_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_BUG, ITEM_BUGINIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_GHOST, ITEM_SPOOKY_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_GHOST, ITEM_GHOSTIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_STEEL, ITEM_IRON_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_STEEL, ITEM_STEELIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FIRE, ITEM_FLAME_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FIRE, ITEM_FIRIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_WATER, ITEM_SPLASH_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_WATER, ITEM_WATERIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_GRASS, ITEM_MEADOW_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_GRASS, ITEM_GRASSIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_ELECTRIC, ITEM_ZAP_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_ELECTRIC, ITEM_ELECTRIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_PSYCHIC, ITEM_MIND_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_PSYCHIC, ITEM_PSYCHIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_ICE, ITEM_ICICLE_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_ICE, ITEM_ICIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_DRAGON, ITEM_DRACO_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_DRAGON, ITEM_DRAGONIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_DARK, ITEM_DREAD_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_DARK, ITEM_DARKINIUM_Z, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FAIRY, ITEM_PIXIE_PLATE, ABILITY_MULTITYPE}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FAIRY, ITEM_FAIRIUM_Z, ABILITY_MULTITYPE}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sTornadusFormChangeTable[] = { + // {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sTornadusTherianFormChangeTable[] = { + // {FORM_ITEM_USE, SPECIES_TORNADUS, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sThundurusFormChangeTable[] = { + // {FORM_ITEM_USE, SPECIES_THUNDURUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sThundurusTherianFormChangeTable[] = { + // {FORM_ITEM_USE, SPECIES_THUNDURUS, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sLandorusFormChangeTable[] = { + // {FORM_ITEM_USE, SPECIES_LANDORUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sLandorusTherianFormChangeTable[] = { + // {FORM_ITEM_USE, SPECIES_LANDORUS, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sKeldeoFormChangeTable[] = { + {FORM_MOVE, SPECIES_KELDEO_RESOLUTE, MOVE_SECRET_SWORD, WHEN_LEARNED}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sKeldeoResoluteFormChangeTable[] = { + {FORM_MOVE, SPECIES_KELDEO, MOVE_SECRET_SWORD, WHEN_FORGOTTEN}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sGenesectFormChangeTable[] = { + {FORM_ITEM_HOLD, SPECIES_GENESECT, ITEM_NONE}, + {FORM_ITEM_HOLD, SPECIES_GENESECT_DOUSE_DRIVE, ITEM_DOUSE_DRIVE}, + {FORM_ITEM_HOLD, SPECIES_GENESECT_SHOCK_DRIVE, ITEM_SHOCK_DRIVE}, + {FORM_ITEM_HOLD, SPECIES_GENESECT_BURN_DRIVE, ITEM_BURN_DRIVE}, + {FORM_ITEM_HOLD, SPECIES_GENESECT_CHILL_DRIVE, ITEM_CHILL_DRIVE}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sHoopaFormChangeTable[] = { + // {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sHoopaUnboundFormChangeTable[] = { + {FORM_WITHDRAW, SPECIES_HOOPA}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sOricorioFormChangeTable[] = { + {FORM_ITEM_USE, SPECIES_ORICORIO, ITEM_RED_NECTAR}, + {FORM_ITEM_USE, SPECIES_ORICORIO_POM_POM, ITEM_YELLOW_NECTAR}, + {FORM_ITEM_USE, SPECIES_ORICORIO_PAU, ITEM_PINK_NECTAR}, + {FORM_ITEM_USE, SPECIES_ORICORIO_SENSU, ITEM_PURPLE_NECTAR}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sSilvallyFormChangeTable[] = { + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY, ITEM_NONE, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_FIGHTING, ITEM_FIGHTING_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_FLYING, ITEM_FLYING_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_POISON, ITEM_POISON_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_GROUND, ITEM_GROUND_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_ROCK, ITEM_ROCK_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_BUG, ITEM_BUG_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_GHOST, ITEM_GHOST_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_STEEL, ITEM_STEEL_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_FIRE, ITEM_FIRE_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_WATER, ITEM_WATER_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_GRASS, ITEM_GRASS_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_ELECTRIC, ITEM_ELECTRIC_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_PSYCHIC, ITEM_PSYCHIC_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_ICE, ITEM_ICE_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_DRAGON, ITEM_DRAGON_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_DARK, ITEM_DARK_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_FAIRY, ITEM_FAIRY_MEMORY, ABILITY_RKS_SYSTEM}, + {FORM_CHANGE_END}, +}; + +#undef WHEN_LEARNED +#undef WHEN_FORGOTTEN diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index a70aa13c5b..9d108ce836 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1278,4 +1278,11 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = const struct CompressedSpriteSheet gMonBackPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF), + SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), + SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF), + SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF), + SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF), + SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF), + SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF), + SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF), }; diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index f546028550..6ba0e7fccc 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -650,5 +650,77 @@ const u8 *const gMonFootprintTable[] = [SPECIES_KELDEO] = gMonFootprint_Keldeo, [SPECIES_MELOETTA] = gMonFootprint_Meloetta, [SPECIES_GENESECT] = gMonFootprint_Genesect, + [SPECIES_CHESPIN] = gMonFootprint_Chespin, + [SPECIES_QUILLADIN] = gMonFootprint_Quilladin, + [SPECIES_CHESNAUGHT] = gMonFootprint_Chesnaught, + [SPECIES_FENNEKIN] = gMonFootprint_Fennekin, + [SPECIES_BRAIXEN] = gMonFootprint_Braixen, + [SPECIES_DELPHOX] = gMonFootprint_Delphox, + [SPECIES_FROAKIE] = gMonFootprint_Froakie, + [SPECIES_FROGADIER] = gMonFootprint_Frogadier, + [SPECIES_GRENINJA] = gMonFootprint_Greninja, + [SPECIES_BUNNELBY] = gMonFootprint_Bunnelby, + [SPECIES_DIGGERSBY] = gMonFootprint_Diggersby, + [SPECIES_FLETCHLING] = gMonFootprint_Fletchling, + [SPECIES_FLETCHINDER] = gMonFootprint_Fletchinder, + [SPECIES_TALONFLAME] = gMonFootprint_Talonflame, + [SPECIES_SCATTERBUG] = gMonFootprint_Scatterbug, + [SPECIES_SPEWPA] = gMonFootprint_Spewpa, + [SPECIES_VIVILLON] = gMonFootprint_Vivillon, + [SPECIES_LITLEO] = gMonFootprint_Litleo, + [SPECIES_PYROAR] = gMonFootprint_Pyroar, + [SPECIES_FLABEBE] = gMonFootprint_Flabebe, + [SPECIES_FLOETTE] = gMonFootprint_Floette, + [SPECIES_FLORGES] = gMonFootprint_Florges, + [SPECIES_SKIDDO] = gMonFootprint_Skiddo, + [SPECIES_GOGOAT] = gMonFootprint_Gogoat, + [SPECIES_PANCHAM] = gMonFootprint_Pancham, + [SPECIES_PANGORO] = gMonFootprint_Pangoro, + [SPECIES_FURFROU] = gMonFootprint_Furfrou, + [SPECIES_ESPURR] = gMonFootprint_Espurr, + [SPECIES_MEOWSTIC] = gMonFootprint_Meowstic, + [SPECIES_HONEDGE] = gMonFootprint_Honedge, + [SPECIES_DOUBLADE] = gMonFootprint_Doublade, + [SPECIES_AEGISLASH] = gMonFootprint_Aegislash, + [SPECIES_SPRITZEE] = gMonFootprint_Spritzee, + [SPECIES_AROMATISSE] = gMonFootprint_Aromatisse, + [SPECIES_SWIRLIX] = gMonFootprint_Swirlix, + [SPECIES_SLURPUFF] = gMonFootprint_Slurpuff, + [SPECIES_INKAY] = gMonFootprint_Inkay, + [SPECIES_MALAMAR] = gMonFootprint_Malamar, + [SPECIES_BINACLE] = gMonFootprint_Binacle, + [SPECIES_BARBARACLE] = gMonFootprint_Barbaracle, + [SPECIES_SKRELP] = gMonFootprint_Skrelp, + [SPECIES_DRAGALGE] = gMonFootprint_Dragalge, + [SPECIES_CLAUNCHER] = gMonFootprint_Clauncher, + [SPECIES_CLAWITZER] = gMonFootprint_Clawitzer, + [SPECIES_HELIOPTILE] = gMonFootprint_Helioptile, + [SPECIES_HELIOLISK] = gMonFootprint_Heliolisk, + [SPECIES_TYRUNT] = gMonFootprint_Tyrunt, + [SPECIES_TYRANTRUM] = gMonFootprint_Tyrantrum, + [SPECIES_AMAURA] = gMonFootprint_Amaura, + [SPECIES_AURORUS] = gMonFootprint_Aurorus, + [SPECIES_SYLVEON] = gMonFootprint_Sylveon, + [SPECIES_HAWLUCHA] = gMonFootprint_Hawlucha, + [SPECIES_DEDENNE] = gMonFootprint_Dedenne, + [SPECIES_CARBINK] = gMonFootprint_Carbink, + [SPECIES_GOOMY] = gMonFootprint_Goomy, + [SPECIES_SLIGGOO] = gMonFootprint_Sliggoo, + [SPECIES_GOODRA] = gMonFootprint_Goodra, + [SPECIES_KLEFKI] = gMonFootprint_Klefki, + [SPECIES_PHANTUMP] = gMonFootprint_Phantump, + [SPECIES_TREVENANT] = gMonFootprint_Trevenant, + [SPECIES_PUMPKABOO] = gMonFootprint_Pumpkaboo, + [SPECIES_GOURGEIST] = gMonFootprint_Gourgeist, + [SPECIES_BERGMITE] = gMonFootprint_Bergmite, + [SPECIES_AVALUGG] = gMonFootprint_Avalugg, + [SPECIES_NOIBAT] = gMonFootprint_Noibat, + [SPECIES_NOIVERN] = gMonFootprint_Noivern, + [SPECIES_XERNEAS] = gMonFootprint_Xerneas, + [SPECIES_YVELTAL] = gMonFootprint_Yveltal, + [SPECIES_ZYGARDE] = gMonFootprint_Zygarde, + [SPECIES_DIANCIE] = gMonFootprint_Diancie, + [SPECIES_HOOPA] = gMonFootprint_Hoopa, + [SPECIES_VOLCANION] = gMonFootprint_Volcanion, [SPECIES_EGG] = gMonFootprint_Bulbasaur, }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index bd25b04023..6387994c1a 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -5912,18 +5912,24 @@ static const union AnimCmd sAnim_PANSAGE_1[] = static const union AnimCmd sAnim_SIMISAGE_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_PANSEAR_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_SIMISEAR_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5938,6 +5944,8 @@ static const union AnimCmd sAnim_PANPOUR_1[] = static const union AnimCmd sAnim_SIMIPOUR_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5952,6 +5960,8 @@ static const union AnimCmd sAnim_MUNNA_1[] = static const union AnimCmd sAnim_MUSHARNA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5974,7 +5984,8 @@ static const union AnimCmd sAnim_TRANQUILL_1[] = static const union AnimCmd sAnim_UNFEZANT_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; @@ -5988,6 +5999,8 @@ static const union AnimCmd sAnim_BLITZLE_1[] = static const union AnimCmd sAnim_ZEBSTRIKA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6058,12 +6071,16 @@ static const union AnimCmd sAnim_AUDINO_1[] = static const union AnimCmd sAnim_TIMBURR_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GURDURR_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6094,6 +6111,8 @@ static const union AnimCmd sAnim_PALPITOAD_1[] = static const union AnimCmd sAnim_SEISMITOAD_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6156,6 +6175,8 @@ static const union AnimCmd sAnim_WHIRLIPEDE_1[] = static const union AnimCmd sAnim_SCOLIPEDE_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6194,6 +6215,8 @@ static const union AnimCmd sAnim_LILLIGANT_1[] = static const union AnimCmd sAnim_BASCULIN_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6248,12 +6271,16 @@ static const union AnimCmd sAnim_MARACTUS_1[] = static const union AnimCmd sAnim_DWEBBLE_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_CRUSTLE_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6276,6 +6303,8 @@ static const union AnimCmd sAnim_SCRAFTY_1[] = static const union AnimCmd sAnim_SIGILYPH_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6330,54 +6359,72 @@ static const union AnimCmd sAnim_ARCHEOPS_1[] = static const union AnimCmd sAnim_TRUBBISH_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GARBODOR_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_ZORUA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_ZOROARK_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_MINCCINO_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_CINCCINO_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GOTHITA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GOTHORITA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GOTHITELLE_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6392,12 +6439,16 @@ static const union AnimCmd sAnim_SOLOSIS_1[] = static const union AnimCmd sAnim_DUOSION_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_REUNICLUS_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6444,12 +6495,16 @@ static const union AnimCmd sAnim_VANILLUXE_1[] = static const union AnimCmd sAnim_DEERLING_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_SAWSBUCK_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6528,6 +6583,8 @@ static const union AnimCmd sAnim_JOLTIK_1[] = static const union AnimCmd sAnim_GALVANTULA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6670,6 +6727,8 @@ static const union AnimCmd sAnim_CUBCHOO_1[] = static const union AnimCmd sAnim_BEARTIC_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6724,18 +6783,24 @@ static const union AnimCmd sAnim_MIENSHAO_1[] = static const union AnimCmd sAnim_DRUDDIGON_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GOLETT_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GOLURK_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6758,6 +6823,8 @@ static const union AnimCmd sAnim_BISHARP_1[] = static const union AnimCmd sAnim_BOUFFALANT_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6804,6 +6871,8 @@ static const union AnimCmd sAnim_HEATMOR_1[] = static const union AnimCmd sAnim_DURANT_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6834,42 +6903,56 @@ static const union AnimCmd sAnim_HYDREIGON_1[] = static const union AnimCmd sAnim_LARVESTA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_VOLCARONA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_COBALION_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_TERRAKION_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_VIRIZION_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_TORNADUS_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_THUNDURUS_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6884,18 +6967,24 @@ static const union AnimCmd sAnim_RESHIRAM_1[] = static const union AnimCmd sAnim_ZEKROM_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_LANDORUS_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_KYUREM_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -6910,12 +6999,16 @@ static const union AnimCmd sAnim_KELDEO_1[] = static const union AnimCmd sAnim_MELOETTA_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GENESECT_1[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 0bc35542c7..788afc7447 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1278,4 +1278,11 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), + SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF), + SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF), + SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon), + SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF), + SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF), + SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF), + SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF), }; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 59e3d918b4..cc8717e905 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1278,4 +1278,11 @@ const struct CompressedSpritePalette gMonPaletteTable[] = const struct CompressedSpritePalette gMonPaletteTableFemale[] = { SPECIES_PAL(EEVEE, gMonPalette_Eevee), + SPECIES_PAL(COMBEE, gMonPalette_Combee), + SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF), + SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF), + SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF), + SPECIES_PAL(FRILLISH, gMonPalette_FrillishF), + SPECIES_PAL(JELLICENT, gMonPalette_JellicentF), + SPECIES_PAL(PYROAR, gMonPalette_PyroarF), }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 38b3a662df..b8324bdd5f 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1278,4 +1278,11 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = { SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), + SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee), + SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF), + SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF), + SPECIES_SHINY_PAL(UNFEZANT, gMonShinyPalette_UnfezantF), + SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF), + SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF), + SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF), }; diff --git a/src/daycare.c b/src/daycare.c index f53f2c1bb7..4455b5d96b 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -247,6 +247,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon) static u16 TakeSelectedPokemonFromDaycare(struct DaycareMon *daycareMon) { u16 species; + u16 newSpecies; u32 experience; struct Pokemon pokemon; @@ -254,6 +255,13 @@ static u16 TakeSelectedPokemonFromDaycare(struct DaycareMon *daycareMon) species = GetBoxMonData(&daycareMon->mon, MON_DATA_SPECIES); BoxMonToMon(&daycareMon->mon, &pokemon); + newSpecies = GetFormChangeTargetSpecies(&pokemon, FORM_WITHDRAW, 0); + if (newSpecies != SPECIES_NONE) { + SetMonData(&pokemon, MON_DATA_SPECIES, &newSpecies); + CalculateMonStats(&pokemon); + species = newSpecies; + } + if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL) { experience = GetMonData(&pokemon, MON_DATA_EXP) + daycareMon->steps; diff --git a/src/decompress.c b/src/decompress.c index ba07935148..418c5ea253 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -67,6 +67,14 @@ void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffe LZ77UnCompWram(src->data, buffer); } +void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality) +{ + if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) + DecompressPicFromTable(&gMonFrontPicTableFemale[species], buffer, species); + else + DecompressPicFromTable(&gMonFrontPicTable[species], buffer, species); +} + void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality) { bool8 isFrontPic; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 6b2aa8813c..e5d628140e 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -8,6 +8,7 @@ #include "evolution_scene.h" #include "evolution_graphics.h" #include "gpu_regs.h" +#include "item.h" #include "link.h" #include "link_rfu.h" #include "m4a.h" @@ -259,9 +260,9 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u currSpecies = GetMonData(mon, MON_DATA_SPECIES); trainerId = GetMonData(mon, MON_DATA_OT_ID); personality = GetMonData(mon, MON_DATA_PERSONALITY); - DecompressPicFromTable(&gMonFrontPicTable[currSpecies], - gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT], - currSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT], + currSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x110, 0x20); @@ -274,9 +275,9 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u gSprites[ID].invisible = TRUE; // postEvo sprite - DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], - postEvoSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], + postEvoSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); @@ -351,9 +352,9 @@ static void CB2_EvolutionSceneLoadGraphics(void) FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; - DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], - postEvoSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], + postEvoSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); @@ -423,9 +424,9 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) const struct CompressedSpritePalette* pokePal; u32 trainerId = GetMonData(mon, MON_DATA_OT_ID); u32 personality = GetMonData(mon, MON_DATA_PERSONALITY); - DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], - postEvoSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], + postEvoSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); gMain.state++; @@ -487,9 +488,9 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit sEvoStructPtr = AllocZeroed(sizeof(struct EvoInfo)); sEvoStructPtr->preEvoSpriteId = preEvoSpriteId; - DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT], - postEvoSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT], + postEvoSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); @@ -548,7 +549,9 @@ static void CB2_TradeEvolutionSceneUpdate(void) static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) { u32 data = 0; - if (gEvolutionTable[preEvoSpecies][0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < PARTY_SIZE) + u16 ball = ITEM_POKE_BALL; + if (gEvolutionTable[preEvoSpecies][0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < PARTY_SIZE + && (P_SHEDINJA_BALL == GEN_3 || CheckBagHasItem(ball, 1))) { s32 i; struct Pokemon* shedinja = &gPlayerParty[gPlayerPartyCount]; @@ -559,6 +562,11 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_HELD_ITEM, &data); SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MARKINGS, &data); SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_ENCRYPT_SEPARATOR, &data); + + #if P_SHEDINJA_BALL >= GEN_4 + SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_POKEBALL, &ball); + RemoveBagItem(ball, 1); + #endif for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + CONTEST_CATEGORIES_COUNT; i++) SetMonData(&gPlayerParty[gPlayerPartyCount], i, &data); diff --git a/src/item_use.c b/src/item_use.c index 0756cfdb32..28a97bb08c 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -1171,6 +1171,20 @@ void ItemUseInBattle_EnigmaBerry(u8 taskId) } } +void ItemUseOutOfBattle_FormChange(u8 taskId) +{ + gItemUseCB = ItemUseCB_FormChange; + gTasks[taskId].data[0] = FALSE; + SetUpItemUseCallback(taskId); +} + +void ItemUseOutOfBattle_FormChange_ConsumedOnUse(u8 taskId) +{ + gItemUseCB = ItemUseCB_FormChange_ConsumedOnUse; + gTasks[taskId].data[0] = TRUE; + SetUpItemUseCallback(taskId); +} + void ItemUseOutOfBattle_CannotUse(u8 taskId) { DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem); diff --git a/src/party_menu.c b/src/party_menu.c index 7e479ab598..73d88e9b4a 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -5271,6 +5271,143 @@ void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc task) } } +#define tState data[0] +#define tTargetSpecies data[1] +#define tAnimWait data[2] +#define tNextFunc 3 + +static void SpriteCB_FormChangeIconMosaic(struct Sprite *sprite) +{ + u8 taskId = sprite->data[2]; + + sprite->data[0] -= sprite->data[1]; + + if (sprite->data[0] <= 0) + { + if (gTasks[taskId].tAnimWait == 60) + sprite->data[0] = 0; + else + sprite->data[0] = 10; + } + + SetGpuReg(REG_OFFSET_MOSAIC, (sprite->data[0] << 12) | (sprite->data[1] << 8)); + + if (sprite->data[0] == 0) + { + sprite->oam.mosaic = FALSE; + sprite->callback = SpriteCallbackDummy; + } +} + +static void Task_TryItemUseFormChange(u8 taskId) +{ + struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; + u16 targetSpecies; + struct Sprite *icon = &gSprites[sPartyMenuBoxes[gPartyMenu.slotId].monSpriteId]; + + switch (gTasks[taskId].tState) + { + case 0: + targetSpecies = gTasks[taskId].tTargetSpecies; + SetMonData(mon, MON_DATA_SPECIES, &targetSpecies); + CalculateMonStats(mon); + gTasks[taskId].tState++; + break; + case 1: + gTasks[taskId].tState++; + break; + case 2: + PlaySE(SE_M_TELEPORT); + gTasks[taskId].tState++; + break; + case 3: + targetSpecies = gTasks[taskId].tTargetSpecies; + + if (gTasks[taskId].tAnimWait == 0) + { + FreeAndDestroyMonIconSprite(icon); + CreatePartyMonIconSpriteParameterized(targetSpecies, GetMonData(mon, MON_DATA_PERSONALITY, NULL), &sPartyMenuBoxes[gPartyMenu.slotId], 1); + icon->oam.mosaic = TRUE; + icon->data[0] = 10; + icon->data[1] = 1; + icon->data[2] = taskId; + icon->callback = SpriteCB_FormChangeIconMosaic; + SetGpuReg(REG_OFFSET_MOSAIC, (icon->data[0] << 12) | (icon->data[1] << 8)); + } + + if (++gTasks[taskId].tAnimWait == 60) + gTasks[taskId].tState++; + + break; + case 4: + targetSpecies = gTasks[taskId].tTargetSpecies; + PlayCry_Normal(targetSpecies, 0); + gTasks[taskId].tState++; + break; + case 5: + if (IsCryFinished()) + { + GetMonNickname(mon, gStringVar1); + StringExpandPlaceholders(gStringVar4, gText_PkmnTransformed); + DisplayPartyMenuMessage(gStringVar4, FALSE); + ScheduleBgCopyTilemapToVram(2); + gTasks[taskId].tState++; + } + + break; + case 6: + if (!IsPartyMenuTextPrinterActive()) + gTasks[taskId].tState++; + + break; + case 7: + gTasks[taskId].func = (void *)GetWordTaskArg(taskId, tNextFunc); + break; + } +} + +bool32 TryItemUseFormChange(u8 taskId, TaskFunc task) +{ + struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; + u16 targetSpecies = GetFormChangeTargetSpecies(mon, ItemId_GetSecondaryId(gSpecialVar_ItemId), gSpecialVar_ItemId); + + if (targetSpecies != SPECIES_NONE) + { + gPartyMenuUseExitCallback = TRUE; + SetWordTaskArg(taskId, tNextFunc, (u32)task); + gTasks[taskId].func = Task_TryItemUseFormChange; + gTasks[taskId].tState = 0; + gTasks[taskId].tTargetSpecies = targetSpecies; + gTasks[taskId].tAnimWait = 0; + return TRUE; + } + else + { + gPartyMenuUseExitCallback = FALSE; + PlaySE(SE_SELECT); + DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE); + ScheduleBgCopyTilemapToVram(2); + gTasks[taskId].func = task; + return FALSE; + } +} + +void ItemUseCB_FormChange(u8 taskId, TaskFunc task) +{ + TryItemUseFormChange(taskId, task); +} + +void ItemUseCB_FormChange_ConsumedOnUse(u8 taskId, TaskFunc task) +{ + if (TryItemUseFormChange(taskId, task)) + RemoveBagItem(gSpecialVar_ItemId, 1); +} + +#undef tState +#undef tTargetSpecies +#undef tAnimWait +#undef tNextFunc + u8 GetItemEffectType(u16 item) { const u8 *itemEffect; diff --git a/src/pokemon.c b/src/pokemon.c index d5498986ae..2c98448e99 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1269,6 +1269,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_RATTATA_ALOLAN - 1] = NATIONAL_DEX_RATTATA, [SPECIES_RATICATE_ALOLAN - 1] = NATIONAL_DEX_RATICATE, [SPECIES_RAICHU_ALOLAN - 1] = NATIONAL_DEX_RAICHU, + [SPECIES_SANDSHREW_ALOLAN - 1] = NATIONAL_DEX_SANDSHREW, + [SPECIES_SANDSLASH_ALOLAN - 1] = NATIONAL_DEX_SANDSLASH, [SPECIES_VULPIX_ALOLAN - 1] = NATIONAL_DEX_VULPIX, [SPECIES_NINETALES_ALOLAN - 1] = NATIONAL_DEX_NINETALES, [SPECIES_DIGLETT_ALOLAN - 1] = NATIONAL_DEX_DIGLETT, @@ -1586,7 +1588,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = }; // Assigns all Hoenn Dex Indexes to a National Dex Index -static const u16 sHoennToNationalOrder[NUM_SPECIES - 1] = +static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = { HOENN_TO_NATIONAL(TREECKO), HOENN_TO_NATIONAL(GROVYLE), @@ -1850,6 +1852,8 @@ const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] = #include "data/pokemon/level_up_learnset_pointers.h" #include "data/pokemon/form_species_tables.h" #include "data/pokemon/form_species_table_pointers.h" +#include "data/pokemon/form_change_tables.h" +#include "data/pokemon/form_change_table_pointers.h" // SPECIES_NONE are ignored in the following two tables, so decrement before accessing these arrays to get the right result @@ -2351,80 +2355,6 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_SHAYMIN - 1] = ANIM_SHRINK_GROW, [SPECIES_ARCEUS - 1] = ANIM_CIRCULAR_VIBRATE, - //Gen 6 - [SPECIES_CHESPIN - 1] = ANIM_H_JUMPS, - [SPECIES_QUILLADIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_CHESNAUGHT - 1] = ANIM_V_SHAKE_TWICE, - [SPECIES_FENNEKIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_BRAIXEN - 1] = ANIM_SHAKE_GLOW_RED_SLOW, - [SPECIES_DELPHOX - 1] = ANIM_V_STRETCH, - [SPECIES_FROAKIE - 1] = ANIM_H_JUMPS_V_STRETCH, - [SPECIES_FROGADIER - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_GRENINJA - 1] = ANIM_SHRINK_GROW, - [SPECIES_BUNNELBY - 1] = ANIM_V_JUMPS_SMALL, - [SPECIES_DIGGERSBY - 1] = ANIM_V_SHAKE_TWICE, - [SPECIES_FLETCHLING - 1] = ANIM_H_STRETCH, - [SPECIES_FLETCHINDER - 1] = ANIM_GROW_VIBRATE, - [SPECIES_TALONFLAME - 1] = ANIM_GROW_IN_STAGES, - [SPECIES_SCATTERBUG - 1] = ANIM_H_JUMPS, - [SPECIES_SPEWPA - 1] = ANIM_V_SHAKE, - [SPECIES_VIVILLON - 1] = ANIM_H_SLIDE_WOBBLE, - [SPECIES_LITLEO - 1] = ANIM_BACK_AND_LUNGE, - [SPECIES_PYROAR - 1] = ANIM_GROW_VIBRATE, - [SPECIES_FLABEBE - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, - [SPECIES_FLOETTE - 1] = ANIM_SWING_CONVEX, - [SPECIES_FLORGES - 1] = ANIM_V_SLIDE_SLOW, - [SPECIES_SKIDDO - 1] = ANIM_H_STRETCH, - [SPECIES_GOGOAT - 1] = ANIM_V_STRETCH, - [SPECIES_PANCHAM - 1] = ANIM_V_JUMPS_SMALL, - [SPECIES_PANGORO - 1] = ANIM_V_SHAKE_TWICE, - [SPECIES_FURFROU - 1] = ANIM_H_STRETCH, - [SPECIES_ESPURR - 1] = ANIM_H_STRETCH, - [SPECIES_MEOWSTIC - 1] = ANIM_SHRINK_GROW, - [SPECIES_HONEDGE - 1] = ANIM_SWING_CONVEX, - [SPECIES_DOUBLADE - 1] = ANIM_SWING_CONVEX, - [SPECIES_AEGISLASH - 1] = ANIM_H_VIBRATE, - [SPECIES_SPRITZEE - 1] = ANIM_V_SLIDE_WOBBLE, - [SPECIES_AROMATISSE - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - [SPECIES_SWIRLIX - 1] = ANIM_H_JUMPS_V_STRETCH, - [SPECIES_SLURPUFF - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_INKAY - 1] = ANIM_V_SLIDE_WOBBLE, - [SPECIES_MALAMAR - 1] = ANIM_CIRCULAR_STRETCH_TWICE, - [SPECIES_BINACLE - 1] = ANIM_V_STRETCH, - [SPECIES_BARBARACLE - 1] = ANIM_ROTATE_UP_SLAM_DOWN, - [SPECIES_SKRELP - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, - [SPECIES_DRAGALGE - 1] = ANIM_SHRINK_GROW, - [SPECIES_CLAUNCHER - 1] = ANIM_V_JUMPS_SMALL, - [SPECIES_CLAWITZER - 1] = ANIM_BACK_AND_LUNGE, - [SPECIES_HELIOPTILE - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_HELIOLISK - 1] = ANIM_GROW_VIBRATE, - [SPECIES_TYRUNT - 1] = ANIM_V_SHAKE, - [SPECIES_TYRANTRUM - 1] = ANIM_H_SHAKE, - [SPECIES_AMAURA - 1] = ANIM_V_STRETCH, - [SPECIES_AURORUS - 1] = ANIM_V_SHAKE_TWICE, - [SPECIES_SYLVEON - 1] = ANIM_H_STRETCH, - [SPECIES_HAWLUCHA - 1] = ANIM_H_STRETCH, - [SPECIES_DEDENNE - 1] = ANIM_V_JUMPS_SMALL, - [SPECIES_CARBINK - 1] = ANIM_SWING_CONVEX, - [SPECIES_GOOMY - 1] = ANIM_CIRCULAR_STRETCH_TWICE, - [SPECIES_SLIGGOO - 1] = ANIM_H_SPRING_SLOW, - [SPECIES_GOODRA - 1] = ANIM_V_SHAKE, - [SPECIES_KLEFKI - 1] = ANIM_SWING_CONVEX, - [SPECIES_PHANTUMP - 1] = ANIM_V_SLIDE_WOBBLE, - [SPECIES_TREVENANT - 1] = ANIM_FLICKER_INCREASING, - [SPECIES_PUMPKABOO - 1] = ANIM_H_SLIDE_WOBBLE, - [SPECIES_GOURGEIST - 1] = ANIM_SWING_CONVEX, - [SPECIES_BERGMITE - 1] = ANIM_V_SHAKE, - [SPECIES_AVALUGG - 1] = ANIM_ROTATE_UP_SLAM_DOWN, - [SPECIES_NOIBAT - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, - [SPECIES_NOIVERN - 1] = ANIM_GROW_VIBRATE, - [SPECIES_XERNEAS - 1] = ANIM_GLOW_YELLOW, - [SPECIES_YVELTAL - 1] = ANIM_SHAKE_GLOW_BLACK_SLOW, - [SPECIES_ZYGARDE - 1] = ANIM_GROW_VIBRATE, - [SPECIES_DIANCIE - 1] = ANIM_SWING_CONVEX, - [SPECIES_HOOPA - 1] = ANIM_ZIGZAG_SLOW, - [SPECIES_VOLCANION - 1] = ANIM_V_SHAKE, - // Gen 5 Todo: Assign proper ones. [SPECIES_VICTINI - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SNIVY - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2453,7 +2383,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_MUSHARNA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_PIDOVE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TRANQUILL - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_UNFEZANT - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_UNFEZANT - 1] = ANIM_V_STRETCH, [SPECIES_BLITZLE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ZEBSTRIKA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ROGGENROLA - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2583,6 +2513,80 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_MELOETTA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_GENESECT - 1] = ANIM_V_SQUISH_AND_BOUNCE, + //Gen 6 + [SPECIES_CHESPIN - 1] = ANIM_H_JUMPS, + [SPECIES_QUILLADIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_CHESNAUGHT - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_FENNEKIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_BRAIXEN - 1] = ANIM_SHAKE_GLOW_RED_SLOW, + [SPECIES_DELPHOX - 1] = ANIM_V_STRETCH, + [SPECIES_FROAKIE - 1] = ANIM_H_JUMPS_V_STRETCH, + [SPECIES_FROGADIER - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_GRENINJA - 1] = ANIM_SHRINK_GROW, + [SPECIES_BUNNELBY - 1] = ANIM_V_JUMPS_SMALL, + [SPECIES_DIGGERSBY - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_FLETCHLING - 1] = ANIM_H_STRETCH, + [SPECIES_FLETCHINDER - 1] = ANIM_GROW_VIBRATE, + [SPECIES_TALONFLAME - 1] = ANIM_GROW_IN_STAGES, + [SPECIES_SCATTERBUG - 1] = ANIM_H_JUMPS, + [SPECIES_SPEWPA - 1] = ANIM_V_SHAKE, + [SPECIES_VIVILLON - 1] = ANIM_H_SLIDE_WOBBLE, + [SPECIES_LITLEO - 1] = ANIM_BACK_AND_LUNGE, + [SPECIES_PYROAR - 1] = ANIM_GROW_VIBRATE, + [SPECIES_FLABEBE - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, + [SPECIES_FLOETTE - 1] = ANIM_SWING_CONVEX, + [SPECIES_FLORGES - 1] = ANIM_V_SLIDE_SLOW, + [SPECIES_SKIDDO - 1] = ANIM_H_STRETCH, + [SPECIES_GOGOAT - 1] = ANIM_V_STRETCH, + [SPECIES_PANCHAM - 1] = ANIM_V_JUMPS_SMALL, + [SPECIES_PANGORO - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_FURFROU - 1] = ANIM_H_STRETCH, + [SPECIES_ESPURR - 1] = ANIM_H_STRETCH, + [SPECIES_MEOWSTIC - 1] = ANIM_SHRINK_GROW, + [SPECIES_HONEDGE - 1] = ANIM_SWING_CONVEX, + [SPECIES_DOUBLADE - 1] = ANIM_SWING_CONVEX, + [SPECIES_AEGISLASH - 1] = ANIM_H_VIBRATE, + [SPECIES_SPRITZEE - 1] = ANIM_V_SLIDE_WOBBLE, + [SPECIES_AROMATISSE - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, + [SPECIES_SWIRLIX - 1] = ANIM_H_JUMPS_V_STRETCH, + [SPECIES_SLURPUFF - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_INKAY - 1] = ANIM_V_SLIDE_WOBBLE, + [SPECIES_MALAMAR - 1] = ANIM_CIRCULAR_STRETCH_TWICE, + [SPECIES_BINACLE - 1] = ANIM_V_STRETCH, + [SPECIES_BARBARACLE - 1] = ANIM_ROTATE_UP_SLAM_DOWN, + [SPECIES_SKRELP - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, + [SPECIES_DRAGALGE - 1] = ANIM_SHRINK_GROW, + [SPECIES_CLAUNCHER - 1] = ANIM_V_JUMPS_SMALL, + [SPECIES_CLAWITZER - 1] = ANIM_BACK_AND_LUNGE, + [SPECIES_HELIOPTILE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_HELIOLISK - 1] = ANIM_GROW_VIBRATE, + [SPECIES_TYRUNT - 1] = ANIM_V_SHAKE, + [SPECIES_TYRANTRUM - 1] = ANIM_H_SHAKE, + [SPECIES_AMAURA - 1] = ANIM_V_STRETCH, + [SPECIES_AURORUS - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_SYLVEON - 1] = ANIM_H_STRETCH, + [SPECIES_HAWLUCHA - 1] = ANIM_H_STRETCH, + [SPECIES_DEDENNE - 1] = ANIM_V_JUMPS_SMALL, + [SPECIES_CARBINK - 1] = ANIM_SWING_CONVEX, + [SPECIES_GOOMY - 1] = ANIM_CIRCULAR_STRETCH_TWICE, + [SPECIES_SLIGGOO - 1] = ANIM_H_SPRING_SLOW, + [SPECIES_GOODRA - 1] = ANIM_V_SHAKE, + [SPECIES_KLEFKI - 1] = ANIM_SWING_CONVEX, + [SPECIES_PHANTUMP - 1] = ANIM_V_SLIDE_WOBBLE, + [SPECIES_TREVENANT - 1] = ANIM_FLICKER_INCREASING, + [SPECIES_PUMPKABOO - 1] = ANIM_H_SLIDE_WOBBLE, + [SPECIES_GOURGEIST - 1] = ANIM_SWING_CONVEX, + [SPECIES_BERGMITE - 1] = ANIM_V_SHAKE, + [SPECIES_AVALUGG - 1] = ANIM_ROTATE_UP_SLAM_DOWN, + [SPECIES_NOIBAT - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, + [SPECIES_NOIVERN - 1] = ANIM_GROW_VIBRATE, + [SPECIES_XERNEAS - 1] = ANIM_GLOW_YELLOW, + [SPECIES_YVELTAL - 1] = ANIM_SHAKE_GLOW_BLACK_SLOW, + [SPECIES_ZYGARDE - 1] = ANIM_GROW_VIBRATE, + [SPECIES_DIANCIE - 1] = ANIM_SWING_CONVEX, + [SPECIES_HOOPA - 1] = ANIM_ZIGZAG_SLOW, + [SPECIES_VOLCANION - 1] = ANIM_V_SHAKE, + // Gen 7 [SPECIES_ROWLET - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DARTRIX - 1] = ANIM_H_STRETCH, @@ -2765,11 +2769,28 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_CALYREX - 1] = ANIM_V_SQUISH_AND_BOUNCE, // Forms - [SPECIES_ROTOM_HEAT - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_FROST - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_FAN - 1] = ANIM_FIGURE_8, - [SPECIES_ROTOM_MOW - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_WASH - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_HEAT - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_FROST - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_FAN - 1] = ANIM_FIGURE_8, + [SPECIES_ROTOM_MOW - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_WASH - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ARCEUS_FIGHTING - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FLYING - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_POISON - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GROUND - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ROCK - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_BUG - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GHOST - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_STEEL - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FIRE - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_WATER - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GRASS - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ELECTRIC - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_PSYCHIC - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ICE - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_DRAGON - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_DARK - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FAIRY - 1] = ANIM_CIRCULAR_VIBRATE, }; static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = @@ -4102,13 +4123,11 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality) u32 GetUnownSpeciesId(u32 personality) { - return GetUnownLetterByPersonality(personality) + SPECIES_UNOWN_B - 1; //TODO - /* u16 unownLetter = GetUnownLetterByPersonality(personality); + if (unownLetter == 0) return SPECIES_UNOWN; return unownLetter + SPECIES_UNOWN_B - 1; - */ } void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition) @@ -6408,7 +6427,8 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, u break; case EVO_LEVEL_RAIN: j = GetCurrentWeather(); - if (j == WEATHER_RAIN || j == WEATHER_RAIN_THUNDERSTORM || j == WEATHER_DOWNPOUR) + if (gEvolutionTable[species][i].param <= level + && (j == WEATHER_RAIN || j == WEATHER_RAIN_THUNDERSTORM || j == WEATHER_DOWNPOUR)) targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_MAPSEC: @@ -8024,3 +8044,65 @@ u8 GetFormIdFromFormSpeciesId(u16 formSpeciesId) } return targetFormId; } + +// returns SPECIES_NONE if no form change is possible +u16 GetFormChangeTargetSpecies(struct Pokemon *mon, u16 method, u32 arg) +{ + u32 i; + u16 targetSpecies = SPECIES_NONE; + u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); + const struct FormChange *formChanges = gFormChangeTablePointers[species]; + u16 heldItem; + u32 ability; + + if (formChanges != NULL) + { + heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, NULL); + ability = GetAbilityBySpecies(species, GetMonData(mon, MON_DATA_ABILITY_NUM, NULL)); + + for (i = 0; formChanges[i].method != FORM_CHANGE_END; i++) + { + if (method == formChanges[i].method) + { + switch (method) + { + case FORM_ITEM_HOLD: + if (heldItem == formChanges[i].param1) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_ITEM_USE: + if (arg == formChanges[i].param1) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_MOVE: + if (MonKnowsMove(mon, formChanges[i].param1) != formChanges[i].param2) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_ITEM_HOLD_ABILITY: + if (heldItem == formChanges[i].param1 && ability == formChanges[i].param2) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_ITEM_USE_TIME: + RtcCalcLocalTime(); + if (arg == formChanges[i].param1) + { + switch (formChanges[i].param2) + { + case DAY: + if (gLocalTime.hours >= 12 && gLocalTime.hours < 24) + targetSpecies = formChanges[i].targetSpecies; + break; + case NIGHT: + if (gLocalTime.hours >= 0 && gLocalTime.hours < 12) + targetSpecies = formChanges[i].targetSpecies; + break; + } + } + break; + } + } + } + } + + return species != targetSpecies ? targetSpecies : SPECIES_NONE; +} diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index d322f17041..c7d77d98ad 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -844,8 +844,8 @@ const u8 *const gMonIconTable[] = [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_SKWOVET] = gMonIcon_Skwovet, + [SPECIES_GREEDENT] = gMonIcon_Greedent, [SPECIES_ROOKIDEE] = gMonIcon_Rookidee, [SPECIES_CORVISQUIRE] = gMonIcon_Corvisquire, [SPECIES_CORVIKNIGHT] = gMonIcon_Corviknight, @@ -871,9 +871,9 @@ const u8 *const gMonIconTable[] = [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_ARROKUDA] = gMonIcon_Arrokuda, + [SPECIES_BARRASKEWDA] = gMonIcon_Barraskewda, + [SPECIES_TOXEL] = gMonIcon_Toxel, [SPECIES_TOXTRICITY] = gMonIcon_Toxtricity, [SPECIES_SIZZLIPEDE] = gMonIcon_Sizzlipede, [SPECIES_CENTISKORCH] = gMonIcon_Centiskorch, @@ -894,9 +894,9 @@ const u8 *const gMonIconTable[] = [SPECIES_MR_RIME] = gMonIcon_MrRime, [SPECIES_RUNERIGUS] = gMonIcon_Runerigus, [SPECIES_MILCERY] = gMonIcon_Milcery, - [SPECIES_ALCREMIE] = gMonIcon_QuestionMark,//gMonIcon_Alcremie, + [SPECIES_ALCREMIE] = gMonIcon_Alcremie, [SPECIES_FALINKS] = gMonIcon_Falinks, - [SPECIES_PINCURCHIN] = gMonIcon_QuestionMark,//gMonIcon_Pincurchin, + [SPECIES_PINCURCHIN] = gMonIcon_Pincurchin, [SPECIES_SNOM] = gMonIcon_Snom, [SPECIES_FROSMOTH] = gMonIcon_Frosmoth, [SPECIES_STONJOURNER] = gMonIcon_Stonjourner, @@ -905,10 +905,10 @@ const u8 *const gMonIconTable[] = [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_DRACOZOLT] = gMonIcon_Dracozolt, + [SPECIES_ARCTOZOLT] = gMonIcon_Arctozolt, + [SPECIES_DRACOVISH] = gMonIcon_Dracovish, + [SPECIES_ARCTOVISH] = gMonIcon_Arctovish, [SPECIES_DURALUDON] = gMonIcon_Duraludon, [SPECIES_DREEPY] = gMonIcon_Dreepy, [SPECIES_DRAKLOAK] = gMonIcon_Drakloak, @@ -916,13 +916,13 @@ const u8 *const gMonIconTable[] = [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_KUBFU] = gMonIcon_Kubfu, + [SPECIES_URSHIFU] = gMonIcon_Urshifu, + [SPECIES_ZARUDE] = gMonIcon_Zarude, + [SPECIES_REGIELEKI] = gMonIcon_Regieleki, + [SPECIES_REGIDRAGO] = gMonIcon_Regidrago, + [SPECIES_GLASTRIER] = gMonIcon_Glastrier, + [SPECIES_SPECTRIER] = gMonIcon_Spectrier, [SPECIES_CALYREX] = gMonIcon_QuestionMark,//gMonIcon_Calyrex, [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, @@ -995,15 +995,15 @@ const u8 *const gMonIconTable[] = [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_SLOWPOKE_GALARIAN] = gMonIcon_SlowpokeGalarian, + [SPECIES_SLOWBRO_GALARIAN] = 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_ARTICUNO_GALARIAN] = gMonIcon_ArticunoGalarian, + [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_ZapdosGalarian, + [SPECIES_MOLTRES_GALARIAN] = gMonIcon_MoltresGalarian, + [SPECIES_SLOWKING_GALARIAN] = gMonIcon_SlowkingGalarian, [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian, [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian, [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, @@ -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,//gMonIcon_DarmanitanZenModeGalarian, + [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_DarmanitanZenModeGalarian, [SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer, [SPECIES_DEERLING_AUTUMN] = gMonIcon_DeerlingAutumn, [SPECIES_DEERLING_WINTER] = gMonIcon_DeerlingWinter, @@ -1227,9 +1227,9 @@ const u8 *const gMonIconTable[] = [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_ETERNATUS_ETERNAMAX] = gMonIcon_EternatusEternamax, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_Urshifu, + [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada, [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_QuestionMark,//gMonIcon_CalyrexIceRider, [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_QuestionMark,//gMonIcon_CalyrexShadowRider, [SPECIES_EGG] = gMonIcon_Egg, @@ -1238,6 +1238,13 @@ const u8 *const gMonIconTable[] = const u8 *const gMonIconTableFemale[] = { [SPECIES_EEVEE] = gMonIcon_Eevee, + [SPECIES_COMBEE] = gMonIcon_Combee, + [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, + [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, + [SPECIES_UNFEZANT] = gMonIcon_UnfezantF, + [SPECIES_FRILLISH] = gMonIcon_FrillishF, + [SPECIES_JELLICENT] = gMonIcon_JellicentF, + [SPECIES_PYROAR] = gMonIcon_PyroarF, }; const u8 gMonIconPaletteIndices[] = @@ -2060,7 +2067,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SOBBLE] = 2, [SPECIES_DRIZZILE] = 2, [SPECIES_INTELEON] = 0, - [SPECIES_SKWOVET] = 0, + [SPECIES_SKWOVET] = 2, [SPECIES_GREEDENT] = 0, [SPECIES_ROOKIDEE] = 0, [SPECIES_CORVISQUIRE] = 0, @@ -2087,9 +2094,9 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SILICOBRA] = 1, [SPECIES_SANDACONDA] = 1, [SPECIES_CRAMORANT] = 0, - [SPECIES_ARROKUDA] = 0, - [SPECIES_BARRASKEWDA] = 0, - [SPECIES_TOXEL] = 0, + [SPECIES_ARROKUDA] = 2, + [SPECIES_BARRASKEWDA] = 2, + [SPECIES_TOXEL] = 2, [SPECIES_TOXTRICITY] = 2, [SPECIES_SIZZLIPEDE] = 0, [SPECIES_CENTISKORCH] = 0, @@ -2110,7 +2117,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MR_RIME] = 0, [SPECIES_RUNERIGUS] = 2, [SPECIES_MILCERY] = 1, - [SPECIES_ALCREMIE] = 0, + [SPECIES_ALCREMIE] = 1, [SPECIES_FALINKS] = 0, [SPECIES_PINCURCHIN] = 0, [SPECIES_SNOM] = 0, @@ -2121,8 +2128,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MORPEKO] = 2, [SPECIES_CUFANT] = 0, [SPECIES_COPPERAJAH] = 0, - [SPECIES_DRACOZOLT] = 0, - [SPECIES_ARCTOZOLT] = 0, + [SPECIES_DRACOZOLT] = 1, + [SPECIES_ARCTOZOLT] = 2, [SPECIES_DRACOVISH] = 0, [SPECIES_ARCTOVISH] = 0, [SPECIES_DURALUDON] = 0, @@ -2132,11 +2139,11 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZACIAN] = 2, [SPECIES_ZAMAZENTA] = 2, [SPECIES_ETERNATUS] = 0, - [SPECIES_KUBFU] = 0, - [SPECIES_URSHIFU] = 0, - [SPECIES_ZARUDE] = 0, + [SPECIES_KUBFU] = 1, + [SPECIES_URSHIFU] = 2, + [SPECIES_ZARUDE] = 1, [SPECIES_REGIELEKI] = 0, - [SPECIES_REGIDRAGO] = 0, + [SPECIES_REGIDRAGO] = 2, [SPECIES_GLASTRIER] = 0, [SPECIES_SPECTRIER] = 0, [SPECIES_CALYREX] = 0, @@ -2211,15 +2218,15 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MEOWTH_GALARIAN] = 0, [SPECIES_PONYTA_GALARIAN] = 2, [SPECIES_RAPIDASH_GALARIAN] = 2, - [SPECIES_SLOWPOKE_GALARIAN] = 0, + [SPECIES_SLOWPOKE_GALARIAN] = 1, [SPECIES_SLOWBRO_GALARIAN] = 0, [SPECIES_FARFETCHD_GALARIAN] = 1, [SPECIES_WEEZING_GALARIAN] = 1, [SPECIES_MR_MIME_GALARIAN] = 0, - [SPECIES_ARTICUNO_GALARIAN] = 0, + [SPECIES_ARTICUNO_GALARIAN] = 2, [SPECIES_ZAPDOS_GALARIAN] = 0, [SPECIES_MOLTRES_GALARIAN] = 0, - [SPECIES_SLOWKING_GALARIAN] = 0, + [SPECIES_SLOWKING_GALARIAN] = 2, [SPECIES_CORSOLA_GALARIAN] = 0, [SPECIES_ZIGZAGOON_GALARIAN] = 0, [SPECIES_LINOONE_GALARIAN] = 0, @@ -2409,8 +2416,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZACIAN_CROWNED_SWORD] = 2, [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = 2, [SPECIES_ETERNATUS_ETERNAMAX] = 0, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = 0, - [SPECIES_ZARUDE_DADA] = 0, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = 2, + [SPECIES_ZARUDE_DADA] = 1, [SPECIES_CALYREX_ICE_RIDER] = 0, [SPECIES_CALYREX_SHADOW_RIDER] = 0, [SPECIES_EGG] = 1, @@ -2419,6 +2426,13 @@ const u8 gMonIconPaletteIndices[] = const u8 gMonIconPaletteIndicesFemale[] = { [SPECIES_EEVEE] = 2, + [SPECIES_COMBEE] = 0, + [SPECIES_HIPPOPOTAS] = 1, + [SPECIES_HIPPOWDON] = 1, + [SPECIES_UNFEZANT] = 1, + [SPECIES_FRILLISH] = 1, + [SPECIES_JELLICENT] = 1, + [SPECIES_PYROAR] = 2, }; const struct SpritePalette gMonIconPaletteTable[] = diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 8cbfa71a9f..ce72b434e5 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -150,6 +150,7 @@ enum { }; #define MENU_WALLPAPER_SETS_START MENU_SCENERY_1 #define MENU_WALLPAPERS_START MENU_FOREST +#define GENDER_MASK 0x7FFF // Return IDs for input handlers enum { @@ -5104,6 +5105,10 @@ static u16 TryLoadMonIconTiles(u16 species, u32 personality) { u16 i, offset; + // Treat female mons as a seperate species as they may have a different icon than males + if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) + species |= 0x8000; // 1 << 15 + // Search icon list for this species for (i = 0; i < MAX_MON_ICONS; i++) { @@ -5130,6 +5135,7 @@ static u16 TryLoadMonIconTiles(u16 species, u32 personality) sStorage->iconSpeciesList[i] = species; sStorage->numIconsPerSpecies[i]++; offset = 16 * i; + species &= GENDER_MASK; CpuCopy32(GetMonIconTiles(species, personality), (void*)(OBJ_VRAM0) + offset * 32, 0x200); return offset; @@ -5138,10 +5144,20 @@ static u16 TryLoadMonIconTiles(u16 species, u32 personality) static void RemoveSpeciesFromIconList(u16 species) { u16 i; + bool8 hasFemale = FALSE; for (i = 0; i < MAX_MON_ICONS; i++) { - if (sStorage->iconSpeciesList[i] == species) + if (sStorage->iconSpeciesList[i] == (species | 0x8000)) + { + hasFemale = TRUE; + break; + } + } + + for (i = 0; i < MAX_MON_ICONS; i++) + { + if (sStorage->iconSpeciesList[i] == species && !hasFemale) { if (--sStorage->numIconsPerSpecies[i] == 0) sStorage->iconSpeciesList[i] = SPECIES_NONE; @@ -5157,7 +5173,15 @@ static struct Sprite *CreateMonIconSprite(u16 species, u32 personality, s16 x, s struct SpriteTemplate template = sSpriteTemplate_MonIcon; species = GetIconSpecies(species, personality); - template.paletteTag = PALTAG_MON_ICON_0 + gMonIconPaletteIndices[species]; + if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE) + { + template.paletteTag = PALTAG_MON_ICON_0 + gMonIconPaletteIndicesFemale[species]; + } + else + { + template.paletteTag = PALTAG_MON_ICON_0 + gMonIconPaletteIndices[species]; + } + tileNum = TryLoadMonIconTiles(species, personality); if (tileNum == 0xFFFF) return NULL; diff --git a/src/strings.c b/src/strings.c index 492a9601d2..853c6a3b1b 100644 --- a/src/strings.c +++ b/src/strings.c @@ -423,6 +423,7 @@ const u8 gText_PkmnAdoresBaseVar2Fell[] = _("{STR_VAR_1} adores you!\nThe base { const u8 gText_PkmnFriendlyBaseVar2CantFall[] = _("{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} can't fall!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnSnappedOutOfConfusion[] = _("{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnGotOverInfatuation[] = _("{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnTransformed[] = _("{STR_VAR_1} transformed!{PAUSE_UNTIL_PRESS}"); const u8 gText_ThrowAwayItem[] = _("Throw away this\n{STR_VAR_1}?"); const u8 gText_ItemThrownAway[] = _("The {STR_VAR_1}\nwas thrown away.{PAUSE_UNTIL_PRESS}"); const u8 gText_TeachWhichPokemon2[] = _("Teach which POKéMON?"); // Unused diff --git a/src/trade.c b/src/trade.c index a4eeaabe66..ba07b9291b 100644 --- a/src/trade.c +++ b/src/trade.c @@ -4226,7 +4226,7 @@ static bool8 AnimateTradeSequenceWireless(void) if (gSprites[sTradeData->bouncingPokeballSpriteId].callback == SpriteCallbackDummy) { HandleLoadSpecialPokePic(&gMonFrontPicTable[sTradeData->monSpecies[TRADE_PARTNER]], - gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], + gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT], sTradeData->monSpecies[TRADE_PARTNER], sTradeData->monPersonalities[TRADE_PARTNER]); sTradeData->state++;