diff --git a/graphics/pokemon/aegislash/footprint.png b/graphics/pokemon/aegislash/footprint.png new file mode 100644 index 000000000..90850b474 Binary files /dev/null and b/graphics/pokemon/aegislash/footprint.png differ diff --git a/graphics/pokemon/alcremie/icon.png b/graphics/pokemon/alcremie/icon.png new file mode 100644 index 000000000..31cf9e47c Binary files /dev/null and b/graphics/pokemon/alcremie/icon.png differ diff --git a/graphics/pokemon/amaura/footprint.png b/graphics/pokemon/amaura/footprint.png new file mode 100644 index 000000000..59e6de954 Binary files /dev/null and b/graphics/pokemon/amaura/footprint.png differ diff --git a/graphics/pokemon/arctovish/icon.png b/graphics/pokemon/arctovish/icon.png new file mode 100644 index 000000000..216061229 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 000000000..73dbd1e67 Binary files /dev/null and b/graphics/pokemon/arctozolt/icon.png differ diff --git a/graphics/pokemon/aromatisse/footprint.png b/graphics/pokemon/aromatisse/footprint.png new file mode 100644 index 000000000..b4df4e542 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 000000000..f724cc357 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 000000000..ce061cbc0 Binary files /dev/null and b/graphics/pokemon/articuno/galarian/icon.png differ diff --git a/graphics/pokemon/aurorus/footprint.png b/graphics/pokemon/aurorus/footprint.png new file mode 100644 index 000000000..bb11fc27d Binary files /dev/null and b/graphics/pokemon/aurorus/footprint.png differ diff --git a/graphics/pokemon/avalugg/footprint.png b/graphics/pokemon/avalugg/footprint.png new file mode 100644 index 000000000..bbed0cff2 Binary files /dev/null and b/graphics/pokemon/avalugg/footprint.png differ diff --git a/graphics/pokemon/barbaracle/footprint.png b/graphics/pokemon/barbaracle/footprint.png new file mode 100644 index 000000000..b36b1c3ee 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 000000000..c0aed5b3d Binary files /dev/null and b/graphics/pokemon/barraskewda/icon.png differ diff --git a/graphics/pokemon/bergmite/footprint.png b/graphics/pokemon/bergmite/footprint.png new file mode 100644 index 000000000..78eeb7b03 Binary files /dev/null and b/graphics/pokemon/bergmite/footprint.png differ diff --git a/graphics/pokemon/binacle/footprint.png b/graphics/pokemon/binacle/footprint.png new file mode 100644 index 000000000..9430d4250 Binary files /dev/null and b/graphics/pokemon/binacle/footprint.png differ diff --git a/graphics/pokemon/braixen/footprint.png b/graphics/pokemon/braixen/footprint.png new file mode 100644 index 000000000..1efae6710 Binary files /dev/null and b/graphics/pokemon/braixen/footprint.png differ diff --git a/graphics/pokemon/bunnelby/footprint.png b/graphics/pokemon/bunnelby/footprint.png new file mode 100644 index 000000000..b7ea8db09 Binary files /dev/null and b/graphics/pokemon/bunnelby/footprint.png differ diff --git a/graphics/pokemon/carbink/footprint.png b/graphics/pokemon/carbink/footprint.png new file mode 100644 index 000000000..9fcdf683a Binary files /dev/null and b/graphics/pokemon/carbink/footprint.png differ diff --git a/graphics/pokemon/chesnaught/footprint.png b/graphics/pokemon/chesnaught/footprint.png new file mode 100644 index 000000000..0f9d51ed7 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 000000000..5b3235b71 Binary files /dev/null and b/graphics/pokemon/chespin/footprint.png differ diff --git a/graphics/pokemon/clauncher/footprint.png b/graphics/pokemon/clauncher/footprint.png new file mode 100644 index 000000000..201ec9bb6 Binary files /dev/null and b/graphics/pokemon/clauncher/footprint.png differ diff --git a/graphics/pokemon/clawitzer/footprint.png b/graphics/pokemon/clawitzer/footprint.png new file mode 100644 index 000000000..9d7bc6a1a Binary files /dev/null and b/graphics/pokemon/clawitzer/footprint.png differ diff --git a/graphics/pokemon/combee/anim_front.png b/graphics/pokemon/combee/anim_front.png index 45acd64e3..2c07de339 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 000000000..45acd64e3 Binary files /dev/null and b/graphics/pokemon/combee/anim_frontf.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 000000000..f09b978ea Binary files /dev/null and b/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png differ diff --git a/graphics/pokemon/dedenne/footprint.png b/graphics/pokemon/dedenne/footprint.png new file mode 100644 index 000000000..275b3dc7b Binary files /dev/null and b/graphics/pokemon/dedenne/footprint.png differ diff --git a/graphics/pokemon/delphox/footprint.png b/graphics/pokemon/delphox/footprint.png new file mode 100644 index 000000000..abb8462b3 Binary files /dev/null and b/graphics/pokemon/delphox/footprint.png differ diff --git a/graphics/pokemon/diancie/footprint.png b/graphics/pokemon/diancie/footprint.png new file mode 100644 index 000000000..9f46f6003 Binary files /dev/null and b/graphics/pokemon/diancie/footprint.png differ diff --git a/graphics/pokemon/diggersby/footprint.png b/graphics/pokemon/diggersby/footprint.png new file mode 100644 index 000000000..997244c7c Binary files /dev/null and b/graphics/pokemon/diggersby/footprint.png differ diff --git a/graphics/pokemon/doublade/footprint.png b/graphics/pokemon/doublade/footprint.png new file mode 100644 index 000000000..eac01614e 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 000000000..f998dea50 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 000000000..68c3fe780 Binary files /dev/null and b/graphics/pokemon/dracozolt/icon.png differ diff --git a/graphics/pokemon/dragalge/footprint.png b/graphics/pokemon/dragalge/footprint.png new file mode 100644 index 000000000..4320ad16d Binary files /dev/null and b/graphics/pokemon/dragalge/footprint.png differ diff --git a/graphics/pokemon/dustox/back.png b/graphics/pokemon/dustox/back.png index 6ea0c4752..b096c87cf 100644 Binary files a/graphics/pokemon/dustox/back.png and b/graphics/pokemon/dustox/back.png differ diff --git a/graphics/pokemon/espurr/footprint.png b/graphics/pokemon/espurr/footprint.png new file mode 100644 index 000000000..ce84d4ad3 Binary files /dev/null and b/graphics/pokemon/espurr/footprint.png differ diff --git a/graphics/pokemon/eternatus/eternamax/icon.png b/graphics/pokemon/eternatus/eternamax/icon.png new file mode 100644 index 000000000..32f5548b7 Binary files /dev/null and b/graphics/pokemon/eternatus/eternamax/icon.png differ diff --git a/graphics/pokemon/fennekin/footprint.png b/graphics/pokemon/fennekin/footprint.png new file mode 100644 index 000000000..6d63066d1 Binary files /dev/null and b/graphics/pokemon/fennekin/footprint.png differ diff --git a/graphics/pokemon/flabebe/footprint.png b/graphics/pokemon/flabebe/footprint.png new file mode 100644 index 000000000..e36ead8b4 Binary files /dev/null and b/graphics/pokemon/flabebe/footprint.png differ diff --git a/graphics/pokemon/fletchinder/footprint.png b/graphics/pokemon/fletchinder/footprint.png new file mode 100644 index 000000000..964998764 Binary files /dev/null and b/graphics/pokemon/fletchinder/footprint.png differ diff --git a/graphics/pokemon/fletchling/footprint.png b/graphics/pokemon/fletchling/footprint.png new file mode 100644 index 000000000..164e6b88f Binary files /dev/null and b/graphics/pokemon/fletchling/footprint.png differ diff --git a/graphics/pokemon/floette/footprint.png b/graphics/pokemon/floette/footprint.png new file mode 100644 index 000000000..fc6240d71 Binary files /dev/null and b/graphics/pokemon/floette/footprint.png differ diff --git a/graphics/pokemon/florges/footprint.png b/graphics/pokemon/florges/footprint.png new file mode 100644 index 000000000..09e52b3cd Binary files /dev/null and b/graphics/pokemon/florges/footprint.png differ diff --git a/graphics/pokemon/frillish/anim_frontf.png b/graphics/pokemon/frillish/anim_frontf.png new file mode 100644 index 000000000..ae2c2ecee 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 000000000..ac2074aa6 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 000000000..a0e102316 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 000000000..252ae04b6 --- /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 000000000..e0fe6a29d --- /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/footprint.png b/graphics/pokemon/froakie/footprint.png new file mode 100644 index 000000000..3c3ada42a Binary files /dev/null and b/graphics/pokemon/froakie/footprint.png differ diff --git a/graphics/pokemon/frogadier/footprint.png b/graphics/pokemon/frogadier/footprint.png new file mode 100644 index 000000000..d19aa2f7a Binary files /dev/null and b/graphics/pokemon/frogadier/footprint.png differ diff --git a/graphics/pokemon/furfrou/footprint.png b/graphics/pokemon/furfrou/footprint.png new file mode 100644 index 000000000..32ceac681 Binary files /dev/null and b/graphics/pokemon/furfrou/footprint.png differ diff --git a/graphics/pokemon/glastrier/icon.png b/graphics/pokemon/glastrier/icon.png new file mode 100644 index 000000000..98bfdc8b4 Binary files /dev/null and b/graphics/pokemon/glastrier/icon.png differ diff --git a/graphics/pokemon/gogoat/footprint.png b/graphics/pokemon/gogoat/footprint.png new file mode 100644 index 000000000..a74181123 Binary files /dev/null and b/graphics/pokemon/gogoat/footprint.png differ diff --git a/graphics/pokemon/goodra/footprint.png b/graphics/pokemon/goodra/footprint.png new file mode 100644 index 000000000..875eae332 Binary files /dev/null and b/graphics/pokemon/goodra/footprint.png differ diff --git a/graphics/pokemon/goomy/footprint.png b/graphics/pokemon/goomy/footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/goomy/footprint.png differ diff --git a/graphics/pokemon/gourgeist/footprint.png b/graphics/pokemon/gourgeist/footprint.png new file mode 100644 index 000000000..847f141b3 Binary files /dev/null and b/graphics/pokemon/gourgeist/footprint.png differ diff --git a/graphics/pokemon/greedent/icon.png b/graphics/pokemon/greedent/icon.png new file mode 100644 index 000000000..8e37b0467 Binary files /dev/null and b/graphics/pokemon/greedent/icon.png differ diff --git a/graphics/pokemon/greninja/footprint.png b/graphics/pokemon/greninja/footprint.png new file mode 100644 index 000000000..c567377ea Binary files /dev/null and b/graphics/pokemon/greninja/footprint.png differ diff --git a/graphics/pokemon/hawlucha/footprint.png b/graphics/pokemon/hawlucha/footprint.png new file mode 100644 index 000000000..830e22710 Binary files /dev/null and b/graphics/pokemon/hawlucha/footprint.png differ diff --git a/graphics/pokemon/heliolisk/footprint.png b/graphics/pokemon/heliolisk/footprint.png new file mode 100644 index 000000000..583bc7062 Binary files /dev/null and b/graphics/pokemon/heliolisk/footprint.png differ diff --git a/graphics/pokemon/helioptile/footprint.png b/graphics/pokemon/helioptile/footprint.png new file mode 100644 index 000000000..40dddcd79 Binary files /dev/null and b/graphics/pokemon/helioptile/footprint.png differ diff --git a/graphics/pokemon/hippopotas/anim_front.png b/graphics/pokemon/hippopotas/anim_front.png index 9a0d3ff15..8de30eae6 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 000000000..8a0b675bb 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 000000000..1a7413613 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 000000000..8cc92aae7 --- /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 000000000..1e125f071 --- /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 8a9297b4d..f6a4cbf28 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 000000000..1cfc725e9 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 000000000..566672e45 --- /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 000000000..6e0015ed0 --- /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/footprint.png b/graphics/pokemon/honedge/footprint.png new file mode 100644 index 000000000..8b00665b7 Binary files /dev/null and b/graphics/pokemon/honedge/footprint.png differ diff --git a/graphics/pokemon/hoopa/footprint.png b/graphics/pokemon/hoopa/footprint.png new file mode 100644 index 000000000..b7c5cea6a Binary files /dev/null and b/graphics/pokemon/hoopa/footprint.png differ diff --git a/graphics/pokemon/inkay/footprint.png b/graphics/pokemon/inkay/footprint.png new file mode 100644 index 000000000..479353ffc 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 000000000..110df92f5 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 000000000..6471d3bac 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 792c86334..3b508d92c 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 000000000..a6abfa5ce 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 000000000..8acd5fa05 --- /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 000000000..b4d93cd75 --- /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/footprint.png b/graphics/pokemon/klefki/footprint.png new file mode 100644 index 000000000..b0616c0ff 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 000000000..ea6d8c10e Binary files /dev/null and b/graphics/pokemon/kubfu/icon.png differ diff --git a/graphics/pokemon/litleo/footprint.png b/graphics/pokemon/litleo/footprint.png new file mode 100644 index 000000000..586e858ad Binary files /dev/null and b/graphics/pokemon/litleo/footprint.png differ diff --git a/graphics/pokemon/malamar/footprint.png b/graphics/pokemon/malamar/footprint.png new file mode 100644 index 000000000..9987a2282 Binary files /dev/null and b/graphics/pokemon/malamar/footprint.png differ diff --git a/graphics/pokemon/meowstic/footprint.png b/graphics/pokemon/meowstic/footprint.png new file mode 100644 index 000000000..7570dd401 Binary files /dev/null and b/graphics/pokemon/meowstic/footprint.png differ diff --git a/graphics/pokemon/mienshao/anim_front.png b/graphics/pokemon/mienshao/anim_front.png index 6d7556bc4..181f6570b 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 078968ad2..67f9c89d9 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 651c14095..7a701f79d 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 a805425f0..9ece7373e 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 47739a4d4..46e53fc41 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 2edba04c6..7737a6887 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 000000000..90edae521 Binary files /dev/null and b/graphics/pokemon/moltres/galarian/icon.png differ diff --git a/graphics/pokemon/noibat/footprint.png b/graphics/pokemon/noibat/footprint.png new file mode 100644 index 000000000..f89c16499 Binary files /dev/null and b/graphics/pokemon/noibat/footprint.png differ diff --git a/graphics/pokemon/noivern/footprint.png b/graphics/pokemon/noivern/footprint.png new file mode 100644 index 000000000..f83fb1d3e Binary files /dev/null and b/graphics/pokemon/noivern/footprint.png differ diff --git a/graphics/pokemon/pancham/footprint.png b/graphics/pokemon/pancham/footprint.png new file mode 100644 index 000000000..afb5d279d Binary files /dev/null and b/graphics/pokemon/pancham/footprint.png differ diff --git a/graphics/pokemon/pangoro/footprint.png b/graphics/pokemon/pangoro/footprint.png new file mode 100644 index 000000000..ddc474878 Binary files /dev/null and b/graphics/pokemon/pangoro/footprint.png differ diff --git a/graphics/pokemon/phantump/footprint.png b/graphics/pokemon/phantump/footprint.png new file mode 100644 index 000000000..bd256edcd Binary files /dev/null and b/graphics/pokemon/phantump/footprint.png differ diff --git a/graphics/pokemon/pincurchin/icon.png b/graphics/pokemon/pincurchin/icon.png new file mode 100644 index 000000000..354d7d37d Binary files /dev/null and b/graphics/pokemon/pincurchin/icon.png differ diff --git a/graphics/pokemon/pumpkaboo/footprint.png b/graphics/pokemon/pumpkaboo/footprint.png new file mode 100644 index 000000000..adb8b164d Binary files /dev/null and b/graphics/pokemon/pumpkaboo/footprint.png differ diff --git a/graphics/pokemon/pyroar/backf.png b/graphics/pokemon/pyroar/backf.png new file mode 100644 index 000000000..f1a323fbd 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 000000000..6cf1f3c15 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 000000000..290245409 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 937daa1da..cd0b94401 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 000000000..aa640f6c0 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 000000000..ab583a461 --- /dev/null +++ b/graphics/pokemon/pyroar/normalf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 210 164 +0 166 159 +234 199 152 +102 3 0 +183 134 29 +30 25 22 +255 200 38 +232 41 27 +86 64 36 +160 20 16 +58 46 41 +86 72 66 +158 110 69 +211 161 103 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/pyroar/shinyf.pal b/graphics/pokemon/pyroar/shinyf.pal new file mode 100644 index 000000000..42007ac10 --- /dev/null +++ b/graphics/pokemon/pyroar/shinyf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 210 164 +198 69 43 +248 224 192 +102 3 0 +184 96 32 +56 40 32 +247 160 74 +232 41 27 +96 73 57 +160 20 16 +80 72 48 +114 99 76 +168 136 96 +224 192 144 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/quilladin/footprint.png b/graphics/pokemon/quilladin/footprint.png new file mode 100644 index 000000000..0c1295e1f 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 000000000..b6cfa5d9d 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 000000000..268208caf Binary files /dev/null and b/graphics/pokemon/regieleki/icon.png differ diff --git a/graphics/pokemon/scatterbug/footprint.png b/graphics/pokemon/scatterbug/footprint.png new file mode 100644 index 000000000..a62c12a81 Binary files /dev/null and b/graphics/pokemon/scatterbug/footprint.png differ diff --git a/graphics/pokemon/skiddo/footprint.png b/graphics/pokemon/skiddo/footprint.png new file mode 100644 index 000000000..ddbc09b2c Binary files /dev/null and b/graphics/pokemon/skiddo/footprint.png differ diff --git a/graphics/pokemon/skrelp/footprint.png b/graphics/pokemon/skrelp/footprint.png new file mode 100644 index 000000000..4320ad16d 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 000000000..e7fc80916 Binary files /dev/null and b/graphics/pokemon/skwovet/icon.png differ diff --git a/graphics/pokemon/sliggoo/footprint.png b/graphics/pokemon/sliggoo/footprint.png new file mode 100644 index 000000000..f709e0796 Binary files /dev/null and b/graphics/pokemon/sliggoo/footprint.png differ diff --git a/graphics/pokemon/slowbro/galarian/icon.png b/graphics/pokemon/slowbro/galarian/icon.png new file mode 100644 index 000000000..285681b2a 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 000000000..4a69676fe 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 000000000..044517429 Binary files /dev/null and b/graphics/pokemon/slowpoke/galarian/icon.png differ diff --git a/graphics/pokemon/slurpuff/footprint.png b/graphics/pokemon/slurpuff/footprint.png new file mode 100644 index 000000000..4d9cf0915 Binary files /dev/null and b/graphics/pokemon/slurpuff/footprint.png differ diff --git a/graphics/pokemon/spectrier/icon.png b/graphics/pokemon/spectrier/icon.png new file mode 100644 index 000000000..3cf118e29 Binary files /dev/null and b/graphics/pokemon/spectrier/icon.png differ diff --git a/graphics/pokemon/spewpa/footprint.png b/graphics/pokemon/spewpa/footprint.png new file mode 100644 index 000000000..3d8347d75 Binary files /dev/null and b/graphics/pokemon/spewpa/footprint.png differ diff --git a/graphics/pokemon/spritzee/footprint.png b/graphics/pokemon/spritzee/footprint.png new file mode 100644 index 000000000..5fa392040 Binary files /dev/null and b/graphics/pokemon/spritzee/footprint.png differ diff --git a/graphics/pokemon/swirlix/footprint.png b/graphics/pokemon/swirlix/footprint.png new file mode 100644 index 000000000..5fa0c68a5 Binary files /dev/null and b/graphics/pokemon/swirlix/footprint.png differ diff --git a/graphics/pokemon/sylveon/footprint.png b/graphics/pokemon/sylveon/footprint.png new file mode 100644 index 000000000..286aa0f56 Binary files /dev/null and b/graphics/pokemon/sylveon/footprint.png differ diff --git a/graphics/pokemon/talonflame/footprint.png b/graphics/pokemon/talonflame/footprint.png new file mode 100644 index 000000000..197f4f3e2 Binary files /dev/null and b/graphics/pokemon/talonflame/footprint.png differ diff --git a/graphics/pokemon/toxel/icon.png b/graphics/pokemon/toxel/icon.png new file mode 100644 index 000000000..b1989e50c Binary files /dev/null and b/graphics/pokemon/toxel/icon.png differ diff --git a/graphics/pokemon/trevenant/footprint.png b/graphics/pokemon/trevenant/footprint.png new file mode 100644 index 000000000..97e1658e4 Binary files /dev/null and b/graphics/pokemon/trevenant/footprint.png differ diff --git a/graphics/pokemon/tyrantrum/footprint.png b/graphics/pokemon/tyrantrum/footprint.png new file mode 100644 index 000000000..77ac61310 Binary files /dev/null and b/graphics/pokemon/tyrantrum/footprint.png differ diff --git a/graphics/pokemon/tyrunt/footprint.png b/graphics/pokemon/tyrunt/footprint.png new file mode 100644 index 000000000..04157d186 Binary files /dev/null and b/graphics/pokemon/tyrunt/footprint.png differ diff --git a/graphics/pokemon/unfezant/anim_frontf.png b/graphics/pokemon/unfezant/anim_frontf.png new file mode 100644 index 000000000..bd39fc3d1 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 8bb437303..829367c68 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 000000000..cded84b12 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 7911eb8ca..8b61d1bfb 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 000000000..4c4a809ad 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 26ccf7974..bb69c2c40 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 000000000..a878e4c53 --- /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 b4507abb0..375861cc9 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 000000000..66ec84ee8 --- /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 000000000..28f64a50f Binary files /dev/null and b/graphics/pokemon/urshifu/icon.png differ diff --git a/graphics/pokemon/vivillon/footprint.png b/graphics/pokemon/vivillon/footprint.png new file mode 100644 index 000000000..bc51948b8 Binary files /dev/null and b/graphics/pokemon/vivillon/footprint.png differ diff --git a/graphics/pokemon/volcanion/footprint.png b/graphics/pokemon/volcanion/footprint.png new file mode 100644 index 000000000..3ad867116 Binary files /dev/null and b/graphics/pokemon/volcanion/footprint.png differ diff --git a/graphics/pokemon/xerneas/footprint.png b/graphics/pokemon/xerneas/footprint.png new file mode 100644 index 000000000..d66c01256 Binary files /dev/null and b/graphics/pokemon/xerneas/footprint.png differ diff --git a/graphics/pokemon/yveltal/footprint.png b/graphics/pokemon/yveltal/footprint.png new file mode 100644 index 000000000..0f8d4fd8b 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 000000000..df9bb29b5 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 000000000..e3a39e36d 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 000000000..58dfa077b Binary files /dev/null and b/graphics/pokemon/zarude/icon.png differ diff --git a/graphics/pokemon/zygarde/footprint.png b/graphics/pokemon/zygarde/footprint.png new file mode 100644 index 000000000..36541a36f Binary files /dev/null and b/graphics/pokemon/zygarde/footprint.png differ diff --git a/include/decompress.h b/include/decompress.h index bddbe96ac..81f142501 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 dda86458d..8d28bef55 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -453,6 +453,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[]; @@ -487,6 +488,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[]; @@ -559,6 +561,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[]; @@ -630,7 +633,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[]; @@ -706,6 +711,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[]; @@ -1627,7 +1633,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[]; @@ -1699,6 +1707,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[]; @@ -1770,7 +1779,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[]; @@ -1846,6 +1857,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[]; @@ -2765,7 +2777,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[]; @@ -2837,6 +2851,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[]; @@ -2908,7 +2923,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[]; @@ -2984,6 +3001,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[]; @@ -3930,6 +3948,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[]; @@ -4002,6 +4023,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[]; @@ -4073,7 +4095,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[]; @@ -4149,6 +4173,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[]; @@ -5159,6 +5184,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[]; @@ -5230,7 +5256,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[]; @@ -5306,6 +5334,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[]; @@ -5456,8 +5485,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[]; @@ -5483,9 +5512,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[]; @@ -5506,9 +5535,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[]; @@ -5517,10 +5546,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[]; @@ -5528,13 +5557,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[]; @@ -5607,15 +5636,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[]; @@ -5686,7 +5715,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[]; @@ -5782,9 +5811,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[]; @@ -6439,6 +6467,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/src/data.c b/src/data.c index 3dc8dc85c..e551ddcce 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 504c35e46..c1e94ff7e 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"); @@ -522,6 +524,7 @@ const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/anim_f 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/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"); @@ -593,7 +596,9 @@ const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/an 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"); @@ -669,6 +674,7 @@ const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/front.4bpp 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_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/frontf.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"); @@ -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 2a5d18d14..33883b8bf 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -284,7 +284,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_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index a70aa13c5..9d108ce83 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 f54602855..6ba0e7fcc 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 cd5638744..6387994c1 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -5984,9 +5984,8 @@ static const union AnimCmd sAnim_TRANQUILL_1[] = static const union AnimCmd sAnim_UNFEZANT_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 0bc35542c..788afc744 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 59e3d918b..cc8717e90 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 38b3a662d..b8324bdd5 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/decompress.c b/src/decompress.c index 94d09ddfe..4d917e8d6 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 ac24b6315..1d5fcc05b 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -259,9 +259,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[1], - currSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[1], + currSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x110, 0x20); @@ -274,9 +274,9 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u gSprites[ID].invisible = TRUE; // postEvo sprite - DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites.ptr[3], - postEvoSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[3], + postEvoSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); @@ -351,9 +351,9 @@ static void CB2_EvolutionSceneLoadGraphics(void) FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; - DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites.ptr[3], - postEvoSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[3], + postEvoSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); @@ -423,9 +423,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[3], - postEvoSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[3], + postEvoSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); gMain.state++; @@ -487,9 +487,9 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit sEvoStructPtr = AllocZeroed(sizeof(struct EvoInfo)); sEvoStructPtr->preEvoSpriteId = preEvoSpriteId; - DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites.ptr[1], - postEvoSpecies); + DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[1], + postEvoSpecies, + personality); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); diff --git a/src/pokemon.c b/src/pokemon.c index baf408fce..06d5b7915 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1268,6 +1268,8 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to [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, @@ -2451,7 +2453,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, @@ -4353,13 +4355,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) diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 2373a7376..2a872a9e4 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -846,8 +846,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, @@ -873,9 +873,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, @@ -896,9 +896,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, @@ -907,10 +907,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, @@ -918,13 +918,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, @@ -997,15 +997,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, @@ -1094,7 +1094,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, @@ -1229,9 +1229,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, @@ -1240,6 +1240,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[] = @@ -2062,7 +2069,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, @@ -2089,9 +2096,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, @@ -2112,7 +2119,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, @@ -2123,8 +2130,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, @@ -2134,11 +2141,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, @@ -2213,15 +2220,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, @@ -2411,8 +2418,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, @@ -2421,6 +2428,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[] =