diff --git a/graphics/pokemon/chansey/anim_front.png b/graphics/pokemon/chansey/anim_front.png index 2e4e2f573f..f2eec2ca77 100644 Binary files a/graphics/pokemon/chansey/anim_front.png and b/graphics/pokemon/chansey/anim_front.png differ diff --git a/graphics/pokemon/chansey/back.png b/graphics/pokemon/chansey/back.png index 87e70c9a2f..79fbeaa59e 100644 Binary files a/graphics/pokemon/chansey/back.png and b/graphics/pokemon/chansey/back.png differ diff --git a/graphics/pokemon/chansey/normal.pal b/graphics/pokemon/chansey/normal.pal index 698af3b616..0e50f85c24 100644 --- a/graphics/pokemon/chansey/normal.pal +++ b/graphics/pokemon/chansey/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -230 123 131 -139 65 65 -255 230 230 -255 213 222 -139 65 65 -238 123 123 -246 164 156 -248 248 248 -16 16 16 -139 65 65 -246 164 180 +255 255 255 +230 222 189 172 164 115 115 106 74 -230 222 189 -0 0 0 +238 123 123 +225 96 96 +16 16 16 +139 65 65 +246 164 156 +238 123 123 +255 230 230 +255 213 222 +246 164 180 +230 123 131 +139 65 65 diff --git a/graphics/pokemon/chansey/shiny.pal b/graphics/pokemon/chansey/shiny.pal index 219c13d1d0..a919547a79 100644 --- a/graphics/pokemon/chansey/shiny.pal +++ b/graphics/pokemon/chansey/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -192 160 88 -112 88 56 -248 240 224 -248 232 200 -80 112 56 -128 176 64 -152 216 72 -248 248 248 +152 160 208 +255 255 255 +230 222 189 +172 164 115 +115 106 74 +141 215 40 +106 164 32 16 16 16 -80 112 56 -232 200 144 -168 160 112 -112 104 72 -224 216 184 -0 0 0 +88 128 64 +148 222 49 +106 164 32 +255 246 230 +255 238 205 +238 205 148 +213 172 90 +139 106 65 diff --git a/graphics/pokemon/cloyster/anim_front.png b/graphics/pokemon/cloyster/anim_front.png index bce084388f..6e1ed03508 100644 Binary files a/graphics/pokemon/cloyster/anim_front.png and b/graphics/pokemon/cloyster/anim_front.png differ diff --git a/graphics/pokemon/cloyster/back.png b/graphics/pokemon/cloyster/back.png index 8c038d83c8..965be563b1 100644 Binary files a/graphics/pokemon/cloyster/back.png and b/graphics/pokemon/cloyster/back.png differ diff --git a/graphics/pokemon/cloyster/normal.pal b/graphics/pokemon/cloyster/normal.pal index 725b268096..d9d8ed4ce8 100644 --- a/graphics/pokemon/cloyster/normal.pal +++ b/graphics/pokemon/cloyster/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -123 82 131 213 189 238 172 123 189 +148 98 180 +123 82 131 74 32 82 -16 16 16 -197 197 197 -65 65 65 -248 248 248 -148 148 148 -98 98 98 -82 41 90 +164 123 189 131 90 164 106 65 131 -164 123 189 -120 96 176 +82 41 90 +197 197 197 +148 148 148 +98 98 98 +65 65 65 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/cloyster/shiny.pal b/graphics/pokemon/cloyster/shiny.pal index da28a9df86..ad5c2b8f6a 100644 --- a/graphics/pokemon/cloyster/shiny.pal +++ b/graphics/pokemon/cloyster/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 96 152 -152 200 248 -104 152 208 -16 64 112 +139 197 255 +90 156 230 +98 123 213 +41 98 172 +0 57 131 +164 123 189 +131 90 164 +106 65 131 +82 41 90 +197 197 197 +148 148 148 +98 98 98 +65 65 65 16 16 16 -192 192 192 -64 64 64 -248 248 248 -144 144 144 -96 96 96 -80 40 88 -128 88 160 -104 64 128 -128 88 160 -96 120 208 +255 255 255 diff --git a/graphics/pokemon/cubone/anim_front.png b/graphics/pokemon/cubone/anim_front.png index e0f600c88c..d00e0c921b 100644 Binary files a/graphics/pokemon/cubone/anim_front.png and b/graphics/pokemon/cubone/anim_front.png differ diff --git a/graphics/pokemon/cubone/back.png b/graphics/pokemon/cubone/back.png index 0d867ae9de..cfebc2947d 100644 Binary files a/graphics/pokemon/cubone/back.png and b/graphics/pokemon/cubone/back.png differ diff --git a/graphics/pokemon/cubone/normal.pal b/graphics/pokemon/cubone/normal.pal index 8613b94a22..68797e7115 100644 --- a/graphics/pokemon/cubone/normal.pal +++ b/graphics/pokemon/cubone/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -139 131 106 -248 248 248 -41 41 41 -197 197 213 -82 82 57 -148 106 90 +222 189 106 197 156 74 +148 106 90 82 57 16 -200 168 136 -240 208 176 -224 224 232 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 +230 230 238 +197 197 213 +139 131 106 +82 82 57 +255 222 180 +246 213 180 +205 172 139 +255 0 255 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/cubone/shiny.pal b/graphics/pokemon/cubone/shiny.pal index 710bbdf527..dfc82f90bd 100644 --- a/graphics/pokemon/cubone/shiny.pal +++ b/graphics/pokemon/cubone/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -128 128 112 -248 248 248 -16 16 16 -200 184 184 -72 80 72 -80 104 48 -112 144 80 -32 56 8 -184 160 136 -224 208 176 -224 216 216 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 160 208 +156 172 106 +106 139 74 +74 98 49 +32 65 0 +255 255 255 +230 222 222 +205 189 189 +131 131 115 +74 82 74 +238 222 180 +230 213 180 +189 164 139 +255 0 255 +255 0 255 +41 41 41 diff --git a/graphics/pokemon/dewgong/anim_front.png b/graphics/pokemon/dewgong/anim_front.png index a1594dbd33..c2f3d4f775 100644 Binary files a/graphics/pokemon/dewgong/anim_front.png and b/graphics/pokemon/dewgong/anim_front.png differ diff --git a/graphics/pokemon/dewgong/back.png b/graphics/pokemon/dewgong/back.png index bcb7242e35..8b58e9fce0 100644 Binary files a/graphics/pokemon/dewgong/back.png and b/graphics/pokemon/dewgong/back.png differ diff --git a/graphics/pokemon/dewgong/normal.pal b/graphics/pokemon/dewgong/normal.pal index 15ddd52bd5..4165788517 100644 --- a/graphics/pokemon/dewgong/normal.pal +++ b/graphics/pokemon/dewgong/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 153 210 164 +230 230 246 +213 205 238 +156 164 189 106 123 164 65 82 98 -156 164 189 -230 230 246 -16 16 16 -213 205 238 -255 255 255 +213 41 32 +156 0 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 205 205 131 123 123 -112 40 40 -232 128 120 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/dewgong/shiny.pal b/graphics/pokemon/dewgong/shiny.pal index bc86361bc5..bc6d7e3458 100644 --- a/graphics/pokemon/dewgong/shiny.pal +++ b/graphics/pokemon/dewgong/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 153 210 164 +246 246 230 +213 213 197 +180 180 164 148 148 115 98 98 74 -180 180 164 -246 246 230 -16 16 16 -213 213 197 -255 255 255 +213 41 32 +156 0 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 205 205 131 123 123 -163 32 32 -219 83 78 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/dodrio/anim_front.png b/graphics/pokemon/dodrio/anim_front.png index 5c970bf8e0..78906eb7e2 100644 Binary files a/graphics/pokemon/dodrio/anim_front.png and b/graphics/pokemon/dodrio/anim_front.png differ diff --git a/graphics/pokemon/dodrio/anim_frontf.png b/graphics/pokemon/dodrio/anim_frontf.png index c69ab602c0..04c02d0c0b 100644 Binary files a/graphics/pokemon/dodrio/anim_frontf.png and b/graphics/pokemon/dodrio/anim_frontf.png differ diff --git a/graphics/pokemon/dodrio/back.png b/graphics/pokemon/dodrio/back.png index a160615324..89e974f61c 100644 Binary files a/graphics/pokemon/dodrio/back.png and b/graphics/pokemon/dodrio/back.png differ diff --git a/graphics/pokemon/dodrio/backf.png b/graphics/pokemon/dodrio/backf.png index ad1f5bcf51..89fd4aa370 100644 Binary files a/graphics/pokemon/dodrio/backf.png and b/graphics/pokemon/dodrio/backf.png differ diff --git a/graphics/pokemon/dodrio/normal.pal b/graphics/pokemon/dodrio/normal.pal index 1569ba019d..d05aac145a 100644 --- a/graphics/pokemon/dodrio/normal.pal +++ b/graphics/pokemon/dodrio/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -65 65 65 -16 16 16 -131 131 131 +238 197 115 +205 156 82 164 123 90 90 65 32 -205 156 82 -248 248 248 -98 90 65 238 222 172 180 164 123 -180 65 65 -246 131 164 -180 65 65 -246 131 164 +98 90 65 255 213 230 +246 131 164 +180 65 65 +213 205 205 +131 131 131 +65 65 65 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/dodrio/shiny.pal b/graphics/pokemon/dodrio/shiny.pal index f6278a269b..28e67a6f71 100644 --- a/graphics/pokemon/dodrio/shiny.pal +++ b/graphics/pokemon/dodrio/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -64 64 64 -16 16 16 -128 128 128 -112 136 24 -64 88 16 -160 184 48 -248 248 248 -152 104 24 -248 240 136 -216 160 64 -176 80 80 -240 128 160 -176 80 80 -240 128 160 -248 200 224 +152 160 208 +197 222 90 +164 189 49 +115 139 16 +74 106 0 +255 246 139 +222 164 57 +164 106 0 +255 213 230 +246 131 164 +180 65 65 +213 205 205 +131 131 131 +65 65 65 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/doduo/anim_front.png b/graphics/pokemon/doduo/anim_front.png index bda88f3de1..cfaffadcd7 100644 Binary files a/graphics/pokemon/doduo/anim_front.png and b/graphics/pokemon/doduo/anim_front.png differ diff --git a/graphics/pokemon/doduo/anim_frontf.png b/graphics/pokemon/doduo/anim_frontf.png index 51d0d982e9..490a771ada 100644 Binary files a/graphics/pokemon/doduo/anim_frontf.png and b/graphics/pokemon/doduo/anim_frontf.png differ diff --git a/graphics/pokemon/doduo/back.png b/graphics/pokemon/doduo/back.png index dc2b09bc9e..6bac7e57ef 100644 Binary files a/graphics/pokemon/doduo/back.png and b/graphics/pokemon/doduo/back.png differ diff --git a/graphics/pokemon/doduo/backf.png b/graphics/pokemon/doduo/backf.png index 3e0ad49e50..0a208d6300 100644 Binary files a/graphics/pokemon/doduo/backf.png and b/graphics/pokemon/doduo/backf.png differ diff --git a/graphics/pokemon/doduo/normal.pal b/graphics/pokemon/doduo/normal.pal index 594e033255..86151f0ed8 100644 --- a/graphics/pokemon/doduo/normal.pal +++ b/graphics/pokemon/doduo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 56 24 -144 104 88 -184 136 80 -216 168 112 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 172 115 +189 139 82 +148 106 90 +82 57 24 +238 222 172 +222 189 139 +164 131 74 +98 82 16 +98 98 98 16 16 16 -248 248 248 -96 80 16 -96 96 96 -160 128 72 -232 216 168 -216 184 136 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/doduo/shiny.pal b/graphics/pokemon/doduo/shiny.pal index 40d0d1146b..4b19c908e2 100644 --- a/graphics/pokemon/doduo/shiny.pal +++ b/graphics/pokemon/doduo/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -80 96 16 -112 144 32 -168 192 64 -192 224 96 +152 160 208 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +197 230 98 +172 197 65 +115 148 32 +90 115 0 +238 230 172 +222 205 139 +164 156 74 +98 98 16 +98 98 98 16 16 16 -248 248 248 -96 96 16 -96 96 96 -160 152 72 -232 224 168 -216 200 136 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/drowzee/anim_front.png b/graphics/pokemon/drowzee/anim_front.png index 3bab742240..6c4f25288b 100644 Binary files a/graphics/pokemon/drowzee/anim_front.png and b/graphics/pokemon/drowzee/anim_front.png differ diff --git a/graphics/pokemon/drowzee/back.png b/graphics/pokemon/drowzee/back.png index 3489ea9c35..91ced85866 100644 Binary files a/graphics/pokemon/drowzee/back.png and b/graphics/pokemon/drowzee/back.png differ diff --git a/graphics/pokemon/drowzee/normal.pal b/graphics/pokemon/drowzee/normal.pal index 0ea8f35c4c..3293e401fd 100644 --- a/graphics/pokemon/drowzee/normal.pal +++ b/graphics/pokemon/drowzee/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 136 0 -112 88 0 -240 232 0 -80 56 32 -208 168 72 -248 232 112 0 0 0 -104 80 64 -248 248 248 -136 32 56 -232 56 56 -136 112 88 -176 152 120 -104 80 64 +82 57 32 +106 82 65 +139 115 90 +180 156 123 +115 90 0 +172 139 0 +197 164 32 +213 172 74 +246 238 0 +255 238 115 +255 255 255 +139 32 57 +238 57 57 0 0 0 diff --git a/graphics/pokemon/drowzee/shiny.pal b/graphics/pokemon/drowzee/shiny.pal index 5c3e3c9d9d..5615fd6c31 100644 --- a/graphics/pokemon/drowzee/shiny.pal +++ b/graphics/pokemon/drowzee/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 96 104 -104 64 72 -224 176 192 -96 32 48 -184 144 152 -248 216 232 -16 16 16 -120 72 88 -248 248 248 -136 40 64 -232 80 80 -176 88 104 -200 120 136 -144 56 80 +0 0 0 +115 16 32 +148 41 74 +180 82 98 +205 106 123 +115 74 82 +139 98 106 +164 123 131 +189 148 156 +230 180 197 +238 205 222 +255 255 255 +139 32 57 +238 57 57 0 0 0 diff --git a/graphics/pokemon/electrode/anim_front.png b/graphics/pokemon/electrode/anim_front.png index bf91ac0eb8..739501732b 100644 Binary files a/graphics/pokemon/electrode/anim_front.png and b/graphics/pokemon/electrode/anim_front.png differ diff --git a/graphics/pokemon/electrode/back.png b/graphics/pokemon/electrode/back.png index 86d20c029e..90cd9957c8 100644 Binary files a/graphics/pokemon/electrode/back.png and b/graphics/pokemon/electrode/back.png differ diff --git a/graphics/pokemon/electrode/normal.pal b/graphics/pokemon/electrode/normal.pal index 293f41bffb..3710a6a0b7 100644 --- a/graphics/pokemon/electrode/normal.pal +++ b/graphics/pokemon/electrode/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -90 82 82 -164 156 156 +255 255 255 238 238 238 -248 248 248 205 205 222 -16 16 16 -213 49 65 -255 82 32 +164 156 156 +90 82 82 +255 0 255 +240 160 136 +208 128 144 +255 172 156 255 131 90 -131 16 16 +255 82 32 238 65 49 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +213 49 65 +131 16 16 +16 16 16 diff --git a/graphics/pokemon/electrode/shiny.pal b/graphics/pokemon/electrode/shiny.pal index cdfc50be22..4ad72a8909 100644 --- a/graphics/pokemon/electrode/shiny.pal +++ b/graphics/pokemon/electrode/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 80 80 -160 152 152 -232 232 232 -248 248 248 -200 200 216 -16 16 16 -56 72 208 -32 112 248 +255 255 255 +238 238 238 +205 205 222 +164 156 156 +90 82 82 +255 0 255 144 168 232 -24 48 112 -48 96 232 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +128 136 216 +156 205 255 +90 164 255 +32 115 255 +49 98 238 +57 74 213 +16 49 131 +16 16 16 diff --git a/graphics/pokemon/exeggcute/anim_front.png b/graphics/pokemon/exeggcute/anim_front.png index 429248b6eb..890f981467 100644 Binary files a/graphics/pokemon/exeggcute/anim_front.png and b/graphics/pokemon/exeggcute/anim_front.png differ diff --git a/graphics/pokemon/exeggcute/back.png b/graphics/pokemon/exeggcute/back.png index 8ae6d8f214..fa0204c49b 100644 Binary files a/graphics/pokemon/exeggcute/back.png and b/graphics/pokemon/exeggcute/back.png differ diff --git a/graphics/pokemon/exeggcute/normal.pal b/graphics/pokemon/exeggcute/normal.pal index 5b12b18d4d..632ee1137d 100644 --- a/graphics/pokemon/exeggcute/normal.pal +++ b/graphics/pokemon/exeggcute/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -197 115 148 -139 32 32 -255 213 222 -16 16 16 +255 255 255 +222 222 222 255 238 139 205 139 8 -248 248 248 +16 16 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 255 238 238 -222 222 222 -224 176 184 -232 192 192 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 213 222 +230 180 189 +197 115 148 +139 32 32 diff --git a/graphics/pokemon/exeggcute/shiny.pal b/graphics/pokemon/exeggcute/shiny.pal index 967472bdca..e59673d22c 100644 --- a/graphics/pokemon/exeggcute/shiny.pal +++ b/graphics/pokemon/exeggcute/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -224 168 40 -136 96 24 -248 232 88 +255 255 255 +222 222 222 +255 205 74 +230 156 0 16 16 16 -248 200 72 -224 152 0 -248 248 248 -248 248 160 -216 216 216 -208 80 64 -240 208 64 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 255 189 +255 238 16 +246 205 16 +238 172 0 +180 123 0 diff --git a/graphics/pokemon/exeggutor/anim_front.png b/graphics/pokemon/exeggutor/anim_front.png index a7fa012b17..8d32dffb8d 100644 Binary files a/graphics/pokemon/exeggutor/anim_front.png and b/graphics/pokemon/exeggutor/anim_front.png differ diff --git a/graphics/pokemon/exeggutor/back.png b/graphics/pokemon/exeggutor/back.png index 8bf0106564..ea1c3fa38f 100644 Binary files a/graphics/pokemon/exeggutor/back.png and b/graphics/pokemon/exeggutor/back.png differ diff --git a/graphics/pokemon/exeggutor/normal.pal b/graphics/pokemon/exeggutor/normal.pal index 7430557a4c..64a0df017a 100644 --- a/graphics/pokemon/exeggutor/normal.pal +++ b/graphics/pokemon/exeggutor/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -82 98 41 -16 16 16 -115 172 49 +152 160 208 +255 255 205 +255 246 139 +230 172 90 +164 106 32 +123 82 16 +180 156 74 +139 115 65 +82 65 16 189 255 115 156 213 74 -82 65 16 -230 172 90 -255 246 139 -248 248 168 -248 248 248 -123 82 16 -164 106 32 -139 115 65 -230 172 90 -180 156 74 +115 172 49 +82 98 41 +255 255 255 +98 98 98 +16 16 16 diff --git a/graphics/pokemon/exeggutor/shiny.pal b/graphics/pokemon/exeggutor/shiny.pal index 2490dbbb59..81c3a61fea 100644 --- a/graphics/pokemon/exeggutor/shiny.pal +++ b/graphics/pokemon/exeggutor/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -136 56 24 +152 208 160 +255 238 164 +255 222 106 +230 172 90 +164 106 32 +115 65 16 +238 230 74 +205 172 0 +148 115 0 +255 189 106 +230 131 74 +197 98 57 +156 57 16 +255 255 255 +98 98 98 16 16 16 -192 104 64 -232 184 120 -224 144 96 -120 96 24 -224 168 88 -248 224 136 -248 232 160 -248 248 248 -160 104 32 -160 104 32 -200 176 40 -224 168 88 -240 232 96 diff --git a/graphics/pokemon/farfetchd/anim_front.png b/graphics/pokemon/farfetchd/anim_front.png index ac702abdd4..527e64c536 100644 Binary files a/graphics/pokemon/farfetchd/anim_front.png and b/graphics/pokemon/farfetchd/anim_front.png differ diff --git a/graphics/pokemon/farfetchd/back.png b/graphics/pokemon/farfetchd/back.png index 50978b424c..1f87dd2fcb 100644 Binary files a/graphics/pokemon/farfetchd/back.png and b/graphics/pokemon/farfetchd/back.png differ diff --git a/graphics/pokemon/farfetchd/normal.pal b/graphics/pokemon/farfetchd/normal.pal index 8e8af67119..786c6d0244 100644 --- a/graphics/pokemon/farfetchd/normal.pal +++ b/graphics/pokemon/farfetchd/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -132 107 33 -90 58 0 -181 148 82 +152 160 208 +255 255 255 +213 213 213 +230 230 164 +197 205 131 +255 222 106 +246 180 65 +189 115 24 +205 255 139 +65 222 65 +0 156 32 +216 184 112 +180 148 82 +131 106 32 +90 57 0 16 16 16 -0 156 33 -230 230 165 -66 222 66 -197 206 132 -214 214 214 -230 197 123 -248 248 248 -206 255 140 -255 222 107 -247 181 66 -189 115 25 diff --git a/graphics/pokemon/farfetchd/shiny.pal b/graphics/pokemon/farfetchd/shiny.pal index 631533ca3c..874a87bda2 100644 --- a/graphics/pokemon/farfetchd/shiny.pal +++ b/graphics/pokemon/farfetchd/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +152 160 208 +255 255 255 +213 213 213 +238 230 164 +197 197 123 +255 213 115 +255 180 74 +197 115 32 +230 255 148 +172 230 74 +112 152 32 +216 184 112 +230 136 120 200 104 88 104 56 48 -224 136 120 16 16 16 -128 168 32 -240 232 176 -168 224 72 -192 192 120 -208 208 208 -216 184 112 -248 248 248 -224 248 144 -248 208 112 -248 176 72 -192 120 48 diff --git a/graphics/pokemon/gastly/anim_front.png b/graphics/pokemon/gastly/anim_front.png index 6bb1447c32..e16ebb069e 100644 Binary files a/graphics/pokemon/gastly/anim_front.png and b/graphics/pokemon/gastly/anim_front.png differ diff --git a/graphics/pokemon/gastly/back.png b/graphics/pokemon/gastly/back.png index 07971e3c49..1d869be915 100644 Binary files a/graphics/pokemon/gastly/back.png and b/graphics/pokemon/gastly/back.png differ diff --git a/graphics/pokemon/gastly/normal.pal b/graphics/pokemon/gastly/normal.pal index 7541f17517..16672b45dc 100644 --- a/graphics/pokemon/gastly/normal.pal +++ b/graphics/pokemon/gastly/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 +255 255 255 +222 222 222 +222 82 57 +180 41 16 +255 0 255 +189 148 180 +139 98 131 +115 74 106 +57 41 57 213 172 205 189 148 180 139 98 131 -57 41 57 +255 0 255 +255 0 255 16 16 16 -115 74 106 -139 98 131 -112 72 104 -255 255 255 -180 41 16 -222 82 57 -208 168 192 -216 216 216 -180 41 16 -222 82 57 diff --git a/graphics/pokemon/gastly/shiny.pal b/graphics/pokemon/gastly/shiny.pal index 5984138176..c586f2bf98 100644 --- a/graphics/pokemon/gastly/shiny.pal +++ b/graphics/pokemon/gastly/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 224 248 -120 192 232 -88 152 208 -96 24 120 +255 255 255 +222 222 222 +222 82 57 +180 41 16 +255 0 255 +205 164 255 +172 123 205 +123 74 156 +98 24 123 +164 230 255 +123 197 238 +90 156 213 +255 0 255 +255 0 255 16 16 16 -120 72 152 -168 120 200 -112 72 104 -248 248 248 -176 40 16 -216 80 56 -216 80 56 -216 216 216 -176 40 16 -216 80 56 diff --git a/graphics/pokemon/gengar/anim_front.png b/graphics/pokemon/gengar/anim_front.png index 4b1e614ab3..140fa8d81c 100644 Binary files a/graphics/pokemon/gengar/anim_front.png and b/graphics/pokemon/gengar/anim_front.png differ diff --git a/graphics/pokemon/gengar/back.png b/graphics/pokemon/gengar/back.png index de0fa6599e..04b627f9ac 100644 Binary files a/graphics/pokemon/gengar/back.png and b/graphics/pokemon/gengar/back.png differ diff --git a/graphics/pokemon/gengar/normal.pal b/graphics/pokemon/gengar/normal.pal index 16892bb23c..1eb1965ad6 100644 --- a/graphics/pokemon/gengar/normal.pal +++ b/graphics/pokemon/gengar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -90 74 156 -180 139 189 -16 16 16 -148 115 180 -74 41 74 -123 98 164 -255 90 90 -255 148 148 -189 172 189 255 246 255 -106 98 123 222 213 222 -168 16 16 -72 40 72 -0 0 0 +106 98 123 +255 194 194 +255 144 144 +248 88 88 +189 172 189 +255 0 255 +255 0 255 +120 96 160 +176 136 184 +144 112 180 +90 74 152 +74 41 74 +16 16 16 diff --git a/graphics/pokemon/gengar/shiny.pal b/graphics/pokemon/gengar/shiny.pal index 175c4681e3..8721d43483 100644 --- a/graphics/pokemon/gengar/shiny.pal +++ b/graphics/pokemon/gengar/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 88 120 -144 144 176 -16 16 16 -120 120 152 -56 56 96 +255 255 255 +222 222 222 +106 98 123 +255 205 205 +238 144 144 +184 106 106 +189 172 189 +255 0 255 +255 0 255 104 104 136 -184 104 104 -232 144 144 -184 168 184 -248 240 248 -104 96 120 -216 208 216 -136 56 56 -72 40 72 -0 0 0 +148 148 180 +123 123 156 +90 90 123 +57 57 98 +16 16 16 diff --git a/graphics/pokemon/grimer/anim_front.png b/graphics/pokemon/grimer/anim_front.png index a2363840e7..312a64aa5a 100644 Binary files a/graphics/pokemon/grimer/anim_front.png and b/graphics/pokemon/grimer/anim_front.png differ diff --git a/graphics/pokemon/grimer/back.png b/graphics/pokemon/grimer/back.png index 280c733fc5..030242885e 100644 Binary files a/graphics/pokemon/grimer/back.png and b/graphics/pokemon/grimer/back.png differ diff --git a/graphics/pokemon/grimer/normal.pal b/graphics/pokemon/grimer/normal.pal index b7c371b486..5d2c17fd75 100644 --- a/graphics/pokemon/grimer/normal.pal +++ b/graphics/pokemon/grimer/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -156 106 156 -222 172 222 -98 57 123 -238 222 238 -180 139 180 -16 16 16 -123 74 131 -248 248 248 +255 255 255 +213 213 222 +172 180 189 131 139 156 65 74 90 -172 180 189 -208 208 216 -0 0 0 -0 0 0 -0 0 0 +238 222 238 +222 172 222 +180 139 180 +156 106 156 +123 74 131 +98 57 123 +255 0 255 +255 0 255 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/grimer/shiny.pal b/graphics/pokemon/grimer/shiny.pal index 96ae46dcbe..c5fa29f3f9 100644 --- a/graphics/pokemon/grimer/shiny.pal +++ b/graphics/pokemon/grimer/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -128 176 96 -184 224 144 -72 120 40 -200 240 160 -152 200 128 +152 160 208 +255 255 255 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +205 246 164 +189 230 148 +156 205 131 +131 180 98 +98 148 65 +74 123 41 +255 0 255 +255 0 255 +255 0 255 16 16 16 -96 144 64 -248 248 248 -128 136 152 -64 72 88 -168 176 184 -208 208 216 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/haunter/anim_front.png b/graphics/pokemon/haunter/anim_front.png index 03156dfa4c..63415497c9 100644 Binary files a/graphics/pokemon/haunter/anim_front.png and b/graphics/pokemon/haunter/anim_front.png differ diff --git a/graphics/pokemon/haunter/back.png b/graphics/pokemon/haunter/back.png index dccfa74425..babc9f43c5 100644 Binary files a/graphics/pokemon/haunter/back.png and b/graphics/pokemon/haunter/back.png differ diff --git a/graphics/pokemon/haunter/normal.pal b/graphics/pokemon/haunter/normal.pal index 79ac421466..8458b3532d 100644 --- a/graphics/pokemon/haunter/normal.pal +++ b/graphics/pokemon/haunter/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 88 136 -192 152 200 -80 64 96 +213 164 222 +197 156 205 +172 131 197 +131 90 139 +82 65 98 +255 0 255 +255 0 255 +255 0 255 +222 90 164 +180 24 98 +106 0 0 +213 213 213 +115 115 115 16 16 16 -168 128 192 -248 248 248 -112 112 112 -176 24 96 -216 88 160 -208 208 208 -104 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/haunter/shiny.pal b/graphics/pokemon/haunter/shiny.pal index 8c2ce31bcf..b935601171 100644 --- a/graphics/pokemon/haunter/shiny.pal +++ b/graphics/pokemon/haunter/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 88 112 -192 136 208 -80 64 104 +213 164 230 +197 139 213 +172 106 213 +131 90 115 +82 65 106 +255 0 255 +255 0 255 +255 0 255 +90 148 255 +41 98 213 +8 49 164 +213 213 213 +115 115 115 16 16 16 -168 104 208 -248 248 248 -112 112 112 -40 96 208 -88 144 248 -208 208 208 -8 48 160 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/hitmonchan/anim_front.png b/graphics/pokemon/hitmonchan/anim_front.png index ee3725e0ee..d615ae6a72 100644 Binary files a/graphics/pokemon/hitmonchan/anim_front.png and b/graphics/pokemon/hitmonchan/anim_front.png differ diff --git a/graphics/pokemon/hitmonchan/back.png b/graphics/pokemon/hitmonchan/back.png index 8f5bd8ded7..e30cbba5fd 100644 Binary files a/graphics/pokemon/hitmonchan/back.png and b/graphics/pokemon/hitmonchan/back.png differ diff --git a/graphics/pokemon/hitmonchan/normal.pal b/graphics/pokemon/hitmonchan/normal.pal index 2124609315..aee2892bf1 100644 --- a/graphics/pokemon/hitmonchan/normal.pal +++ b/graphics/pokemon/hitmonchan/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -90 65 16 -205 180 123 -16 16 16 -164 139 115 -238 213 156 255 246 255 -98 74 115 +222 205 222 +197 180 197 +164 156 164 98 74 115 189 49 74 255 148 90 230 98 74 +189 49 74 139 32 0 -164 156 164 -197 180 197 -232 128 120 +238 213 156 +205 180 123 +164 139 115 +90 65 16 +16 16 16 diff --git a/graphics/pokemon/hitmonchan/shiny.pal b/graphics/pokemon/hitmonchan/shiny.pal index 87ff42e4b6..6a2f264915 100644 --- a/graphics/pokemon/hitmonchan/shiny.pal +++ b/graphics/pokemon/hitmonchan/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -88 96 24 -192 208 96 +208 152 160 +246 246 255 +213 205 222 +189 180 197 +156 156 164 +90 74 115 +189 49 74 +65 180 255 +24 131 213 +0 90 180 +0 49 148 +230 246 139 +197 213 98 +148 164 65 +106 123 8 16 16 16 -144 160 64 -224 240 136 -248 240 248 -88 72 112 -96 96 168 -32 104 176 -120 184 224 -80 152 200 -16 48 112 -144 144 152 -184 176 192 -204 77 77 diff --git a/graphics/pokemon/hitmonlee/anim_front.png b/graphics/pokemon/hitmonlee/anim_front.png index 305a858f83..0062524a88 100644 Binary files a/graphics/pokemon/hitmonlee/anim_front.png and b/graphics/pokemon/hitmonlee/anim_front.png differ diff --git a/graphics/pokemon/hitmonlee/back.png b/graphics/pokemon/hitmonlee/back.png index 303f139f59..10a59d797e 100644 Binary files a/graphics/pokemon/hitmonlee/back.png and b/graphics/pokemon/hitmonlee/back.png differ diff --git a/graphics/pokemon/hitmonlee/normal.pal b/graphics/pokemon/hitmonlee/normal.pal index ef9db09638..5543d83814 100644 --- a/graphics/pokemon/hitmonlee/normal.pal +++ b/graphics/pokemon/hitmonlee/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -131 90 57 -164 123 115 -205 164 131 -98 57 24 238 197 164 +205 164 131 +164 123 115 +131 90 57 +98 57 24 +255 255 255 +213 205 205 115 98 98 -41 41 41 -248 248 248 -208 200 200 -90 74 41 -189 180 106 238 230 180 189 180 106 -240 224 168 -0 0 0 +90 74 41 +238 255 148 +197 205 115 +115 123 32 +41 41 41 diff --git a/graphics/pokemon/hitmonlee/shiny.pal b/graphics/pokemon/hitmonlee/shiny.pal index f50482897d..e3aa7e63a6 100644 --- a/graphics/pokemon/hitmonlee/shiny.pal +++ b/graphics/pokemon/hitmonlee/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -64 88 0 -96 120 16 -152 168 56 -32 56 8 -184 200 88 -112 96 96 -16 16 16 -248 248 248 -208 200 200 -88 56 40 -184 160 104 -232 216 176 -184 160 104 -232 216 176 -0 0 0 +152 160 208 +189 205 74 +148 172 41 +98 123 8 +65 90 0 +41 65 0 +255 255 255 +213 205 205 +115 98 98 +238 222 180 +189 164 106 +90 57 41 +230 255 148 +189 205 115 +106 123 32 +41 41 41 diff --git a/graphics/pokemon/hitmontop/anim_front.png b/graphics/pokemon/hitmontop/anim_front.png index 65ef049e10..b664f90c39 100644 Binary files a/graphics/pokemon/hitmontop/anim_front.png and b/graphics/pokemon/hitmontop/anim_front.png differ diff --git a/graphics/pokemon/hitmontop/back.png b/graphics/pokemon/hitmontop/back.png index ca3daf80bc..bf440a3bb2 100644 Binary files a/graphics/pokemon/hitmontop/back.png and b/graphics/pokemon/hitmontop/back.png differ diff --git a/graphics/pokemon/hitmontop/normal.pal b/graphics/pokemon/hitmontop/normal.pal index c8cb22d510..c600d5c24d 100644 --- a/graphics/pokemon/hitmontop/normal.pal +++ b/graphics/pokemon/hitmontop/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 144 152 -96 96 104 -248 248 248 -200 200 200 -72 112 192 -96 152 216 -136 184 232 -80 88 144 -128 88 40 +255 255 255 +255 222 156 +222 189 131 +180 139 90 +131 90 41 +139 189 238 +98 156 222 +74 115 197 +82 90 148 +197 74 49 +123 32 24 +205 205 205 +148 148 156 +98 98 106 16 16 16 -216 184 128 -176 136 88 -248 216 152 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/hitmontop/shiny.pal b/graphics/pokemon/hitmontop/shiny.pal index 2928758f4e..8e26aff7f2 100644 --- a/graphics/pokemon/hitmontop/shiny.pal +++ b/graphics/pokemon/hitmontop/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 144 152 -96 96 104 -248 248 248 -200 200 200 -144 72 160 -208 120 200 -240 152 216 -112 48 96 -112 104 80 +255 255 255 +238 238 230 +213 213 197 +172 164 156 +115 106 82 +246 156 222 +213 123 205 +164 82 180 +139 49 123 +197 74 49 +123 32 24 +205 205 205 +148 148 156 +98 98 106 16 16 16 -208 208 192 -168 160 152 -232 232 224 -144 144 152 -0 0 0 diff --git a/graphics/pokemon/hypno/anim_front.png b/graphics/pokemon/hypno/anim_front.png index d96bd7613d..73a791256a 100644 Binary files a/graphics/pokemon/hypno/anim_front.png and b/graphics/pokemon/hypno/anim_front.png differ diff --git a/graphics/pokemon/hypno/anim_frontf.png b/graphics/pokemon/hypno/anim_frontf.png index 692bb8933b..05e99f7645 100644 Binary files a/graphics/pokemon/hypno/anim_frontf.png and b/graphics/pokemon/hypno/anim_frontf.png differ diff --git a/graphics/pokemon/hypno/back.png b/graphics/pokemon/hypno/back.png index 8a7987d1ea..118eba568e 100644 Binary files a/graphics/pokemon/hypno/back.png and b/graphics/pokemon/hypno/back.png differ diff --git a/graphics/pokemon/hypno/backf.png b/graphics/pokemon/hypno/backf.png index a92c0b9917..746fdcb5da 100644 Binary files a/graphics/pokemon/hypno/backf.png and b/graphics/pokemon/hypno/backf.png differ diff --git a/graphics/pokemon/hypno/normal.pal b/graphics/pokemon/hypno/normal.pal index be159251d4..1a211d4f6d 100644 --- a/graphics/pokemon/hypno/normal.pal +++ b/graphics/pokemon/hypno/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 96 48 -104 80 0 -240 216 0 0 0 0 -176 144 32 -88 64 40 -248 232 112 -216 184 64 -128 144 160 -80 88 104 -248 248 248 -152 168 184 -200 216 232 -160 128 88 +106 82 0 +180 148 32 +222 189 65 +246 222 0 +255 238 115 +90 65 41 +139 98 49 +164 131 90 +82 90 106 +131 148 164 +156 172 189 +205 222 238 +255 255 255 0 0 0 diff --git a/graphics/pokemon/hypno/shiny.pal b/graphics/pokemon/hypno/shiny.pal index ffcdb1df7a..b325ea1da4 100644 --- a/graphics/pokemon/hypno/shiny.pal +++ b/graphics/pokemon/hypno/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 96 48 -136 48 80 -232 144 176 -16 16 16 -168 80 112 -88 64 40 -248 176 208 -200 112 168 -160 144 128 -104 88 80 -248 248 248 -184 168 152 -232 216 200 0 0 0 +139 49 82 +172 82 115 +205 106 164 +238 148 180 +255 172 205 +90 65 41 +128 64 40 +136 72 48 +106 90 82 +164 148 131 +189 172 156 +238 222 205 +255 255 255 0 0 0 diff --git a/graphics/pokemon/jellicent/anim_front.png b/graphics/pokemon/jellicent/anim_front.png index 4e08f51dd7..894a95327b 100644 Binary files a/graphics/pokemon/jellicent/anim_front.png and b/graphics/pokemon/jellicent/anim_front.png differ diff --git a/graphics/pokemon/jellicent/anim_frontf.png b/graphics/pokemon/jellicent/anim_frontf.png index d94a329aa6..9ac8ad0320 100644 Binary files a/graphics/pokemon/jellicent/anim_frontf.png and b/graphics/pokemon/jellicent/anim_frontf.png differ diff --git a/graphics/pokemon/kingler/anim_front.png b/graphics/pokemon/kingler/anim_front.png index d60fedc190..fff0a1cb4e 100644 Binary files a/graphics/pokemon/kingler/anim_front.png and b/graphics/pokemon/kingler/anim_front.png differ diff --git a/graphics/pokemon/kingler/back.png b/graphics/pokemon/kingler/back.png index 94feeee730..65b5d137e5 100644 Binary files a/graphics/pokemon/kingler/back.png and b/graphics/pokemon/kingler/back.png differ diff --git a/graphics/pokemon/kingler/normal.pal b/graphics/pokemon/kingler/normal.pal index d05177eee1..78dcded55c 100644 --- a/graphics/pokemon/kingler/normal.pal +++ b/graphics/pokemon/kingler/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -131 41 8 +246 197 139 255 139 82 180 90 74 -16 16 16 -246 197 139 -74 49 32 -222 172 156 -115 82 16 -90 65 49 +131 41 8 255 246 222 +222 172 156 164 106 65 -255 255 255 +115 82 16 +255 16 255 +90 65 49 +74 49 32 +255 16 255 189 189 230 -0 0 0 -0 0 0 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/kingler/shiny.pal b/graphics/pokemon/kingler/shiny.pal index 5c9922a8e8..628e75ebf2 100644 --- a/graphics/pokemon/kingler/shiny.pal +++ b/graphics/pokemon/kingler/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -64 80 0 -136 152 72 -104 112 48 +152 160 208 +180 197 115 +139 156 74 +106 115 49 +74 90 0 +230 246 197 +205 213 115 +148 139 57 +106 98 8 +255 16 255 +90 65 49 +74 49 32 +255 16 255 +222 222 246 16 16 16 -176 192 112 -56 40 24 -200 208 112 -104 96 8 -88 64 56 -224 240 192 -144 136 56 -248 248 248 -184 184 224 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/koffing/anim_front.png b/graphics/pokemon/koffing/anim_front.png index 891ee864d6..2b70b2cf53 100644 Binary files a/graphics/pokemon/koffing/anim_front.png and b/graphics/pokemon/koffing/anim_front.png differ diff --git a/graphics/pokemon/koffing/back.png b/graphics/pokemon/koffing/back.png index 53938fdeb2..e97a5ba3e6 100644 Binary files a/graphics/pokemon/koffing/back.png and b/graphics/pokemon/koffing/back.png differ diff --git a/graphics/pokemon/koffing/normal.pal b/graphics/pokemon/koffing/normal.pal index 3bc7ed3d86..255edac9cc 100644 --- a/graphics/pokemon/koffing/normal.pal +++ b/graphics/pokemon/koffing/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -238 213 106 +255 255 255 +222 222 222 +246 238 205 +205 205 172 +238 115 139 +180 90 123 +255 0 255 246 238 148 +238 213 106 197 180 41 -115 90 156 205 189 238 172 148 205 +115 90 156 74 41 90 16 16 16 -248 248 248 -216 216 216 -180 90 123 -238 115 139 -205 205 172 -246 238 205 -0 0 0 diff --git a/graphics/pokemon/koffing/shiny.pal b/graphics/pokemon/koffing/shiny.pal index 169eb24a04..672d7d4acd 100644 --- a/graphics/pokemon/koffing/shiny.pal +++ b/graphics/pokemon/koffing/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -176 128 176 -208 168 208 -136 88 136 -96 128 128 -176 224 232 +160 208 152 +255 255 255 +222 222 222 +246 238 148 +213 205 106 +255 98 74 +213 57 32 +255 0 255 +222 156 213 +180 123 180 +139 74 139 +180 230 238 136 176 184 +96 128 128 56 80 88 16 16 16 -248 248 248 -216 216 216 -192 80 64 -248 128 112 -208 200 104 -240 232 144 -0 0 0 diff --git a/graphics/pokemon/krabby/anim_front.png b/graphics/pokemon/krabby/anim_front.png index 69d4f372d1..afd1ef7216 100644 Binary files a/graphics/pokemon/krabby/anim_front.png and b/graphics/pokemon/krabby/anim_front.png differ diff --git a/graphics/pokemon/krabby/back.png b/graphics/pokemon/krabby/back.png index ef6d9fee57..5cfafa395f 100644 Binary files a/graphics/pokemon/krabby/back.png and b/graphics/pokemon/krabby/back.png differ diff --git a/graphics/pokemon/krabby/normal.pal b/graphics/pokemon/krabby/normal.pal index 04c1672e79..d8bf9fd9a0 100644 --- a/graphics/pokemon/krabby/normal.pal +++ b/graphics/pokemon/krabby/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -222 57 57 -255 115 49 +255 255 255 +222 222 222 +255 0 255 +255 230 197 +205 172 139 +172 131 74 +115 82 16 +90 65 32 +255 0 255 +255 0 255 255 164 98 +255 115 49 +222 57 57 156 41 8 16 16 16 -90 65 32 -205 172 139 -115 82 16 -172 131 74 -255 230 197 -248 248 248 -222 222 222 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/krabby/shiny.pal b/graphics/pokemon/krabby/shiny.pal index 7128e1de0f..07ac355421 100644 --- a/graphics/pokemon/krabby/shiny.pal +++ b/graphics/pokemon/krabby/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 152 40 -216 200 40 -248 232 112 -120 96 24 +255 255 255 +222 222 222 +255 0 255 +255 246 222 +230 205 164 +189 156 106 +131 115 65 +106 98 74 +255 0 255 +255 0 255 +255 230 32 +222 197 0 +180 156 41 +148 115 0 16 16 16 -88 64 48 -224 200 160 -128 112 64 -184 152 104 -248 240 216 -248 248 248 -216 216 216 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/lickitung/anim_front.png b/graphics/pokemon/lickitung/anim_front.png index 1a6c1aa9cf..c8b1a27945 100644 Binary files a/graphics/pokemon/lickitung/anim_front.png and b/graphics/pokemon/lickitung/anim_front.png differ diff --git a/graphics/pokemon/lickitung/back.png b/graphics/pokemon/lickitung/back.png index ab93fb8842..b3406dc822 100644 Binary files a/graphics/pokemon/lickitung/back.png and b/graphics/pokemon/lickitung/back.png differ diff --git a/graphics/pokemon/lickitung/normal.pal b/graphics/pokemon/lickitung/normal.pal index 520baee770..2b8242a67f 100644 --- a/graphics/pokemon/lickitung/normal.pal +++ b/graphics/pokemon/lickitung/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 64 80 -120 24 16 -232 112 136 -248 152 168 -248 248 248 -248 200 208 -200 192 200 -224 208 112 +255 255 255 +197 197 197 +255 255 180 +230 213 115 +131 123 32 +255 209 241 +255 189 222 +213 139 172 +156 74 98 +255 205 213 +255 156 172 +238 115 139 +180 65 82 +123 24 16 16 16 16 -152 72 96 -208 136 168 -248 184 216 -248 248 176 -128 120 32 -0 0 0 diff --git a/graphics/pokemon/lickitung/shiny.pal b/graphics/pokemon/lickitung/shiny.pal index 29ccdfb690..9af533e830 100644 --- a/graphics/pokemon/lickitung/shiny.pal +++ b/graphics/pokemon/lickitung/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 136 32 -96 96 16 -192 184 40 -232 232 88 -248 248 248 -248 248 168 -200 192 200 -232 216 112 +255 255 255 +222 213 222 +255 255 164 +230 213 115 +131 123 32 +255 172 164 +255 131 123 +222 98 98 +139 57 57 +255 255 156 +238 238 90 +197 189 41 +164 156 8 +123 115 0 16 16 16 -136 56 56 -208 88 88 -248 136 128 -248 248 176 -128 120 32 -0 0 0 diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/magnemite/anim_front.png index d240d64bca..5b60a52772 100644 Binary files a/graphics/pokemon/magnemite/anim_front.png and b/graphics/pokemon/magnemite/anim_front.png differ diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/magnemite/back.png index e1b35043bb..0ddc6b9b86 100644 Binary files a/graphics/pokemon/magnemite/back.png and b/graphics/pokemon/magnemite/back.png differ diff --git a/graphics/pokemon/magnemite/normal.pal b/graphics/pokemon/magnemite/normal.pal index 50084032ff..ec9d62291b 100644 --- a/graphics/pokemon/magnemite/normal.pal +++ b/graphics/pokemon/magnemite/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -139 139 139 -222 255 230 +152 160 208 +255 255 255 213 213 213 +180 180 180 +139 139 139 82 74 74 -16 16 16 57 49 49 255 139 74 238 24 0 -139 180 164 -180 213 189 -90 131 98 82 205 246 41 131 172 -168 168 168 -255 255 255 +222 255 230 +180 213 189 +139 180 164 +90 131 98 +16 16 16 diff --git a/graphics/pokemon/magnemite/shiny.pal b/graphics/pokemon/magnemite/shiny.pal index 906f25a0a2..644ce56eee 100644 --- a/graphics/pokemon/magnemite/shiny.pal +++ b/graphics/pokemon/magnemite/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 136 136 -248 248 248 -208 208 208 -80 72 72 +255 255 255 +213 213 213 +180 180 180 +139 139 139 +82 74 74 +57 49 49 +88 88 88 +32 32 32 +88 88 88 +32 32 32 +255 255 205 +230 222 172 +197 180 148 +148 139 82 16 16 16 -56 48 48 -176 176 176 -80 72 72 -192 176 144 -224 216 168 -144 136 80 -176 176 176 -80 72 72 -176 176 176 -248 248 200 diff --git a/graphics/pokemon/magneton/anim_front.png b/graphics/pokemon/magneton/anim_front.png index 72a8aa907e..e9a57fcf72 100644 Binary files a/graphics/pokemon/magneton/anim_front.png and b/graphics/pokemon/magneton/anim_front.png differ diff --git a/graphics/pokemon/magneton/back.png b/graphics/pokemon/magneton/back.png index 7a45ee78dd..038cd4b1eb 100644 Binary files a/graphics/pokemon/magneton/back.png and b/graphics/pokemon/magneton/back.png differ diff --git a/graphics/pokemon/magneton/normal.pal b/graphics/pokemon/magneton/normal.pal index 55f2f9d992..35aff4d063 100644 --- a/graphics/pokemon/magneton/normal.pal +++ b/graphics/pokemon/magneton/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +152 160 208 +255 255 255 +213 213 213 +180 180 180 +139 139 139 82 74 74 57 49 49 255 139 74 -16 16 16 238 24 0 -139 139 139 82 205 246 -213 213 213 41 131 172 -208 208 208 -74 98 74 +213 246 222 180 213 189 131 156 156 -248 248 248 -168 168 168 +74 98 74 +16 16 16 diff --git a/graphics/pokemon/magneton/shiny.pal b/graphics/pokemon/magneton/shiny.pal index 36ca0b6263..644ce56eee 100644 --- a/graphics/pokemon/magneton/shiny.pal +++ b/graphics/pokemon/magneton/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 72 72 -56 48 48 -136 136 136 +255 255 255 +213 213 213 +180 180 180 +139 139 139 +82 74 74 +57 49 49 +88 88 88 +32 32 32 +88 88 88 +32 32 32 +255 255 205 +230 222 172 +197 180 148 +148 139 82 16 16 16 -56 48 48 -136 136 136 -136 136 136 -248 248 248 -56 48 48 -208 208 208 -128 120 64 -224 216 168 -192 176 144 -248 248 248 -176 176 176 diff --git a/graphics/pokemon/marowak/anim_front.png b/graphics/pokemon/marowak/anim_front.png index 696a9633a9..bbfaad3734 100644 Binary files a/graphics/pokemon/marowak/anim_front.png and b/graphics/pokemon/marowak/anim_front.png differ diff --git a/graphics/pokemon/marowak/back.png b/graphics/pokemon/marowak/back.png index 76acb2c823..82a9c2da99 100644 Binary files a/graphics/pokemon/marowak/back.png and b/graphics/pokemon/marowak/back.png differ diff --git a/graphics/pokemon/marowak/normal.pal b/graphics/pokemon/marowak/normal.pal index 6aa7063f20..a82b6c9a83 100644 --- a/graphics/pokemon/marowak/normal.pal +++ b/graphics/pokemon/marowak/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -139 139 106 -248 248 248 -16 16 16 +255 255 255 +230 230 230 197 197 205 +139 139 106 82 74 57 -224 224 232 -90 65 16 -197 156 74 +16 16 16 148 106 82 -224 176 120 -176 144 136 -120 88 80 +197 156 74 +246 197 148 230 148 82 189 115 57 -246 197 148 +222 189 106 +197 156 74 +148 106 82 +90 65 16 diff --git a/graphics/pokemon/marowak/shiny.pal b/graphics/pokemon/marowak/shiny.pal index b074efb1b5..7c45006bb1 100644 --- a/graphics/pokemon/marowak/shiny.pal +++ b/graphics/pokemon/marowak/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -120 136 112 -248 248 248 +152 160 208 +255 255 255 +230 222 222 +197 189 189 +123 139 115 +65 74 74 16 16 16 -192 184 184 -64 72 72 -224 216 216 -64 96 24 -160 200 72 -104 152 72 -192 232 112 -160 200 72 -104 152 72 -216 168 104 -168 128 64 -232 208 144 +132 94 72 +189 148 66 +238 213 148 +222 164 82 +180 131 57 +197 238 115 +156 197 74 +106 156 65 +57 106 0 diff --git a/graphics/pokemon/muk/anim_front.png b/graphics/pokemon/muk/anim_front.png index 0f9c23f51b..dad71c460e 100644 Binary files a/graphics/pokemon/muk/anim_front.png and b/graphics/pokemon/muk/anim_front.png differ diff --git a/graphics/pokemon/muk/back.png b/graphics/pokemon/muk/back.png index 1a197e4695..d0fc344d68 100644 Binary files a/graphics/pokemon/muk/back.png and b/graphics/pokemon/muk/back.png differ diff --git a/graphics/pokemon/muk/normal.pal b/graphics/pokemon/muk/normal.pal index f35af64a4e..3737ca4aa4 100644 --- a/graphics/pokemon/muk/normal.pal +++ b/graphics/pokemon/muk/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -123 74 131 +255 255 255 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +238 222 238 230 189 238 197 164 205 164 123 172 +123 74 131 90 49 115 +144 96 152 +255 0 255 +255 0 255 16 16 16 -248 248 248 -172 180 189 -65 74 90 -131 139 156 -224 208 232 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/muk/shiny.pal b/graphics/pokemon/muk/shiny.pal index 082d96af73..7a972bc544 100644 --- a/graphics/pokemon/muk/shiny.pal +++ b/graphics/pokemon/muk/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -88 136 56 -176 216 136 -144 192 120 -120 168 88 -64 112 32 +152 160 208 +255 255 255 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +197 230 156 +180 222 139 +148 197 123 +123 172 90 +90 139 57 +65 115 32 +104 152 72 +255 0 255 +255 0 255 16 16 16 -248 248 248 -168 176 184 -64 72 88 -128 136 152 -208 232 176 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/nidoking/anim_front.png b/graphics/pokemon/nidoking/anim_front.png index a085144749..22ab26b320 100644 Binary files a/graphics/pokemon/nidoking/anim_front.png and b/graphics/pokemon/nidoking/anim_front.png differ diff --git a/graphics/pokemon/nidoking/back.png b/graphics/pokemon/nidoking/back.png index 6291e963e1..08c067f7f0 100644 Binary files a/graphics/pokemon/nidoking/back.png and b/graphics/pokemon/nidoking/back.png differ diff --git a/graphics/pokemon/onix/anim_front.png b/graphics/pokemon/onix/anim_front.png index 6aab94e97f..933b71d66b 100644 Binary files a/graphics/pokemon/onix/anim_front.png and b/graphics/pokemon/onix/anim_front.png differ diff --git a/graphics/pokemon/onix/back.png b/graphics/pokemon/onix/back.png index 4a9e34afd3..c199fa228d 100644 Binary files a/graphics/pokemon/onix/back.png and b/graphics/pokemon/onix/back.png differ diff --git a/graphics/pokemon/onix/normal.pal b/graphics/pokemon/onix/normal.pal index 3391776633..c57e5be585 100644 --- a/graphics/pokemon/onix/normal.pal +++ b/graphics/pokemon/onix/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -82 74 74 -131 123 123 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +40 32 32 246 238 238 -189 180 180 -16 16 16 222 213 213 -248 248 248 -248 248 248 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +189 180 180 +131 123 123 +82 74 74 +16 16 16 diff --git a/graphics/pokemon/onix/shiny.pal b/graphics/pokemon/onix/shiny.pal index 8cad51aca7..bc6d63ea51 100644 --- a/graphics/pokemon/onix/shiny.pal +++ b/graphics/pokemon/onix/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -88 96 24 -128 136 56 -232 232 136 -160 168 80 +152 160 208 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +40 32 32 +238 246 131 +205 213 98 +172 180 82 +131 148 57 +106 115 24 16 16 16 -200 200 112 -248 248 248 -240 232 232 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/rhydon/anim_front.png b/graphics/pokemon/rhydon/anim_front.png index 758a245b58..e3af357623 100644 Binary files a/graphics/pokemon/rhydon/anim_front.png and b/graphics/pokemon/rhydon/anim_front.png differ diff --git a/graphics/pokemon/rhydon/anim_frontf.png b/graphics/pokemon/rhydon/anim_frontf.png index 31fdb1e04f..b0e58b0e1d 100644 Binary files a/graphics/pokemon/rhydon/anim_frontf.png and b/graphics/pokemon/rhydon/anim_frontf.png differ diff --git a/graphics/pokemon/rhydon/back.png b/graphics/pokemon/rhydon/back.png index 8d810fca79..394072ea20 100644 Binary files a/graphics/pokemon/rhydon/back.png and b/graphics/pokemon/rhydon/back.png differ diff --git a/graphics/pokemon/rhydon/backf.png b/graphics/pokemon/rhydon/backf.png index 4e40dc7798..7c7a065538 100644 Binary files a/graphics/pokemon/rhydon/backf.png and b/graphics/pokemon/rhydon/backf.png differ diff --git a/graphics/pokemon/rhydon/normal.pal b/graphics/pokemon/rhydon/normal.pal index 2658775bce..94daed457b 100644 --- a/graphics/pokemon/rhydon/normal.pal +++ b/graphics/pokemon/rhydon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -139 139 148 -82 82 90 -197 197 189 -16 16 16 -230 230 222 -248 248 248 -224 224 216 -115 90 49 -255 238 197 +255 255 255 +255 255 197 +230 213 172 180 164 115 +115 90 49 +230 82 57 164 49 16 -230 82 57 -160 48 16 -230 82 57 115 32 16 +255 0 255 +255 0 255 +222 230 230 +181 189 205 +123 131 147 +65 74 90 +16 16 16 diff --git a/graphics/pokemon/rhydon/shiny.pal b/graphics/pokemon/rhydon/shiny.pal index 4f48df440c..6ff4a62c6b 100644 --- a/graphics/pokemon/rhydon/shiny.pal +++ b/graphics/pokemon/rhydon/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 144 112 -96 88 64 -216 200 168 +255 255 255 +255 238 197 +230 213 172 +180 164 115 +115 90 49 +230 82 57 +164 49 16 +115 32 16 +255 0 255 +255 0 255 +255 246 213 +222 213 180 +164 156 123 +115 106 74 16 16 16 -248 240 208 -248 248 248 -224 224 216 -112 88 48 -224 208 168 -176 160 112 -160 72 48 -224 120 96 -160 72 48 -224 120 96 -112 32 16 diff --git a/graphics/pokemon/rhyhorn/anim_front.png b/graphics/pokemon/rhyhorn/anim_front.png index 589b7c2f98..94bbb6e3e4 100644 Binary files a/graphics/pokemon/rhyhorn/anim_front.png and b/graphics/pokemon/rhyhorn/anim_front.png differ diff --git a/graphics/pokemon/rhyhorn/anim_frontf.png b/graphics/pokemon/rhyhorn/anim_frontf.png index c086ed4d96..a85f23ff9e 100644 Binary files a/graphics/pokemon/rhyhorn/anim_frontf.png and b/graphics/pokemon/rhyhorn/anim_frontf.png differ diff --git a/graphics/pokemon/rhyhorn/back.png b/graphics/pokemon/rhyhorn/back.png index dfa96100e0..d32c204aa6 100644 Binary files a/graphics/pokemon/rhyhorn/back.png and b/graphics/pokemon/rhyhorn/back.png differ diff --git a/graphics/pokemon/rhyhorn/backf.png b/graphics/pokemon/rhyhorn/backf.png index c5a253b3be..c58b014f86 100644 Binary files a/graphics/pokemon/rhyhorn/backf.png and b/graphics/pokemon/rhyhorn/backf.png differ diff --git a/graphics/pokemon/rhyhorn/normal.pal b/graphics/pokemon/rhyhorn/normal.pal index 19493646a0..01b9d75955 100644 --- a/graphics/pokemon/rhyhorn/normal.pal +++ b/graphics/pokemon/rhyhorn/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 +222 230 230 +164 189 197 139 148 156 98 98 131 -222 230 230 57 57 82 -248 248 248 -164 189 197 -16 16 16 172 57 41 -88 8 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +90 8 0 +112 112 144 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/rhyhorn/shiny.pal b/graphics/pokemon/rhyhorn/shiny.pal index e207060d75..8fb03a0257 100644 --- a/graphics/pokemon/rhyhorn/shiny.pal +++ b/graphics/pokemon/rhyhorn/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 96 72 -120 48 32 -240 192 160 -56 24 8 -248 248 248 -200 144 112 +246 197 164 +205 148 115 +164 98 74 +123 49 32 +74 24 0 +172 57 41 +90 8 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 16 16 16 -168 56 40 -88 8 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/seel/anim_front.png b/graphics/pokemon/seel/anim_front.png index 9626b88941..5e1923a644 100644 Binary files a/graphics/pokemon/seel/anim_front.png and b/graphics/pokemon/seel/anim_front.png differ diff --git a/graphics/pokemon/seel/back.png b/graphics/pokemon/seel/back.png index 0521176e36..2c7f8706a3 100644 Binary files a/graphics/pokemon/seel/back.png and b/graphics/pokemon/seel/back.png differ diff --git a/graphics/pokemon/seel/normal.pal b/graphics/pokemon/seel/normal.pal index 2868415702..d4b4a1c4f0 100644 --- a/graphics/pokemon/seel/normal.pal +++ b/graphics/pokemon/seel/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -65 82 131 -148 156 180 230 230 246 213 205 238 -16 16 16 -248 248 248 -41 172 164 -106 90 16 -180 148 65 +148 156 180 +65 82 131 246 230 189 -136 48 32 -208 112 88 -248 168 168 -200 176 128 -0 0 0 +222 197 115 +180 148 65 +106 90 16 +255 172 172 +213 115 90 +139 49 32 +255 0 255 +41 172 164 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/seel/shiny.pal b/graphics/pokemon/seel/shiny.pal index 43d60b7753..5b3f96c960 100644 --- a/graphics/pokemon/seel/shiny.pal +++ b/graphics/pokemon/seel/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 120 112 -176 168 160 -232 232 224 -208 208 200 +238 238 230 +213 213 205 +180 172 164 +131 123 115 +246 230 189 +213 189 106 +180 148 65 +106 90 16 +255 172 172 +213 115 90 +139 49 32 +255 0 255 +163 145 128 16 16 16 -248 248 248 -248 0 248 -104 88 16 -176 144 64 -240 224 184 -136 48 32 -208 112 88 -248 168 168 -216 192 112 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/shellder/anim_front.png b/graphics/pokemon/shellder/anim_front.png index ec58b85d15..110cc99bb8 100644 Binary files a/graphics/pokemon/shellder/anim_front.png and b/graphics/pokemon/shellder/anim_front.png differ diff --git a/graphics/pokemon/shellder/back.png b/graphics/pokemon/shellder/back.png index 6a402e9ea1..072f553407 100644 Binary files a/graphics/pokemon/shellder/back.png and b/graphics/pokemon/shellder/back.png differ diff --git a/graphics/pokemon/shellder/normal.pal b/graphics/pokemon/shellder/normal.pal index 462bd5ee49..519374444d 100644 --- a/graphics/pokemon/shellder/normal.pal +++ b/graphics/pokemon/shellder/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 88 136 -216 216 240 -152 136 192 -192 184 232 +222 222 246 +197 189 238 +156 139 197 +115 90 139 +74 57 98 +238 172 180 +197 98 106 +123 16 49 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +131 131 148 16 16 16 -72 56 96 -128 128 144 -248 248 248 -120 16 48 -192 96 104 -232 168 176 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/shellder/shiny.pal b/graphics/pokemon/shellder/shiny.pal index 4ec99543dd..a653db1e00 100644 --- a/graphics/pokemon/shellder/shiny.pal +++ b/graphics/pokemon/shellder/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 96 32 -248 216 112 -208 128 40 -248 176 48 +255 205 41 +255 164 0 +222 123 0 +197 90 0 +164 49 0 +255 123 65 +205 74 32 +123 32 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +106 106 106 16 16 16 -120 48 24 -128 128 144 -248 248 248 -120 32 16 -200 72 32 -248 120 64 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/tangela/anim_front.png b/graphics/pokemon/tangela/anim_front.png index a42e81c244..b9b542e28f 100644 Binary files a/graphics/pokemon/tangela/anim_front.png and b/graphics/pokemon/tangela/anim_front.png differ diff --git a/graphics/pokemon/tangela/back.png b/graphics/pokemon/tangela/back.png index 0cec14c7da..7a491bd9fd 100644 Binary files a/graphics/pokemon/tangela/back.png and b/graphics/pokemon/tangela/back.png differ diff --git a/graphics/pokemon/tangela/normal.pal b/graphics/pokemon/tangela/normal.pal index 03893711c1..fff4b5b407 100644 --- a/graphics/pokemon/tangela/normal.pal +++ b/graphics/pokemon/tangela/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -65 123 148 148 213 246 90 164 205 +65 123 148 32 65 82 -16 16 16 -82 82 82 -180 180 180 -248 248 248 -115 41 41 -172 41 65 255 131 131 222 74 106 -0 0 0 -0 0 0 -0 0 0 +172 41 65 +115 41 41 +255 0 255 +255 0 255 +255 0 255 +180 180 180 +82 82 82 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/tangela/shiny.pal b/graphics/pokemon/tangela/shiny.pal index 66c10f1fc9..fa3d79d32a 100644 --- a/graphics/pokemon/tangela/shiny.pal +++ b/graphics/pokemon/tangela/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -72 144 72 -136 240 88 -104 192 40 -40 80 40 +152 160 208 +136 255 88 +88 200 8 +32 164 32 +16 88 16 +255 148 131 +222 90 106 +172 40 65 +115 41 41 +255 0 255 +255 0 255 +255 0 255 +180 180 180 +82 82 82 16 16 16 -80 80 80 -176 176 176 -248 248 248 -112 40 40 -168 64 80 -248 144 144 -216 80 112 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/voltorb/anim_front.png b/graphics/pokemon/voltorb/anim_front.png index 28c443a3a3..166824d054 100644 Binary files a/graphics/pokemon/voltorb/anim_front.png and b/graphics/pokemon/voltorb/anim_front.png differ diff --git a/graphics/pokemon/voltorb/back.png b/graphics/pokemon/voltorb/back.png index 6010acc3b7..cf0cf334ea 100644 Binary files a/graphics/pokemon/voltorb/back.png and b/graphics/pokemon/voltorb/back.png differ diff --git a/graphics/pokemon/voltorb/normal.pal b/graphics/pokemon/voltorb/normal.pal index 79af1efd7f..981ab31a35 100644 --- a/graphics/pokemon/voltorb/normal.pal +++ b/graphics/pokemon/voltorb/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -131 16 16 -213 49 65 -255 82 32 -238 65 49 -255 131 90 -255 172 156 -213 49 65 +255 255 255 222 213 213 180 172 189 -248 248 248 -88 80 80 -136 128 128 -0 0 0 -0 0 0 +139 131 131 +90 82 82 +255 0 255 +255 0 255 +255 0 255 +255 172 156 +255 131 90 +255 82 32 +238 65 49 +213 49 65 +131 16 16 +16 16 16 diff --git a/graphics/pokemon/voltorb/shiny.pal b/graphics/pokemon/voltorb/shiny.pal index 6b46ff5d7e..06e1879254 100644 --- a/graphics/pokemon/voltorb/shiny.pal +++ b/graphics/pokemon/voltorb/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 +255 255 255 +222 213 213 +180 172 189 +139 131 131 +90 82 82 +255 0 255 +255 0 255 +255 0 255 +156 172 255 +90 131 255 +0 82 255 +49 65 238 +41 24 189 +0 0 115 16 16 16 -32 32 112 -56 40 184 -48 112 248 -72 88 232 -112 144 248 -168 184 248 -56 40 184 -216 208 208 -176 168 184 -248 248 248 -88 80 80 -136 128 128 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/weezing/anim_front.png b/graphics/pokemon/weezing/anim_front.png index 3bc2cb26f6..bda98b3f4b 100644 Binary files a/graphics/pokemon/weezing/anim_front.png and b/graphics/pokemon/weezing/anim_front.png differ diff --git a/graphics/pokemon/weezing/back.png b/graphics/pokemon/weezing/back.png index 92fd4020bb..0a5876baf1 100644 Binary files a/graphics/pokemon/weezing/back.png and b/graphics/pokemon/weezing/back.png differ diff --git a/graphics/pokemon/weezing/normal.pal b/graphics/pokemon/weezing/normal.pal index 715cd4c89a..ded0142be1 100644 --- a/graphics/pokemon/weezing/normal.pal +++ b/graphics/pokemon/weezing/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -197 213 139 -246 238 148 -197 180 41 -131 90 139 -189 139 205 -98 49 123 -164 106 180 -213 164 222 -16 16 16 +152 200 208 255 255 255 189 189 189 172 164 82 -172 164 82 -156 82 98 +213 213 180 213 115 131 +156 82 98 +246 238 148 +197 213 139 +197 180 41 +213 164 222 +189 139 205 +164 106 180 +131 90 139 +98 49 123 +16 16 16 diff --git a/graphics/pokemon/weezing/shiny.pal b/graphics/pokemon/weezing/shiny.pal index 11a7a0793d..16175411c0 100644 --- a/graphics/pokemon/weezing/shiny.pal +++ b/graphics/pokemon/weezing/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -176 128 176 -208 168 208 -136 88 136 -56 104 104 -128 176 168 -24 64 64 -88 136 128 -168 216 200 +160 208 152 +255 255 255 +222 222 222 +172 156 16 +213 205 106 +222 98 32 +164 32 0 +222 156 213 +180 123 180 +139 74 139 +156 213 197 +123 180 172 +82 139 131 +49 106 106 +16 74 74 16 16 16 -248 248 248 -184 184 184 -208 200 112 -160 144 48 -160 64 48 -216 120 72 diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index a7d03e09e1..4aa4273535 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1243,7 +1243,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 10 }, [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 7 }, [SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 2 }, - [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, + [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, #if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, @@ -1253,7 +1253,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, #endif #if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 16 }, #endif diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 004e1be917..4ef339a9a0 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -2,7 +2,7 @@ // is during battle. Species that float or fly have nonzero values. const u8 gEnemyMonElevation[NUM_SPECIES + 1] = { - [SPECIES_BUTTERFREE] = 10, + [SPECIES_BUTTERFREE] = 12, [SPECIES_BEEDRILL] = 9, [SPECIES_PIDGEOT] = 5, [SPECIES_FEAROW] = 6, @@ -12,10 +12,10 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_GEODUDE] = 10, [SPECIES_MAGNEMITE] = 17, [SPECIES_MAGNETON] = 9, - [SPECIES_GASTLY] = 10, - [SPECIES_HAUNTER] = 11, + [SPECIES_GASTLY] = 13, + [SPECIES_HAUNTER] = 14, [SPECIES_KOFFING] = 14, - [SPECIES_WEEZING] = 6, + [SPECIES_WEEZING] = 3, [SPECIES_AERODACTYL] = 9, [SPECIES_ZAPDOS] = 8, [SPECIES_MEW] = 11, @@ -41,16 +41,15 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_WINGULL] = 15, [SPECIES_PELIPPER] = 8, [SPECIES_MASQUERAIN] = 10, - [SPECIES_BALTOY] = 5, + [SPECIES_BALTOY] = 8, [SPECIES_CLAYDOL] = 10, [SPECIES_FLYGON] = 7, [SPECIES_GLALIE] = 12, [SPECIES_LUNATONE] = 13, [SPECIES_SOLROCK] = 4, - [SPECIES_ALTARIA] = 8, + [SPECIES_BARBOACH] = 7, [SPECIES_DUSKULL] = 13, [SPECIES_SHUPPET] = 14, - [SPECIES_BANETTE] = 8, [SPECIES_CASTFORM_NORMAL] = 16, [SPECIES_BELDUM] = 8, [SPECIES_RAYQUAZA] = 6, @@ -59,44 +58,58 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_JIRACHI] = 14, [SPECIES_CHIMECHO] = 16, // Gen 4 + [SPECIES_BURMY] = 10, + [SPECIES_WORMADAM] = 8, [SPECIES_MOTHIM] = 10, - [SPECIES_COMBEE] = 8, + [SPECIES_COMBEE] = 15, [SPECIES_VESPIQUEN] = 4, [SPECIES_DRIFLOON] = 5, [SPECIES_DRIFBLIM] = 7, [SPECIES_MISMAGIUS] = 3, - [SPECIES_CHINGLING] = 5, - [SPECIES_BRONZONG] = 4, + [SPECIES_BRONZOR] = 9, + [SPECIES_BRONZONG] = 7, + [SPECIES_CARNIVINE] = 8, [SPECIES_MAGNEZONE] = 4, [SPECIES_TOGEKISS] = 14, [SPECIES_YANMEGA] = 6, [SPECIES_GLISCOR] = 9, [SPECIES_PORYGON_Z] = 12, [SPECIES_PROBOPASS] = 6, + [SPECIES_DUSKNOIR] = 6, + [SPECIES_FROSLASS] = 7, [SPECIES_ROTOM] = 10, [SPECIES_UXIE] = 6, [SPECIES_MESPRIT] = 6, [SPECIES_AZELF] = 6, [SPECIES_CRESSELIA] = 3, + [SPECIES_PHIONE] = 8, + [SPECIES_MANAPHY] = 10, [SPECIES_DARKRAI] = 4, // Gen 5 [SPECIES_MUNNA] = 7, [SPECIES_MUSHARNA] = 5, [SPECIES_WOOBAT] = 19, - [SPECIES_SWOOBAT] = 12, + [SPECIES_SWOOBAT] = 10, [SPECIES_PETILIL] = 7, + [SPECIES_BASCULIN] = 6, [SPECIES_SIGILYPH] = 7, [SPECIES_YAMASK] = 10, - [SPECIES_ARCHEOPS] = 8, + [SPECIES_ARCHEOPS] = 11, [SPECIES_SOLOSIS] = 14, [SPECIES_DUOSION] = 7, [SPECIES_REUNICLUS] = 8, [SPECIES_EMOLGA] = 19, + [SPECIES_FERROTHORN] = 10, + [SPECIES_KLINK] = 12, + [SPECIES_KLANG] = 8, + [SPECIES_KLINKLANG] = 4, [SPECIES_TYNAMO] = 16, [SPECIES_EELEKTRIK] = 8, [SPECIES_EELEKTROSS] = 8, + [SPECIES_LAMPENT] = 6, + [SPECIES_CHANDELURE] = 6, [SPECIES_CRYOGONAL] = 3, - [SPECIES_BRAVIARY] = 8, + [SPECIES_BRAVIARY] = 6, [SPECIES_HYDREIGON] = 3, [SPECIES_VOLCARONA] = 6, [SPECIES_TORNADUS_INCARNATE] = 7, @@ -124,6 +137,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_VIKAVOLT] = 8, [SPECIES_CUTIEFLY] = 10, [SPECIES_RIBOMBEE] = 6, + [SPECIES_WISHIWASHI_SOLO] = 12, [SPECIES_COMFEY] = 8, [SPECIES_MINIOR_METEOR_RED] = 17, [SPECIES_DHELMISE] = 2, @@ -154,6 +168,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_ETERNATUS] = 4, [SPECIES_REGIELEKI] = 8, [SPECIES_REGIDRAGO] = 5, + [SPECIES_BASCULEGION] = 5, + [SPECIES_ENAMORUS] = 7, // Megas [SPECIES_BEEDRILL_MEGA] = 5, [SPECIES_PIDGEOT_MEGA] = 8, @@ -178,8 +194,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_ARTICUNO_GALARIAN] = 10, [SPECIES_YAMASK_GALARIAN] = 4, // Hisuian Forms - [SPECIES_VOLTORB_HISUIAN] = 1, - [SPECIES_ELECTRODE_HISUIAN] = 4, + [SPECIES_QWILFISH_HISUIAN] = 9, [SPECIES_BRAVIARY_HISUIAN] = 3, // Other Forms [SPECIES_UNOWN_B] = 8, @@ -212,12 +227,18 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_CASTFORM_SUNNY] = 5, [SPECIES_CASTFORM_RAINY] = 5, [SPECIES_CASTFORM_SNOWY] = 5, + [SPECIES_BURMY_SANDY_CLOAK] = 10, + [SPECIES_BURMY_TRASH_CLOAK] = 10, + [SPECIES_WORMADAM_SANDY_CLOAK] = 8, + [SPECIES_WORMADAM_TRASH_CLOAK] = 8, [SPECIES_ROTOM_HEAT] = 6, [SPECIES_ROTOM_WASH] = 6, [SPECIES_ROTOM_FROST] = 6, [SPECIES_ROTOM_FAN] = 6, [SPECIES_ROTOM_MOW] = 6, [SPECIES_GIRATINA_ORIGIN] = 7, + [SPECIES_BASCULIN_BLUE_STRIPED] = 6, + [SPECIES_BASCULIN_WHITE_STRIPED] = 6, [SPECIES_THUNDURUS_THERIAN] = 7, [SPECIES_MELOETTA_PIROUETTE] = 5, [SPECIES_VIVILLON_POLAR] = 9, @@ -268,20 +289,23 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_SINISTEA_ANTIQUE] = 10, [SPECIES_POLTEAGEIST_ANTIQUE] = 12, [SPECIES_ETERNATUS_ETERNAMAX] = 13, + [SPECIES_BASCULEGION_FEMALE] = 5, #if P_GEN_9_POKEMON == TRUE [SPECIES_TADBULB] = 12, - [SPECIES_BRAMBLIN] = 1, - [SPECIES_BRAMBLEGHAST] = 1, - [SPECIES_BOMBIRDIER] = 11, - [SPECIES_GLIMMET] = 1, - [SPECIES_GLIMMORA] = 10, - [SPECIES_VELUZA] = 1, + [SPECIES_BOMBIRDIER] = 8, + [SPECIES_GLIMMET] = 11, + [SPECIES_GLIMMORA] = 8, + [SPECIES_VELUZA] = 5, [SPECIES_DONDOZO] = 1, [SPECIES_FLUTTER_MANE] = 5, [SPECIES_IRON_JUGULIS] = 7, - [SPECIES_IRON_MOTH] = 4, - [SPECIES_CHI_YU] = 2, - [SPECIES_ROARING_MOON] = 20, + [SPECIES_IRON_MOTH] = 8, + [SPECIES_CHI_YU] = 9, + [SPECIES_ROARING_MOON] = 6, + [SPECIES_POLTCHAGEIST_COUNTERFEIT] = 10, + [SPECIES_POLTCHAGEIST_ARTISAN] = 10, + [SPECIES_SINISTCHA_UNREMARKABLE] = 10, + [SPECIES_SINISTCHA_MASTERPIECE] = 10, #endif - [SPECIES_BUTTERFREE_GIGANTAMAX] = 10, + [SPECIES_BUTTERFREE_GIGANTAMAX] = 7, }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index f82bcc5e26..ba03f71bbb 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -195,8 +195,6 @@ static const union AnimCmd sAnim_Pidgeot_1[] = { ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -995,16 +993,16 @@ static const union AnimCmd sAnim_Dodrio_1[] = ANIMCMD_FRAME(1, 12), ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), ANIMCMD_FRAME(0, 8), ANIMCMD_END, }; static const union AnimCmd sAnim_Seel_1[] = { - ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -1065,30 +1063,22 @@ static const union AnimCmd sAnim_Shellder_1[] = static const union AnimCmd sAnim_Cloyster_1[] = { - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Gastly_1[] = { - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -1113,7 +1103,6 @@ static const union AnimCmd sAnim_Gengar_1[] = static const union AnimCmd sAnim_Onix_1[] = { ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; @@ -1143,26 +1132,19 @@ static const union AnimCmd sAnim_Hypno_1[] = static const union AnimCmd sAnim_Krabby_1[] = { - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), ANIMCMD_FRAME(0, 8), ANIMCMD_END, }; static const union AnimCmd sAnim_Kingler_1[] = { - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 14), ANIMCMD_END, }; @@ -1178,11 +1160,10 @@ static const union AnimCmd sAnim_Voltorb_1[] = static const union AnimCmd sAnim_Electrode_1[] = { - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 34), + ANIMCMD_FRAME(1, 34), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -1209,12 +1190,12 @@ static const union AnimCmd sAnim_Exeggutor_1[] = static const union AnimCmd sAnim_Cubone_1[] = { - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -1231,28 +1212,31 @@ static const union AnimCmd sAnim_Marowak_1[] = static const union AnimCmd sAnim_Hitmonlee_1[] = { - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Hitmonchan_1[] = { - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; static const union AnimCmd sAnim_Lickitung_1[] = { - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(1, 16), ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; @@ -1316,11 +1300,8 @@ static const union AnimCmd sAnim_Rhyhorn_2[] = static const union AnimCmd sAnim_Rhydon_1[] = { - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 48), - ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; @@ -1343,16 +1324,9 @@ static const union AnimCmd sAnim_Chansey_1[] = static const union AnimCmd sAnim_Tangela_1[] = { - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(0, 40), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -2707,17 +2681,11 @@ static const union AnimCmd sAnim_Tyrogue_1[] = static const union AnimCmd sAnim_Hitmontop_1[] = { - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 26), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 9daab74fe8..80506717c7 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -38,7 +38,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_NIDOQUEEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_NIDORAN_M] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_NIDORINO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, - [SPECIES_NIDOKING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_NIDOKING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_CLEFAIRY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_CLEFABLE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_VULPIX] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, @@ -104,19 +104,19 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_HYPNO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_KRABBY] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 14 }, [SPECIES_KINGLER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, - [SPECIES_VOLTORB] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 11 }, - [SPECIES_ELECTRODE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, + [SPECIES_VOLTORB] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 15 }, + [SPECIES_ELECTRODE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_EXEGGCUTE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_EXEGGUTOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CUBONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_MAROWAK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 8 }, - [SPECIES_HITMONLEE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_HITMONCHAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_HITMONLEE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_HITMONCHAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 4 }, [SPECIES_LICKITUNG] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_KOFFING] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_WEEZING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_RHYHORN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, - [SPECIES_RHYDON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_RHYDON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 3 }, [SPECIES_CHANSEY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_TANGELA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_KANGASKHAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -202,7 +202,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SUNFLORA] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, [SPECIES_YANMA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_WOOPER] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, - [SPECIES_WOOPER_PALDEAN] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 12 }, + [SPECIES_WOOPER_PALDEAN] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_QUAGSIRE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_ESPEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_UMBREON] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, @@ -255,7 +255,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ENTEI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_SUICUNE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_LARVITAR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, - [SPECIES_PUPITAR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, + [SPECIES_PUPITAR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_TYRANITAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LUGIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_HO_OH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -291,7 +291,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SWELLOW] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_SHROOMISH] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_BRELOOM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, - [SPECIES_SPINDA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, + [SPECIES_SPINDA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 8 }, [SPECIES_WINGULL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_PELIPPER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_SURSKIT] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, @@ -301,14 +301,14 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SKITTY] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_DELCATTY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_KECLEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 5 }, - [SPECIES_BALTOY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 11 }, + [SPECIES_BALTOY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_CLAYDOL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_NOSEPASS] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_TORKOAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SABLEYE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, - [SPECIES_BARBOACH] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 11 }, + [SPECIES_BARBOACH] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_WHISCASH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_LUVDISC] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 11 }, + [SPECIES_LUVDISC] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_CORPHISH] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_CRAWDAUNT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FEEBAS] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, @@ -341,7 +341,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MAWILE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_MEDITITE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_MEDICHAM] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, - [SPECIES_SWABLU] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, + [SPECIES_SWABLU] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_ALTARIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_WYNAUT] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_DUSKULL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 12 }, @@ -364,7 +364,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_BANETTE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_SEVIPER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_ZANGOOSE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_RELICANTH] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 10 }, + [SPECIES_RELICANTH] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_ARON] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_LAIRON] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_AGGRON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -442,7 +442,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_HONCHKROW] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GLAMEOW] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_PURUGLY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_CHINGLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, + [SPECIES_CHINGLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_STUNKY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, [SPECIES_SKUNTANK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_BRONZOR] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, @@ -486,7 +486,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PORYGON_Z] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 6 }, [SPECIES_GALLADE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_PROBOPASS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_DUSKNOIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_DUSKNOIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FROSLASS] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, [SPECIES_ROTOM] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_UXIE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, @@ -498,8 +498,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_REGIGIGAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_GIRATINA_ALTERED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CRESSELIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 8 }, - [SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 10 }, + [SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, + [SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SHAYMIN_LAND] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_ARCEUS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -528,7 +528,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SIMISEAR] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_PANPOUR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_SIMIPOUR] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, - [SPECIES_MUNNA] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 14 }, + [SPECIES_MUNNA] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 }, [SPECIES_MUSHARNA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_PIDOVE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_TRANQUILL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, @@ -543,7 +543,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_DRILBUR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_EXCADRILL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_AUDINO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, - [SPECIES_TIMBURR] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, + [SPECIES_TIMBURR] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_GURDURR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CONKELDURR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_TYMPOLE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, @@ -604,7 +604,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_FOONGUS] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 }, [SPECIES_AMOONGUSS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_FRILLISH] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_JELLICENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_JELLICENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ALOMOMOLA] = { .size = MON_COORDS_SIZE(32, 64), .y_offset = 0 }, [SPECIES_JOLTIK] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 17 }, [SPECIES_GALVANTULA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, @@ -650,7 +650,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_LARVESTA] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 13 }, [SPECIES_VOLCARONA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_COBALION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_VIRIZION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_TORNADUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_THUNDURUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -663,7 +663,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, #endif #if P_GEN_6_POKEMON == TRUE - [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 5 }, + [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_QUILLADIN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_CHESNAUGHT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FENNEKIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, @@ -674,7 +674,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_GRENINJA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_BUNNELBY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, [SPECIES_DIGGERSBY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_FLETCHLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, + [SPECIES_FLETCHLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_FLETCHINDER] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_TALONFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_SCATTERBUG] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 13 }, @@ -711,7 +711,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_HELIOLISK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_TYRUNT] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_TYRANTRUM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_AMAURA] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 0 }, + [SPECIES_AMAURA] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 5 }, [SPECIES_AURORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SYLVEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_HAWLUCHA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, @@ -753,15 +753,15 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_GUMSHOOS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_GRUBBIN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, [SPECIES_CHARJABUG] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, - [SPECIES_VIKAVOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_VIKAVOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 3 }, [SPECIES_CRABRAWLER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ORICORIO_BAILE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(33, 35), .y_offset = 16 }, [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(32, 47), .y_offset = 5 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(37, 39), .y_offset = 11 }, - [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(57, 53), .y_offset = 6 }, - [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, + [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(57, 53), .y_offset = 5 }, + [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 20 }, [SPECIES_MAREANIE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_TOXAPEX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MUDBRAY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, @@ -792,12 +792,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 5 }, + [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 9 }, [SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, - [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(36, 43), .y_offset = 5 }, + [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(36, 43), .y_offset = 9 }, [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(53, 61), .y_offset = 1 }, [SPECIES_KOMMO_O] = { .size = MON_COORDS_SIZE(63, 63), .y_offset = 0 }, [SPECIES_TAPU_KOKO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -863,7 +863,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SILICOBRA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_SANDACONDA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_CRAMORANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ARROKUDA] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 13 }, + [SPECIES_ARROKUDA] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 17 }, [SPECIES_BARRASKEWDA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_TOXEL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_TOXTRICITY_AMPED] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, @@ -979,123 +979,123 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SPECTRIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CALYREX] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_WYRDEER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_BASCULEGION_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 2 }, + [SPECIES_BASCULEGION_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, #endif #if P_GEN_9_POKEMON == TRUE - [SPECIES_SPRIGATITO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_FLORAGATO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SPRIGATITO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_FLORAGATO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_MEOWSCARADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FUECOCO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_CROCALOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_SKELEDIRGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_QUAXLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_QUAXLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_OINKOLOGNE_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_OINKOLOGNE_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_LOKIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_PAWMI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_LOKIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_PAWMI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_DACHSBUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, - [SPECIES_DOLLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 }, + [SPECIES_DOLLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_ARBOLIVA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_NACLI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_NACLI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_NACLSTACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_GARGANACL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CHARCADET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_GARGANACL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_CHARCADET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_ARMAROUGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CERULEDGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TADBULB] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TADBULB] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_BELLIBOLT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_WATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, - [SPECIES_KILOWATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_MASCHIFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_MABOSSTIFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SHROODLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_WATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_KILOWATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_MASCHIFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_MABOSSTIFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_SHROODLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, [SPECIES_GRAFAIAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, - [SPECIES_BRAMBLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_BRAMBLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_BRAMBLEGHAST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_TOEDSCOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOEDSCRUEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, - [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_TOEDSCOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_TOEDSCRUEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_SCOVILLAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, + [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TINKATON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_WIGLETT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, - [SPECIES_WUGTRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BOMBIRDIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FINIZEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_PALAFIN_ZERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_PALAFIN_HERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_TINKATON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_WIGLETT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 19 }, + [SPECIES_WUGTRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_BOMBIRDIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_FINIZEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_PALAFIN_ZERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_PALAFIN_HERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_REVAVROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ORTHWORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GLIMMET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GLIMMORA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GREAVARD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_HOUNDSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLAMIGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CETODDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_ORTHWORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_GLIMMET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 }, + [SPECIES_GLIMMORA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_GREAVARD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_HOUNDSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_FLAMIGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_CETODDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_CETITAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_VELUZA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DONDOZO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TATSUGIRI_CURLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, - [SPECIES_TATSUGIRI_DROOPY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, - [SPECIES_TATSUGIRI_STRETCHY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, + [SPECIES_VELUZA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_DONDOZO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_TATSUGIRI_CURLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_TATSUGIRI_DROOPY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_TATSUGIRI_STRETCHY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_ANNIHILAPE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CLODSIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_FARIGIRAF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_KINGAMBIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_SCREAM_TAIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_BRUTE_BONNET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_FLUTTER_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLUTTER_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_SLITHER_WING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SANDY_SHOCKS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_IRON_TREADS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_IRON_BUNDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_SANDY_SHOCKS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_IRON_TREADS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_IRON_BUNDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_IRON_HANDS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_IRON_JUGULIS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_IRON_MOTH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_IRON_JUGULIS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_IRON_MOTH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_IRON_THORNS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FRIGIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GIMMIGHOUL_CHEST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_FRIGIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_GIMMIGHOUL_CHEST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_GHOLDENGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WO_CHIEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CHIEN_PAO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TING_LU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CHI_YU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CHIEN_PAO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_TING_LU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_CHI_YU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_ROARING_MOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_IRON_VALIANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KORAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1103,21 +1103,21 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_WALKING_WAKE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_IRON_LEAVES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DIPPLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_POLTCHAGEIST_COUNTERFEIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_POLTCHAGEIST_ARTISAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SINISTCHA_UNREMARKABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SINISTCHA_MASTERPIECE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OKIDOGI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MUNKIDORI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FEZANDIPITI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_TEAL_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_WELLSPRING_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_HEARTHFLAME_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_CORNERSTONE_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_TEAL_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_WELLSPRING_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_POLTCHAGEIST_COUNTERFEIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_POLTCHAGEIST_ARTISAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_SINISTCHA_UNREMARKABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_SINISTCHA_MASTERPIECE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_OKIDOGI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_MUNKIDORI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_FEZANDIPITI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_OGERPON_TEAL_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_WELLSPRING_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_HEARTHFLAME_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_CORNERSTONE_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_TEAL_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_WELLSPRING_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif // Megas [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, @@ -1194,7 +1194,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_GOLEM_ALOLAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_GRIMER_ALOLAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_MUK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, // Galarian Forms [SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, @@ -1219,24 +1219,24 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_STUNFISK_GALARIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, #endif // Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 6 }, - [SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 0 }, - [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 0 }, + [SPECIES_GROWLITHE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 17 }, + [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 8 }, - [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, #if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, + [SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif #if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 5 }, + [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, + [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 6 }, #endif #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1259,7 +1259,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PIKACHU_PARTNER_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_WORLD_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, // Pichu - [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, + [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 13 }, // Unown [SPECIES_UNOWN_B] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 16 }, [SPECIES_UNOWN_C] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 }, @@ -1314,7 +1314,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ROTOM_WASH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_ROTOM_FROST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_ROTOM_FAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, - [SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 12 }, + [SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, // Origin Forme [SPECIES_DIALGA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PALKIA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1343,7 +1343,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = #if P_GEN_5_POKEMON == TRUE // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 16 }, - [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 10 }, + [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, @@ -1453,7 +1453,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, // Lycanroc [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(56, 61), .y_offset = 0 }, - [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(57, 58), .y_offset = 6 }, + [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(57, 58), .y_offset = 5 }, // Wishiwashi [SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, // Silvally @@ -1481,13 +1481,13 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MINIOR_METEOR_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MINIOR_METEOR_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MINIOR_METEOR_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, + [SPECIES_MINIOR_CORE_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, // Mimikyu [SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, // Necrozma @@ -1528,44 +1528,44 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, // Enamorus - [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, // Basculegion - [SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, // Gigantamax Forms - [SPECIES_VENUSAUR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_CHARIZARD_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BLASTOISE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_BUTTERFREE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_PIKACHU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_MEOWTH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_MACHAMP_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GENGAR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_KINGLER_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LAPRAS_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_EEVEE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_SNORLAX_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GARBODOR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MELMETAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_RILLABOOM_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CINDERACE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_INTELEON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ORBEETLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DREDNAW_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_COALOSSAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLAPPLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_APPLETUN_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_SANDACONDA_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CENTISKORCH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_HATTERENE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GRIMMSNARL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ALCREMIE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_COPPERAJAH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DURALUDON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VENUSAUR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_CHARIZARD_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BLASTOISE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_BUTTERFREE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_PIKACHU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_MEOWTH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_MACHAMP_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GENGAR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_KINGLER_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LAPRAS_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_EEVEE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_SNORLAX_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GARBODOR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_MELMETAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_RILLABOOM_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CINDERACE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_INTELEON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ORBEETLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_DREDNAW_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_COALOSSAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLAPPLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_APPLETUN_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_SANDACONDA_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CENTISKORCH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_HATTERENE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_ALCREMIE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_COPPERAJAH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_DURALUDON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif // Egg [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, diff --git a/src/pokemon.c b/src/pokemon.c index a9c22ae8e7..d4585d8e90 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2207,13 +2207,13 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_BLASTOISE - 1] = ANIM_V_SHAKE_TWICE, [SPECIES_CATERPIE - 1] = ANIM_SWING_CONCAVE, [SPECIES_METAPOD - 1] = ANIM_SWING_CONCAVE, - [SPECIES_BUTTERFREE - 1] = ANIM_H_SLIDE_WOBBLE, + [SPECIES_BUTTERFREE - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_WEEDLE - 1] = ANIM_H_SLIDE_SLOW, [SPECIES_KAKUNA - 1] = ANIM_GLOW_ORANGE, [SPECIES_BEEDRILL - 1] = ANIM_ZIGZAG_SLOW, [SPECIES_PIDGEY - 1] = ANIM_V_STRETCH, [SPECIES_PIDGEOTTO - 1] = ANIM_V_STRETCH, - [SPECIES_PIDGEOT - 1] = ANIM_FRONT_FLIP, + [SPECIES_PIDGEOT - 1] = ANIM_GROW_VIBRATE, [SPECIES_RATTATA - 1] = ANIM_H_JUMPS, [SPECIES_RATICATE - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, [SPECIES_SPEAROW - 1] = ANIM_V_JUMPS_SMALL, @@ -2268,7 +2268,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_WEEPINBELL - 1] = ANIM_SWING_CONVEX, [SPECIES_VICTREEBEL - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_TENTACOOL - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_TENTACRUEL - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_TENTACRUEL - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_GEODUDE - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, [SPECIES_GRAVELER - 1] = ANIM_V_SHAKE, [SPECIES_GOLEM - 1] = ANIM_ROTATE_UP_SLAM_DOWN, @@ -2281,35 +2281,35 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_FARFETCHD - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, [SPECIES_DODUO - 1] = ANIM_H_SHAKE_SLOW, [SPECIES_DODRIO - 1] = ANIM_V_STRETCH, - [SPECIES_SEEL - 1] = ANIM_H_STRETCH, + [SPECIES_SEEL - 1] = ANIM_H_SLIDE_SLOW, [SPECIES_DEWGONG - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, [SPECIES_GRIMER - 1] = ANIM_H_SLIDE_SLOW, - [SPECIES_MUK - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_MUK - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, [SPECIES_SHELLDER - 1] = ANIM_TWIST, - [SPECIES_CLOYSTER - 1] = ANIM_H_SLIDE_WOBBLE, - [SPECIES_GASTLY - 1] = ANIM_CIRCLE_C_CLOCKWISE_SLOW, + [SPECIES_CLOYSTER - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_GASTLY - 1] = ANIM_SHRINK_GROW, [SPECIES_HAUNTER - 1] = ANIM_FLICKER_INCREASING, [SPECIES_GENGAR - 1] = ANIM_GROW_IN_STAGES, [SPECIES_ONIX - 1] = ANIM_H_SHAKE, [SPECIES_DROWZEE - 1] = ANIM_V_STRETCH, - [SPECIES_HYPNO - 1] = ANIM_H_SLIDE_SLOW, - [SPECIES_KRABBY - 1] = ANIM_H_SLIDE, - [SPECIES_KINGLER - 1] = ANIM_H_SLIDE_SLOW, - [SPECIES_VOLTORB - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ELECTRODE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_HYPNO - 1] = ANIM_GROW_VIBRATE, + [SPECIES_KRABBY - 1] = ANIM_H_SLIDE_SLOW, + [SPECIES_KINGLER - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_VOLTORB - 1] = ANIM_SWING_CONCAVE, + [SPECIES_ELECTRODE - 1] = ANIM_SHRINK_GROW_VIBRATE_SLOW, [SPECIES_EXEGGCUTE - 1] = ANIM_H_SLIDE_SLOW, [SPECIES_EXEGGUTOR - 1] = ANIM_H_JUMPS_V_STRETCH, - [SPECIES_CUBONE - 1] = ANIM_V_JUMPS_SMALL, + [SPECIES_CUBONE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_MAROWAK - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES, - [SPECIES_HITMONLEE - 1] = ANIM_H_STRETCH, + [SPECIES_HITMONLEE - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_HITMONCHAN - 1] = ANIM_GROW_VIBRATE, - [SPECIES_LICKITUNG - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, + [SPECIES_LICKITUNG - 1] = ANIM_V_STRETCH, [SPECIES_KOFFING - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, [SPECIES_WEEZING - 1] = ANIM_V_SLIDE, [SPECIES_RHYHORN - 1] = ANIM_V_SHAKE, - [SPECIES_RHYDON - 1] = ANIM_H_SHAKE, + [SPECIES_RHYDON - 1] = ANIM_V_STRETCH, [SPECIES_CHANSEY - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_TANGELA - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, + [SPECIES_TANGELA - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_KANGASKHAN - 1] = ANIM_V_STRETCH, [SPECIES_HORSEA - 1] = ANIM_V_JUMPS_SMALL, [SPECIES_SEADRA - 1] = ANIM_V_SLIDE, @@ -2435,7 +2435,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_STANTLER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SMEARGLE - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_TYROGUE - 1] = ANIM_BACK_AND_LUNGE, - [SPECIES_HITMONTOP - 1] = ANIM_H_VIBRATE, + [SPECIES_HITMONTOP - 1] = ANIM_SWING_CONCAVE, [SPECIES_SMOOCHUM - 1] = ANIM_GROW_VIBRATE, [SPECIES_ELEKID - 1] = ANIM_FLASH_YELLOW, [SPECIES_MAGBY - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -3653,7 +3653,8 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = [SPECIES_HAUNTER - 1] = 23, [SPECIES_DROWZEE - 1] = 48, [SPECIES_HYPNO - 1] = 40, - [SPECIES_HITMONCHAN - 1] = 25, + [SPECIES_KINGLER - 1] = 4, + [SPECIES_CUBONE - 1] = 30, [SPECIES_SCYTHER - 1] = 10, [SPECIES_TAUROS - 1] = 10, [SPECIES_TYPHLOSION - 1] = 20,