diff --git a/graphics/pokemon/brute_bonnet/back.png b/graphics/pokemon/brute_bonnet/back.png index b73cb1589e..36a261487e 100644 Binary files a/graphics/pokemon/brute_bonnet/back.png and b/graphics/pokemon/brute_bonnet/back.png differ diff --git a/graphics/pokemon/brute_bonnet/front.png b/graphics/pokemon/brute_bonnet/front.png index 46347100a2..f34d402217 100644 Binary files a/graphics/pokemon/brute_bonnet/front.png and b/graphics/pokemon/brute_bonnet/front.png differ diff --git a/graphics/pokemon/brute_bonnet/normal.pal b/graphics/pokemon/brute_bonnet/normal.pal index 951da388b7..ced7bea6ca 100644 --- a/graphics/pokemon/brute_bonnet/normal.pal +++ b/graphics/pokemon/brute_bonnet/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -227 45 45 -98 72 65 -57 105 65 -213 105 139 -139 242 139 -65 48 49 -255 220 100 -106 153 115 -0 0 0 -238 182 205 -115 36 32 -32 32 32 -156 149 131 -41 24 24 -205 198 197 +154 212 167 +8 8 8 +99 54 45 +157 155 149 +231 76 81 +207 214 198 +124 84 73 +177 34 57 +68 109 76 +101 165 113 +141 223 134 +96 41 57 +198 176 55 +183 116 142 +244 163 202 +62 34 30 diff --git a/graphics/pokemon/brute_bonnet/shiny.pal b/graphics/pokemon/brute_bonnet/shiny.pal index e0702cf002..b474088769 100644 --- a/graphics/pokemon/brute_bonnet/shiny.pal +++ b/graphics/pokemon/brute_bonnet/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -115 82 222 -82 74 65 -57 105 65 -213 105 139 -139 242 139 -49 49 49 -255 220 100 -106 153 115 -0 0 0 -238 182 205 -82 65 164 -32 32 32 -164 156 123 -41 24 24 -213 205 172 +154 212 167 +8 8 8 +44 44 44 +161 153 121 +116 92 210 +214 206 174 +81 73 63 +88 60 161 +68 109 76 +101 165 113 +141 223 134 +96 41 57 +198 176 55 +183 116 142 +244 163 202 +20 20 20 diff --git a/graphics/pokemon/chi_yu/back.png b/graphics/pokemon/chi_yu/back.png index ff1f7c3729..b4dc500d50 100644 Binary files a/graphics/pokemon/chi_yu/back.png and b/graphics/pokemon/chi_yu/back.png differ diff --git a/graphics/pokemon/chi_yu/front.png b/graphics/pokemon/chi_yu/front.png index 6a41c507a5..5dfea02b93 100644 Binary files a/graphics/pokemon/chi_yu/front.png and b/graphics/pokemon/chi_yu/front.png differ diff --git a/graphics/pokemon/chi_yu/normal.pal b/graphics/pokemon/chi_yu/normal.pal index 368ffd90e6..0a37008cdb 100644 --- a/graphics/pokemon/chi_yu/normal.pal +++ b/graphics/pokemon/chi_yu/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -162 55 36 -244 52 47 -15 15 15 -243 94 56 -249 130 79 -240 167 85 -177 82 54 -252 245 155 -28 64 33 -193 196 189 -91 152 90 -131 184 132 -60 63 58 -72 116 71 -248 248 240 +154 212 167 +88 12 14 +138 25 27 +198 49 14 +8 8 8 +226 64 5 +248 191 103 +223 132 67 +160 32 8 +32 89 50 +169 195 186 +65 146 76 +135 202 128 +255 255 255 +6 44 22 +81 81 81 diff --git a/graphics/pokemon/chi_yu/shiny.pal b/graphics/pokemon/chi_yu/shiny.pal index e041f9654d..624f80542c 100644 --- a/graphics/pokemon/chi_yu/shiny.pal +++ b/graphics/pokemon/chi_yu/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -69 67 68 -94 94 94 -15 15 15 -89 128 162 -0 192 249 -124 197 231 -70 123 128 -186 254 253 -28 64 33 -193 196 189 -91 152 90 -131 184 132 -60 63 58 -72 116 71 -248 248 240 +154 212 167 +14 22 51 +56 63 78 +51 117 161 +8 8 8 +6 149 228 +142 237 243 +69 203 244 +39 93 170 +32 89 50 +169 195 186 +65 146 76 +135 202 128 +255 255 255 +6 44 22 +81 81 81 diff --git a/graphics/pokemon/flutter_mane/back.png b/graphics/pokemon/flutter_mane/back.png index 8052cafc19..f05b2adf3c 100644 Binary files a/graphics/pokemon/flutter_mane/back.png and b/graphics/pokemon/flutter_mane/back.png differ diff --git a/graphics/pokemon/flutter_mane/front.png b/graphics/pokemon/flutter_mane/front.png index ce45a4b923..77302c68de 100644 Binary files a/graphics/pokemon/flutter_mane/front.png and b/graphics/pokemon/flutter_mane/front.png differ diff --git a/graphics/pokemon/flutter_mane/normal.pal b/graphics/pokemon/flutter_mane/normal.pal index a2b19738a6..411015de68 100644 --- a/graphics/pokemon/flutter_mane/normal.pal +++ b/graphics/pokemon/flutter_mane/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -148 30 104 -16 16 16 -196 102 161 -230 162 205 -56 73 80 -109 149 164 -90 116 117 -136 56 24 -92 172 142 -255 162 162 -255 68 68 -136 214 185 -148 184 177 -180 26 65 -248 216 96 +154 212 167 +91 32 103 +216 119 236 +8 8 8 +158 63 179 +104 1 13 +244 48 79 +30 70 81 +13 39 45 +57 125 141 +42 94 105 +176 3 30 +99 176 167 +67 134 126 +199 151 91 +255 201 120 diff --git a/graphics/pokemon/flutter_mane/shiny.pal b/graphics/pokemon/flutter_mane/shiny.pal index 2db4e621e2..5adee96beb 100644 --- a/graphics/pokemon/flutter_mane/shiny.pal +++ b/graphics/pokemon/flutter_mane/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -180 79 0 -16 16 16 -216 152 64 -248 184 64 -56 73 80 -181 203 123 -105 141 69 -136 56 24 -200 200 200 -255 162 162 -255 68 68 -248 248 248 -222 232 154 -180 26 65 -248 216 96 +154 212 167 +155 60 14 +252 136 42 +8 8 8 +210 83 25 +104 1 13 +244 48 79 +80 113 69 +13 39 45 +178 219 121 +119 169 95 +176 3 30 +230 232 232 +170 178 178 +199 151 91 +255 201 120 diff --git a/graphics/pokemon/iron_bundle/back.png b/graphics/pokemon/iron_bundle/back.png index 78451dda9b..1635738474 100644 Binary files a/graphics/pokemon/iron_bundle/back.png and b/graphics/pokemon/iron_bundle/back.png differ diff --git a/graphics/pokemon/iron_bundle/front.png b/graphics/pokemon/iron_bundle/front.png index a98137941b..a4fe68b4fd 100644 Binary files a/graphics/pokemon/iron_bundle/front.png and b/graphics/pokemon/iron_bundle/front.png differ diff --git a/graphics/pokemon/iron_bundle/normal.pal b/graphics/pokemon/iron_bundle/normal.pal index ea35b3b984..4c712297b7 100644 --- a/graphics/pokemon/iron_bundle/normal.pal +++ b/graphics/pokemon/iron_bundle/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -189 246 255 +154 212 167 +110 110 110 +210 210 210 +161 161 161 +8 8 8 +245 245 245 +141 36 22 +194 54 33 +217 95 85 +46 109 165 90 194 255 -255 206 65 -205 141 41 -123 68 0 -0 0 0 -41 36 41 -217 69 55 -255 250 250 -142 43 43 -65 68 74 -79 30 31 -174 174 182 -90 93 90 -65 141 180 +166 129 73 +255 225 115 +178 228 255 +102 30 12 +48 48 48 diff --git a/graphics/pokemon/iron_bundle/shiny.pal b/graphics/pokemon/iron_bundle/shiny.pal index b27dde2a6c..818d73de92 100644 --- a/graphics/pokemon/iron_bundle/shiny.pal +++ b/graphics/pokemon/iron_bundle/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -189 246 255 +154 212 167 +80 89 98 +166 174 182 +116 130 141 +8 8 8 +218 221 224 +116 130 141 +166 174 182 +218 221 224 +46 109 165 90 194 255 -255 206 65 -205 141 41 -123 68 0 -0 0 0 -41 36 41 -172 170 180 -197 198 189 -98 101 115 -65 68 74 -82 80 82 -156 141 148 -90 93 90 -65 141 180 +109 116 132 +181 183 192 +178 228 255 +80 89 98 +48 48 48 diff --git a/graphics/pokemon/sandy_shocks/back.png b/graphics/pokemon/sandy_shocks/back.png index 2ee0ab030c..72d7efb68f 100644 Binary files a/graphics/pokemon/sandy_shocks/back.png and b/graphics/pokemon/sandy_shocks/back.png differ diff --git a/graphics/pokemon/sandy_shocks/front.png b/graphics/pokemon/sandy_shocks/front.png index 95b0124a6c..8709f38654 100644 Binary files a/graphics/pokemon/sandy_shocks/front.png and b/graphics/pokemon/sandy_shocks/front.png differ diff --git a/graphics/pokemon/sandy_shocks/normal.pal b/graphics/pokemon/sandy_shocks/normal.pal index 4b0c513bd9..97a97e3df1 100644 --- a/graphics/pokemon/sandy_shocks/normal.pal +++ b/graphics/pokemon/sandy_shocks/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -238 24 0 -213 170 57 -213 246 222 -180 214 189 -180 182 180 -115 101 131 -41 36 32 -139 182 164 -90 93 90 -139 137 139 -41 129 172 -57 48 49 -255 222 90 -0 0 0 -90 129 98 +154 212 167 +54 45 45 +8 8 8 +84 77 76 +141 40 34 +238 97 86 +235 250 255 +137 141 141 +65 103 113 +191 216 230 +113 80 154 +120 165 182 +33 113 154 +98 188 215 +250 224 74 +197 199 119 diff --git a/graphics/pokemon/sandy_shocks/shiny.pal b/graphics/pokemon/sandy_shocks/shiny.pal index 6a89c90cc4..09062f2e97 100644 --- a/graphics/pokemon/sandy_shocks/shiny.pal +++ b/graphics/pokemon/sandy_shocks/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -238 24 0 -213 170 57 -255 248 179 -184 179 120 -180 182 180 -115 101 131 -41 36 32 -212 179 120 -90 93 90 -139 137 139 -41 129 172 -57 48 49 -255 222 90 -0 0 0 -153 137 87 +154 212 167 +54 45 45 +8 8 8 +84 77 76 +78 70 69 +102 93 92 +232 223 175 +108 99 98 +99 91 59 +199 190 142 +75 68 67 +135 124 80 +81 74 73 +105 96 95 +250 224 74 +200 181 77 diff --git a/graphics/pokemon/scream_tail/back.png b/graphics/pokemon/scream_tail/back.png index a0607a0e15..44d606d13a 100644 Binary files a/graphics/pokemon/scream_tail/back.png and b/graphics/pokemon/scream_tail/back.png differ diff --git a/graphics/pokemon/scream_tail/front.png b/graphics/pokemon/scream_tail/front.png index 2d320fd0d4..cfe4097979 100644 Binary files a/graphics/pokemon/scream_tail/front.png and b/graphics/pokemon/scream_tail/front.png differ diff --git a/graphics/pokemon/scream_tail/normal.pal b/graphics/pokemon/scream_tail/normal.pal index bedc2d2abf..90898fc402 100644 --- a/graphics/pokemon/scream_tail/normal.pal +++ b/graphics/pokemon/scream_tail/normal.pal @@ -1,19 +1,18 @@ JASC-PAL 0100 -16 -153 211 165 -108 45 45 -0 0 0 -246 144 164 -251 188 201 -173 92 108 -136 64 64 -238 95 124 -186 81 102 -48 34 34 -255 121 163 -255 255 255 -200 184 248 -140 117 33 -203 174 40 -255 220 50 +15 +154 212 167 +124 76 91 +244 205 215 +201 156 176 +121 32 53 +250 168 184 +255 127 150 +8 8 8 +189 86 107 +106 81 98 +253 253 253 +227 181 50 +201 134 21 +239 209 98 +207 201 227 diff --git a/graphics/pokemon/scream_tail/shiny.pal b/graphics/pokemon/scream_tail/shiny.pal index 21e95217d4..ef0e809be1 100644 --- a/graphics/pokemon/scream_tail/shiny.pal +++ b/graphics/pokemon/scream_tail/shiny.pal @@ -1,19 +1,18 @@ JASC-PAL 0100 -16 -153 211 165 -105 45 108 -0 0 0 -229 148 224 -246 203 246 -176 83 153 -136 64 132 -211 74 189 -158 78 154 -48 34 34 -255 121 163 -255 255 255 -200 184 248 -149 52 52 -202 67 95 -237 94 83 +15 +154 212 167 +136 113 155 +244 225 251 +186 159 201 +101 54 129 +250 168 184 +227 121 230 +8 8 8 +169 92 191 +106 81 98 +253 253 253 +240 114 93 +203 66 55 +239 209 98 +207 201 227 diff --git a/graphics/pokemon/skeledirge/back.png b/graphics/pokemon/skeledirge/back.png index 6471ffe6c2..959ada2619 100644 Binary files a/graphics/pokemon/skeledirge/back.png and b/graphics/pokemon/skeledirge/back.png differ diff --git a/graphics/pokemon/skeledirge/front.png b/graphics/pokemon/skeledirge/front.png index cf238da178..e2448c8fdf 100644 Binary files a/graphics/pokemon/skeledirge/front.png and b/graphics/pokemon/skeledirge/front.png differ diff --git a/graphics/pokemon/skeledirge/normal.pal b/graphics/pokemon/skeledirge/normal.pal index fbb60828f9..c00aa1e7c7 100644 --- a/graphics/pokemon/skeledirge/normal.pal +++ b/graphics/pokemon/skeledirge/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -132 121 129 -255 70 0 +154 212 167 +129 121 129 +241 70 0 248 248 240 -255 177 0 -215 193 202 -254 233 0 -255 129 0 +248 129 0 +209 193 201 +239 224 0 +239 171 0 +8 8 8 +186 35 26 +104 35 26 +248 44 35 +162 26 201 53 53 53 -122 7 63 -214 35 26 -255 44 35 -0 0 0 -187 26 205 -26 26 26 79 79 79 +26 26 26 diff --git a/graphics/pokemon/skeledirge/shiny.pal b/graphics/pokemon/skeledirge/shiny.pal index 4354f676d3..26f0abf2e6 100644 --- a/graphics/pokemon/skeledirge/shiny.pal +++ b/graphics/pokemon/skeledirge/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -132 121 129 -255 70 0 -248 248 240 -255 177 0 -215 193 202 -254 233 0 -255 129 0 +154 212 167 +132 118 83 +241 70 0 +238 240 187 +248 129 0 +184 181 116 +239 224 0 +239 171 0 +8 8 8 +175 17 112 +104 35 26 +219 29 142 +162 26 201 53 53 53 -122 7 63 -186 44 106 -247 87 139 -0 0 0 -187 26 205 -26 26 26 79 79 79 +26 26 26 diff --git a/graphics/pokemon/slither_wing/back.png b/graphics/pokemon/slither_wing/back.png index cfa4c99d75..5d829a2a46 100644 Binary files a/graphics/pokemon/slither_wing/back.png and b/graphics/pokemon/slither_wing/back.png differ diff --git a/graphics/pokemon/slither_wing/front.png b/graphics/pokemon/slither_wing/front.png index d3c1e65969..aa7ecd4a76 100644 Binary files a/graphics/pokemon/slither_wing/front.png and b/graphics/pokemon/slither_wing/front.png differ diff --git a/graphics/pokemon/slither_wing/normal.pal b/graphics/pokemon/slither_wing/normal.pal index a083030d3f..360df3a369 100644 --- a/graphics/pokemon/slither_wing/normal.pal +++ b/graphics/pokemon/slither_wing/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -156 222 24 -172 170 172 -172 52 49 -49 157 139 -49 56 74 -246 246 246 -238 210 98 -213 255 115 -123 32 0 -222 161 57 -24 24 32 -246 64 49 -65 80 115 -230 52 41 -255 48 32 +154 212 167 +120 29 13 +210 159 0 +255 226 6 +205 237 126 +8 8 8 +186 48 26 +247 80 65 +141 133 133 +248 243 243 +202 187 187 +52 52 104 +70 78 180 +255 89 97 +107 212 197 +77 138 117 diff --git a/graphics/pokemon/slither_wing/shiny.pal b/graphics/pokemon/slither_wing/shiny.pal index 2cf5898f95..bdb223626c 100644 --- a/graphics/pokemon/slither_wing/shiny.pal +++ b/graphics/pokemon/slither_wing/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -255 49 33 -172 170 172 -191 148 19 -49 157 139 -49 56 74 -246 246 246 -255 229 113 -255 96 84 -153 119 15 -236 200 73 -24 24 32 -217 171 33 -65 80 115 -230 52 41 -255 48 32 +154 212 167 +137 95 33 +210 184 121 +249 235 153 +240 111 76 +8 8 8 +206 156 34 +255 206 82 +141 133 133 +248 243 243 +202 187 187 +52 52 104 +70 78 180 +255 89 97 +193 117 204 +131 66 154 diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index 2a9321f2d1..95389eeb8e 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -280,11 +280,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, .trainerOffset = 0, FRONT_PIC(Skeledirge, 64, 64), - .frontPicYOffset = 7, + .frontPicYOffset = 5, .frontAnimFrames = sAnims_Skeledirge, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, BACK_PIC(Skeledirge, 64, 64), - .backPicYOffset = 0, + .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, PALETTES(Skeledirge), ICON(Skeledirge, 0), @@ -1688,7 +1688,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, .trainerOffset = 0, FRONT_PIC(Tadbulb, 64, 64), - .frontPicYOffset = 11, + .frontPicYOffset = 4, .frontAnimFrames = sAnims_Tadbulb, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 12, @@ -3801,11 +3801,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, .trainerOffset = 0, FRONT_PIC(ScreamTail, 64, 64), - .frontPicYOffset = 7, + .frontPicYOffset = 10, .frontAnimFrames = sAnims_ScreamTail, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, BACK_PIC(ScreamTail, 64, 64), - .backPicYOffset = 0, + .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, PALETTES(ScreamTail), ICON(ScreamTail, 0), @@ -3851,11 +3851,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, .trainerOffset = 0, FRONT_PIC(BruteBonnet, 64, 64), - .frontPicYOffset = 5, + .frontPicYOffset = 7, .frontAnimFrames = sAnims_BruteBonnet, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, BACK_PIC(BruteBonnet, 64, 64), - .backPicYOffset = 12, + .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, PALETTES(BruteBonnet), ICON(BruteBonnet, 1), @@ -3903,12 +3903,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, .trainerOffset = 0, FRONT_PIC(FlutterMane, 64, 64), - .frontPicYOffset = 5, + .frontPicYOffset = 8, .frontAnimFrames = sAnims_FlutterMane, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .enemyMonElevation = 5, + .enemyMonElevation = 18, BACK_PIC(FlutterMane, 64, 64), - .backPicYOffset = 10, + .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, PALETTES(FlutterMane), ICON(FlutterMane, 4), @@ -3957,7 +3957,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimFrames = sAnims_SlitherWing, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, BACK_PIC(SlitherWing, 64, 64), - .backPicYOffset = 0, + .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, PALETTES(SlitherWing), ICON(SlitherWing, 3), @@ -4003,11 +4003,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, .trainerOffset = 0, FRONT_PIC(SandyShocks, 64, 64), - .frontPicYOffset = 1, + .frontPicYOffset = 0, .frontAnimFrames = sAnims_SandyShocks, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, BACK_PIC(SandyShocks, 64, 64), - .backPicYOffset = 10, + .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, PALETTES(SandyShocks), ICON(SandyShocks, 0), @@ -4103,11 +4103,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, .trainerOffset = 0, FRONT_PIC(IronBundle, 64, 64), - .frontPicYOffset = 4, + .frontPicYOffset = 8, .frontAnimFrames = sAnims_IronBundle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, BACK_PIC(IronBundle, 64, 64), - .backPicYOffset = 9, + .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, PALETTES(IronBundle), ICON(IronBundle, 0), @@ -4785,9 +4785,9 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 10, .frontAnimFrames = sAnims_ChiYu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .enemyMonElevation = 9, + .enemyMonElevation = 15, BACK_PIC(ChiYu, 64, 64), - .backPicYOffset = 0, + .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, PALETTES(ChiYu), ICON(ChiYu, 0),