diff --git a/graphics/pokemon/arboliva/back.png b/graphics/pokemon/arboliva/back.png index a1383390e1..e767299fba 100644 Binary files a/graphics/pokemon/arboliva/back.png and b/graphics/pokemon/arboliva/back.png differ diff --git a/graphics/pokemon/arboliva/front.png b/graphics/pokemon/arboliva/front.png index 13521182f1..37a208c343 100644 Binary files a/graphics/pokemon/arboliva/front.png and b/graphics/pokemon/arboliva/front.png differ diff --git a/graphics/pokemon/arboliva/normal.pal b/graphics/pokemon/arboliva/normal.pal index c343903ef1..0ca85b2836 100644 --- a/graphics/pokemon/arboliva/normal.pal +++ b/graphics/pokemon/arboliva/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -0 128 32 -152 224 56 -0 56 16 -0 200 32 -0 0 0 -248 248 240 -184 192 168 -72 96 72 -224 128 72 -192 72 40 -104 32 56 -160 56 80 -56 8 24 -80 32 24 -0 0 0 +154 212 167 +58 131 45 +28 60 24 +166 238 83 +155 232 78 +8 8 8 +96 203 52 +95 32 55 +52 11 24 +141 57 79 +253 255 244 +82 97 77 +191 195 175 +207 132 80 +171 78 49 +82 40 28 diff --git a/graphics/pokemon/arboliva/shiny.pal b/graphics/pokemon/arboliva/shiny.pal index 796aeec5be..b6efee72c7 100644 --- a/graphics/pokemon/arboliva/shiny.pal +++ b/graphics/pokemon/arboliva/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -8 48 16 -112 144 64 -0 56 16 -24 120 40 -0 0 0 -248 248 240 -184 192 168 -72 96 72 -200 112 64 -168 64 40 -56 16 24 -104 32 48 -56 8 24 -80 32 24 -0 0 0 +154 212 167 +36 97 36 +28 60 24 +166 238 83 +68 194 45 +8 8 8 +40 142 53 +39 31 50 +13 14 26 +65 53 83 +251 255 179 +117 115 75 +201 190 133 +196 158 83 +156 118 52 +82 40 28 diff --git a/graphics/pokemon/charcadet/back.png b/graphics/pokemon/charcadet/back.png index 01ead6b281..b064e26a76 100644 Binary files a/graphics/pokemon/charcadet/back.png and b/graphics/pokemon/charcadet/back.png differ diff --git a/graphics/pokemon/charcadet/front.png b/graphics/pokemon/charcadet/front.png index c90c6a2db0..b00dc06924 100644 Binary files a/graphics/pokemon/charcadet/front.png and b/graphics/pokemon/charcadet/front.png differ diff --git a/graphics/pokemon/charcadet/normal.pal b/graphics/pokemon/charcadet/normal.pal index eae60870da..8d321cb3f2 100644 --- a/graphics/pokemon/charcadet/normal.pal +++ b/graphics/pokemon/charcadet/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -179 54 48 -255 119 178 -238 13 35 -128 19 19 -15 15 15 -70 68 68 -99 97 97 -243 143 7 -27 33 35 -199 117 5 -255 255 255 -243 189 3 -14 64 173 -238 13 36 -16 88 254 +154 212 167 +96 65 165 +107 97 248 +216 121 202 +88 16 26 +144 36 55 +218 53 65 +8 8 8 +94 85 81 +51 49 49 +222 125 33 +22 28 32 +242 178 37 +255 18 18 +252 252 252 +240 218 1 diff --git a/graphics/pokemon/charcadet/shiny.pal b/graphics/pokemon/charcadet/shiny.pal index 30c3010bd7..08a7479a83 100644 --- a/graphics/pokemon/charcadet/shiny.pal +++ b/graphics/pokemon/charcadet/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -179 54 48 -255 119 178 -238 13 35 -128 19 19 -15 15 15 -70 68 68 -99 97 97 -243 143 7 -27 33 35 -199 117 5 -255 255 255 -33 252 217 -14 64 173 -33 174 217 -16 88 254 +154 212 167 +96 65 165 +107 97 248 +216 121 202 +88 16 26 +144 36 55 +218 53 65 +8 8 8 +94 85 81 +51 49 49 +222 125 33 +22 28 32 +242 178 37 +33 148 236 +252 252 252 +115 214 234 diff --git a/graphics/pokemon/chien_pao/back.png b/graphics/pokemon/chien_pao/back.png index 045e2c214a..5c641437a9 100644 Binary files a/graphics/pokemon/chien_pao/back.png and b/graphics/pokemon/chien_pao/back.png differ diff --git a/graphics/pokemon/chien_pao/front.png b/graphics/pokemon/chien_pao/front.png index b871128b41..b942da0ac1 100644 Binary files a/graphics/pokemon/chien_pao/front.png and b/graphics/pokemon/chien_pao/front.png differ diff --git a/graphics/pokemon/chien_pao/normal.pal b/graphics/pokemon/chien_pao/normal.pal index e5dca7fc5c..ae9d766071 100644 --- a/graphics/pokemon/chien_pao/normal.pal +++ b/graphics/pokemon/chien_pao/normal.pal @@ -1,19 +1,17 @@ JASC-PAL 0100 -16 -156 210 164 -114 89 64 -40 56 56 -248 248 248 -185 198 216 -227 227 227 -168 168 168 -0 0 0 -80 96 96 -84 84 84 -112 128 128 -122 122 122 -168 208 248 -248 248 248 -112 176 232 -141 152 168 +14 +154 212 167 +92 113 157 +71 103 116 +229 244 250 +165 219 239 +247 247 247 +197 185 192 +133 141 151 +8 8 8 +127 180 198 +73 143 240 +69 82 97 +27 36 46 +76 186 190 diff --git a/graphics/pokemon/chien_pao/shiny.pal b/graphics/pokemon/chien_pao/shiny.pal index a0e08cb821..c0279e59f1 100644 --- a/graphics/pokemon/chien_pao/shiny.pal +++ b/graphics/pokemon/chien_pao/shiny.pal @@ -1,19 +1,17 @@ JASC-PAL 0100 -16 -156 210 164 -114 89 64 -40 56 56 -187 155 118 -135 102 64 -227 227 227 -168 168 168 -0 0 0 -80 96 96 -84 84 84 -112 128 128 -122 122 122 -168 208 248 -248 248 248 -112 176 232 -103 69 29 +14 +154 212 167 +116 129 139 +33 27 22 +229 244 250 +235 240 244 +129 115 100 +92 77 71 +60 48 48 +8 8 8 +178 184 190 +73 143 240 +69 82 97 +27 36 46 +76 186 190 diff --git a/graphics/pokemon/dolliv/back.png b/graphics/pokemon/dolliv/back.png index 9a179e325e..4b46b21557 100644 Binary files a/graphics/pokemon/dolliv/back.png and b/graphics/pokemon/dolliv/back.png differ diff --git a/graphics/pokemon/dolliv/front.png b/graphics/pokemon/dolliv/front.png index 0d707db8df..332b88627c 100644 Binary files a/graphics/pokemon/dolliv/front.png and b/graphics/pokemon/dolliv/front.png differ diff --git a/graphics/pokemon/dolliv/normal.pal b/graphics/pokemon/dolliv/normal.pal index f2e41f0ac7..1b6033b74a 100644 --- a/graphics/pokemon/dolliv/normal.pal +++ b/graphics/pokemon/dolliv/normal.pal @@ -1,14 +1,18 @@ JASC-PAL 0100 -11 -153 210 164 -16 16 16 -47 108 46 -118 94 33 -132 193 54 -222 214 109 -182 165 81 -100 153 64 -205 193 124 -255 250 185 -242 242 242 +15 +154 212 167 +52 99 44 +154 225 71 +28 60 24 +83 112 41 +192 210 61 +144 151 63 +101 202 55 +8 8 8 +67 148 52 +186 205 133 +251 255 218 +82 97 77 +255 255 255 +191 195 175 diff --git a/graphics/pokemon/dolliv/shiny.pal b/graphics/pokemon/dolliv/shiny.pal index d462805715..c533b52201 100644 --- a/graphics/pokemon/dolliv/shiny.pal +++ b/graphics/pokemon/dolliv/shiny.pal @@ -1,14 +1,18 @@ JASC-PAL 0100 -11 -153 210 164 -16 16 16 -45 82 12 -40 25 54 -102 209 86 -89 77 95 -57 45 65 -91 160 71 -198 201 130 -251 255 178 -242 242 242 +15 +154 212 167 +27 73 19 +38 172 42 +28 60 24 +13 14 26 +65 53 83 +39 31 50 +40 142 53 +8 8 8 +36 97 36 +186 205 133 +251 255 218 +82 97 77 +255 255 255 +191 195 175 diff --git a/graphics/pokemon/mabosstiff/back.png b/graphics/pokemon/mabosstiff/back.png index d572c7cbdb..057fc137a5 100644 Binary files a/graphics/pokemon/mabosstiff/back.png and b/graphics/pokemon/mabosstiff/back.png differ diff --git a/graphics/pokemon/mabosstiff/front.png b/graphics/pokemon/mabosstiff/front.png index cf91e34c29..fd5184debe 100644 Binary files a/graphics/pokemon/mabosstiff/front.png and b/graphics/pokemon/mabosstiff/front.png differ diff --git a/graphics/pokemon/mabosstiff/normal.pal b/graphics/pokemon/mabosstiff/normal.pal index 5c433266d6..141b07deac 100644 --- a/graphics/pokemon/mabosstiff/normal.pal +++ b/graphics/pokemon/mabosstiff/normal.pal @@ -1,19 +1,17 @@ JASC-PAL 0100 -16 -152 208 160 -96 88 96 -48 48 56 -168 168 168 -200 200 200 -120 128 136 +14 +154 212 167 +62 62 53 +185 185 185 +129 121 129 +217 217 217 +17 17 17 +35 35 26 8 8 8 -48 40 40 -64 64 56 -96 80 64 -128 120 104 -248 240 144 -32 24 24 -248 200 128 -248 176 72 -136 96 48 +35 35 35 +96 79 70 +129 113 104 +248 178 70 +70 62 53 +137 104 35 diff --git a/graphics/pokemon/mabosstiff/shiny.pal b/graphics/pokemon/mabosstiff/shiny.pal index a3f922e953..35e7107fbb 100644 --- a/graphics/pokemon/mabosstiff/shiny.pal +++ b/graphics/pokemon/mabosstiff/shiny.pal @@ -1,19 +1,17 @@ JASC-PAL 0100 -16 -152 208 160 -96 88 96 -48 48 56 -168 168 168 -200 200 200 -120 128 136 +14 +154 212 167 +62 62 53 +185 185 185 +129 121 129 +217 217 217 +17 17 17 +35 35 26 8 8 8 -40 40 48 -64 64 56 -104 96 112 -160 144 168 -248 240 144 -32 24 24 -248 200 128 -248 176 72 -136 96 48 +35 35 35 +82 77 115 +127 113 149 +248 178 70 +49 45 70 +137 104 35 diff --git a/graphics/pokemon/tinkatink/back.png b/graphics/pokemon/tinkatink/back.png index 63fced4482..acdc03246f 100644 Binary files a/graphics/pokemon/tinkatink/back.png and b/graphics/pokemon/tinkatink/back.png differ diff --git a/graphics/pokemon/tinkatink/front.png b/graphics/pokemon/tinkatink/front.png index f263a31f20..2be3c6d293 100644 Binary files a/graphics/pokemon/tinkatink/front.png and b/graphics/pokemon/tinkatink/front.png differ diff --git a/graphics/pokemon/tinkatink/normal.pal b/graphics/pokemon/tinkatink/normal.pal index fb5977571b..6256a00429 100644 --- a/graphics/pokemon/tinkatink/normal.pal +++ b/graphics/pokemon/tinkatink/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -246 101 172 -246 141 197 -189 206 230 -189 72 115 -8 12 8 -189 48 139 -106 93 164 -189 161 164 -115 141 172 -74 56 139 -246 226 238 -164 182 205 -131 40 82 -57 80 123 -255 255 255 +154 212 167 +118 67 75 +210 158 158 +255 230 226 +8 8 8 +223 96 150 +70 50 134 +165 62 121 +120 107 163 +186 169 223 +37 32 81 +102 26 84 +252 151 194 +122 84 182 +252 252 252 +119 126 197 diff --git a/graphics/pokemon/tinkatink/shiny.pal b/graphics/pokemon/tinkatink/shiny.pal index aa21dca4e4..5b879230c7 100644 --- a/graphics/pokemon/tinkatink/shiny.pal +++ b/graphics/pokemon/tinkatink/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -246 101 172 -246 141 197 -203 131 108 -189 72 115 -8 12 8 -189 48 139 -196 173 161 -189 161 164 -112 73 54 -148 124 112 -246 226 238 -156 105 79 -131 40 82 -51 46 43 -255 255 255 +154 212 167 +118 67 75 +210 158 158 +255 230 226 +8 8 8 +223 96 150 +92 42 44 +165 62 121 +165 96 81 +223 152 124 +56 18 25 +102 26 84 +252 151 194 +131 70 66 +252 252 252 +119 126 197 diff --git a/graphics/pokemon/tinkaton/back.png b/graphics/pokemon/tinkaton/back.png index d876ebc79a..1a08f502f0 100644 Binary files a/graphics/pokemon/tinkaton/back.png and b/graphics/pokemon/tinkaton/back.png differ diff --git a/graphics/pokemon/tinkaton/front.png b/graphics/pokemon/tinkaton/front.png index eb5ce6e8a6..f197ddc342 100644 Binary files a/graphics/pokemon/tinkaton/front.png and b/graphics/pokemon/tinkaton/front.png differ diff --git a/graphics/pokemon/tinkaton/normal.pal b/graphics/pokemon/tinkaton/normal.pal index 1c44fa8dc0..d6d3151c49 100644 --- a/graphics/pokemon/tinkaton/normal.pal +++ b/graphics/pokemon/tinkaton/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -49 43 51 -236 208 208 -170 132 143 -15 15 15 -100 79 155 -137 113 148 -173 161 197 -74 54 112 -82 46 69 -233 145 181 -236 85 140 -252 252 252 -88 94 163 -167 65 103 -174 89 125 +154 212 167 +118 67 75 +255 230 226 +210 158 158 +8 8 8 +255 255 255 +70 50 134 +122 84 182 +37 32 81 +186 169 223 +120 107 163 +165 62 121 +252 151 194 +102 26 84 +223 96 150 +119 126 197 diff --git a/graphics/pokemon/tinkaton/shiny.pal b/graphics/pokemon/tinkaton/shiny.pal index dd18420c0a..a1c1fab15c 100644 --- a/graphics/pokemon/tinkaton/shiny.pal +++ b/graphics/pokemon/tinkaton/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -63 35 25 -236 208 208 -170 132 143 -15 15 15 -106 52 67 -139 87 69 -203 131 108 -83 40 53 -82 46 69 -233 145 181 -236 85 140 -252 252 252 -88 94 163 -167 65 103 -174 89 125 +154 212 167 +118 67 75 +255 230 226 +210 158 158 +8 8 8 +255 255 255 +92 42 44 +131 70 66 +56 18 25 +223 152 124 +165 96 81 +165 62 121 +252 151 194 +102 26 84 +223 96 150 +119 126 197 diff --git a/graphics/pokemon/tinkatuff/back.png b/graphics/pokemon/tinkatuff/back.png index 5a5cdac31b..cc789e6c41 100644 Binary files a/graphics/pokemon/tinkatuff/back.png and b/graphics/pokemon/tinkatuff/back.png differ diff --git a/graphics/pokemon/tinkatuff/front.png b/graphics/pokemon/tinkatuff/front.png index 8b75e709bb..54459b2c19 100644 Binary files a/graphics/pokemon/tinkatuff/front.png and b/graphics/pokemon/tinkatuff/front.png differ diff --git a/graphics/pokemon/tinkatuff/normal.pal b/graphics/pokemon/tinkatuff/normal.pal index 0f90f999f8..324d6798e0 100644 --- a/graphics/pokemon/tinkatuff/normal.pal +++ b/graphics/pokemon/tinkatuff/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -32 208 160 -80 40 64 -232 208 208 -168 128 136 +154 212 167 +118 67 75 +255 230 226 +210 158 158 8 8 8 -232 144 176 -232 80 136 -168 88 120 -160 64 96 -248 248 248 -48 40 48 -88 88 160 -168 160 192 -136 112 144 -96 72 152 -72 48 112 +37 32 81 +70 50 134 +186 169 223 +120 107 163 +252 151 194 +102 26 84 +223 96 150 +122 84 182 +252 252 252 +119 126 197 +165 62 121 diff --git a/graphics/pokemon/tinkatuff/shiny.pal b/graphics/pokemon/tinkatuff/shiny.pal index edea9dd345..639de886cb 100644 --- a/graphics/pokemon/tinkatuff/shiny.pal +++ b/graphics/pokemon/tinkatuff/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -32 208 160 -80 40 64 -232 208 208 -168 128 136 +154 212 167 +118 67 75 +255 230 226 +210 158 158 8 8 8 -232 144 176 -232 80 136 -168 88 120 -160 64 96 -248 248 248 -48 40 48 -88 88 160 -208 152 120 -152 80 48 -152 56 88 -104 24 24 +56 18 25 +92 42 44 +223 152 124 +165 96 81 +252 151 194 +102 26 84 +223 96 150 +131 70 66 +252 252 252 +119 126 197 +165 62 121 diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index d851da3445..d858ec352c 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -1328,7 +1328,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Smoliv, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 16, + .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Smoliv, .shinyPalette = gMonShinyPalette_Smoliv, @@ -1381,7 +1381,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dolliv, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Dolliv, .shinyPalette = gMonShinyPalette_Dolliv, @@ -1434,7 +1434,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Arboliva, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Arboliva, .shinyPalette = gMonShinyPalette_Arboliva, @@ -1857,12 +1857,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Charcadet, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 5, + .frontPicYOffset = 9, .frontAnimFrames = sAnims_Charcadet, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Charcadet, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, + .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Charcadet, .shinyPalette = gMonShinyPalette_Charcadet, @@ -2285,12 +2285,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Mabosstiff, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 1, + .frontPicYOffset = 5, .frontAnimFrames = sAnims_Mabosstiff, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Mabosstiff, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 14, + .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Mabosstiff, .shinyPalette = gMonShinyPalette_Mabosstiff, @@ -3035,12 +3035,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Tinkatink, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 10, + .frontPicYOffset = 13, .frontAnimFrames = sAnims_Tinkatink, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tinkatink, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 12, + .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Tinkatink, .shinyPalette = gMonShinyPalette_Tinkatink, @@ -3088,12 +3088,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Tinkatuff, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 4, + .frontPicYOffset = 9, .frontAnimFrames = sAnims_Tinkatuff, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tinkatuff, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Tinkatuff, .shinyPalette = gMonShinyPalette_Tinkatuff, @@ -3141,12 +3141,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Tinkaton, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 1, + .frontPicYOffset = 0, .frontAnimFrames = sAnims_Tinkaton, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tinkaton, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 15, + .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Tinkaton, .shinyPalette = gMonShinyPalette_Tinkaton, @@ -5419,7 +5419,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_ChienPao, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 2, + .frontPicYOffset = 5, .frontAnimFrames = sAnims_ChienPao, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ChienPao,