rh-hideout · AsparagusEduardo · Jul 14, 2023 · Jul 14, 2023 · Jul 14, 2023 · Jul 14, 2023
diff --git a/graphics/pokemon/castform/anim_front.png b/graphics/pokemon/castform/anim_front.png
diff --git a/graphics/pokemon/castform/back.png b/graphics/pokemon/castform/back.png
diff --git a/graphics/pokemon/castform/front.png b/graphics/pokemon/castform/front.png
diff --git a/graphics/pokemon/castform/normal.pal b/graphics/pokemon/castform/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
 197 197 148
-90 82 82
-205 189 189
-230 222 222
-246 246 238
+81 81 93
+176 183 186
+210 217 219
+221 232 233
 0 0 0
 255 255 255
 222 222 246
-0 0 0
+245 153 185
+200 65 142
 0 0 0
 0 0 0
 148 148 148
-74 82 74
+75 76 83
 255 255 255
 24 24 24
diff --git a/graphics/pokemon/castform/rainy/anim_front.png b/graphics/pokemon/castform/rainy/anim_front.png
diff --git a/graphics/pokemon/castform/rainy/back.png b/graphics/pokemon/castform/rainy/back.png
diff --git a/graphics/pokemon/castform/rainy/front.png b/graphics/pokemon/castform/rainy/front.png
diff --git a/graphics/pokemon/castform/rainy/normal.pal b/graphics/pokemon/castform/rainy/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
 197 197 148
 57 65 90
-98 115 189
-115 139 213
-148 180 205
-205 238 246
-180 197 222
-139 205 222
-131 180 197
-82 98 131
-197 197 197
-148 139 148
-90 90 82
+82 101 183
+98 146 208
+120 182 232
+238 160 209
+203 238 246
+173 196 230
+167 217 230
+130 167 196
+82 90 132
+191 200 202
+138 138 147
+82 83 91
 255 255 255
 24 24 24
diff --git a/graphics/pokemon/castform/rainy/shiny.pal b/graphics/pokemon/castform/rainy/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
 197 197 148
-57 65 90
-98 115 189
-115 139 213
-148 180 205
-205 238 246
-180 197 222
-139 205 222
-131 180 197
-82 98 131
-197 197 197
-148 139 148
-90 90 82
+58 77 90
+66 133 158
+59 186 164
+170 228 208
+238 160 209
+148 251 101
+67 203 125
+123 220 239
+112 158 194
+72 88 142
+175 213 218
+110 136 175
+77 79 96
 255 255 255
 24 24 24
diff --git a/graphics/pokemon/castform/shiny.pal b/graphics/pokemon/castform/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
 197 197 148
-98 90 90
-205 164 189
-230 197 222
+88 74 115
+192 163 204
+226 198 231
 255 222 255
 0 0 0
-255 246 65
-230 180 32
+242 236 110
+235 196 76
+245 153 185
+200 65 151
 0 0 0
 0 0 0
-0 0 0
-148 148 148
-74 82 74
+161 116 180
+75 66 92
 255 255 255
 24 24 24
diff --git a/graphics/pokemon/castform/snowy/anim_front.png b/graphics/pokemon/castform/snowy/anim_front.png
diff --git a/graphics/pokemon/castform/snowy/back.png b/graphics/pokemon/castform/snowy/back.png
diff --git a/graphics/pokemon/castform/snowy/front.png b/graphics/pokemon/castform/snowy/front.png
diff --git a/graphics/pokemon/castform/snowy/normal.pal b/graphics/pokemon/castform/snowy/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
 197 197 148
 41 82 57
 123 82 189
 139 115 213
-148 180 205
+222 84 195
+242 156 214
 197 180 255
 156 156 197
-139 205 172
-115 164 139
+172 221 198
+124 182 168
 98 74 115
-189 230 230
-82 115 106
-74 82 74
+214 245 229
+83 113 116
+75 83 81
 255 255 255
 24 24 24
diff --git a/graphics/pokemon/castform/snowy/shiny.pal b/graphics/pokemon/castform/snowy/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
 197 197 148
-41 82 57
-123 82 189
-139 115 213
-148 180 205
-197 180 255
-156 156 197
-139 205 172
-115 164 139
-98 74 115
-189 230 230
-82 115 106
+41 41 81
+88 81 189
+103 164 224
+222 84 195
+242 156 214
+246 255 178
+211 198 141
+170 201 212
+153 160 168
+74 74 115
+200 234 234
+110 120 135
 74 82 74
 255 255 255
 24 24 24
diff --git a/graphics/pokemon/castform/sunny/anim_front.png b/graphics/pokemon/castform/sunny/anim_front.png
diff --git a/graphics/pokemon/castform/sunny/back.png b/graphics/pokemon/castform/sunny/back.png
diff --git a/graphics/pokemon/castform/sunny/front.png b/graphics/pokemon/castform/sunny/front.png
diff --git a/graphics/pokemon/castform/sunny/normal.pal b/graphics/pokemon/castform/sunny/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
 197 197 148
 98 49 41
-205 90 74
-238 123 74
-255 156 65
-0 0 0
+206 75 75
+238 101 73
+255 163 77
+245 151 182
 255 246 106
-230 213 106
-255 156 98
-213 131 74
-148 90 65
-213 205 230
-90 90 82
+234 196 83
+255 192 66
+222 128 33
+135 76 59
+206 210 222
+228 238 242
+87 82 91
 255 255 255
 24 24 24
diff --git a/graphics/pokemon/castform/sunny/shiny.pal b/graphics/pokemon/castform/sunny/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
 197 197 148
 98 49 41
-205 90 74
-238 123 74
-255 156 65
-0 0 0
-255 246 106
-230 213 106
-255 156 98
-213 131 74
+191 64 100
+238 73 103
+255 122 122
+245 151 182
+255 165 133
+230 107 107
+255 206 107
+222 138 63
 148 90 65
-213 205 230
+213 174 214
+238 211 231
 90 90 82
 255 255 255
 24 24 24
diff --git a/graphics/pokemon/cherrim/normal/front.png b/graphics/pokemon/cherrim/normal/front.png
diff --git a/graphics/pokemon/cherrim/sunshine/anim_front.png b/graphics/pokemon/cherrim/sunshine/anim_front.png
diff --git a/graphics/pokemon/cherrim/sunshine/front.png b/graphics/pokemon/cherrim/sunshine/front.png
diff --git a/graphics/pokemon/spheal/anim_front.png b/graphics/pokemon/spheal/anim_front.png
diff --git a/graphics/pokemon/spinda/anim_front.png b/graphics/pokemon/spinda/anim_front.png
diff --git a/graphics/pokemon/spinda/back.png b/graphics/pokemon/spinda/back.png
diff --git a/graphics/pokemon/spinda/normal.pal b/graphics/pokemon/spinda/normal.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 49 164 82
-246 230 172
-230 213 164
-197 180 131
-172 148 106
-222 139 74
+251 245 223
+231 218 192
+209 186 158
+172 131 108
+242 136 54
 222 106 57
-180 90 41
-156 57 24
+179 66 41
+154 35 24
 115 65 16
-172 65 90
-255 255 0
+170 65 119
+242 115 166
 255 255 0
 123 98 74
 90 65 49

diff --git a/graphics/pokemon/spinda/shiny.pal b/graphics/pokemon/spinda/shiny.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 49 164 82
-246 230 172
-230 213 164
-197 180 131
-172 148 106
+251 245 223
+231 218 192
+209 186 158
+172 131 108
 180 197 90
-148 164 57
-115 131 24
-82 98 0
+134 162 57
+87 129 24
+46 97 0
 49 65 0
-172 65 90
-255 255 0
+170 65 119
+242 115 166
 255 255 0
 123 98 74
 90 65 49

diff --git a/include/pokemon.h b/include/pokemon.h
@@ -543,7 +543,7 @@ u16 NationalToHoennOrder(u16 nationalNum);
 u16 SpeciesToNationalPokedexNum(u16 species);
 u16 SpeciesToHoennPokedexNum(u16 species);
 u16 HoennToNationalOrder(u16 hoennNum);
-void DrawSpindaSpots(u16 species, u32 personality, u8 *dest, bool8 isFrontPic);
+void DrawSpindaSpots(u32 personality, u8 *dest, bool32 isSecondFrame);
 void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
 u8 GetPlayerFlankId(void);
 u16 GetLinkTrainerFlankId(u8 id);

diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
@@ -404,7 +404,7 @@ const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/anim_fro
 const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz");
-const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/front.4bpp.lz");
+const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/anim_front.4bpp.lz");
@@ -1148,9 +1148,9 @@ const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/y/anim_fron
 const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/anim_front.4bpp.lz");
 const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/anim_front.4bpp.lz");
 const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/anim_front.4bpp.lz");
-const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/front.4bpp.lz");
-const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/front.4bpp.lz");
-const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/front.4bpp.lz");
+const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/anim_front.4bpp.lz");
+const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/anim_front.4bpp.lz");
+const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/anim_front.4bpp.lz");
 const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.lz");
 const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.lz");
 const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.lz");
@@ -1159,7 +1159,7 @@ const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sa
 const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/anim_front.4bpp.lz");
 const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz");
 const u32 gMonFrontPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/anim_front.4bpp.lz");
-const u32 gMonFrontPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/front.4bpp.lz");
+const u32 gMonFrontPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/anim_front.4bpp.lz");
 const u32 gMonFrontPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/anim_front.4bpp.lz");
 const u32 gMonFrontPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/anim_front.4bpp.lz");
 const u32 gMonFrontPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/anim_front.4bpp.lz");
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,17 +2,17 @@ JASC-PAL @@
 164 82
-230 172
-213 164
-180 131
-148 106
-139 74
+245 223
+218 192
+186 158
+131 108
+136 54
 106 57
-90 41
-57 24
+66 41
+35 24
 65 16
-65 90
-255 0
+65 119
+115 166
 255 0
 98 74
 65 49
@@ Expand Down @@