diff --git a/graphics/pokemon/clodsire/anim_front.png b/graphics/pokemon/clodsire/anim_front.png new file mode 100644 index 0000000000..1630189f62 Binary files /dev/null and b/graphics/pokemon/clodsire/anim_front.png differ diff --git a/graphics/pokemon/clodsire/back.png b/graphics/pokemon/clodsire/back.png index 64132a060f..115f842435 100755 Binary files a/graphics/pokemon/clodsire/back.png and b/graphics/pokemon/clodsire/back.png differ diff --git a/graphics/pokemon/clodsire/front.png b/graphics/pokemon/clodsire/front.png deleted file mode 100755 index 2722b7eb70..0000000000 Binary files a/graphics/pokemon/clodsire/front.png and /dev/null differ diff --git a/graphics/pokemon/clodsire/normal.pal b/graphics/pokemon/clodsire/normal.pal index c7d36df32c..bf8f45d0c8 100755 --- a/graphics/pokemon/clodsire/normal.pal +++ b/graphics/pokemon/clodsire/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -64 60 48 -128 108 96 +153 211 165 +248 141 165 +176 90 105 +105 54 57 +184 160 162 +152 122 126 +86 71 72 +128 109 102 96 80 72 -48 40 32 +69 60 50 +51 41 36 +46 39 36 16 16 16 -184 160 160 -208 208 208 -40 36 32 -152 120 120 -80 68 72 -104 52 56 -176 88 104 -248 140 160 -0 0 0 -0 0 0 +215 189 217 +152 116 156 +91 67 108 diff --git a/graphics/pokemon/clodsire/shiny.pal b/graphics/pokemon/clodsire/shiny.pal index fcf3c9dc23..e3c18d79db 100755 --- a/graphics/pokemon/clodsire/shiny.pal +++ b/graphics/pokemon/clodsire/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -74 67 90 -127 116 143 -107 97 124 -46 40 44 -16 16 16 +153 211 165 +248 141 142 +176 94 90 +105 62 54 160 158 197 -205 180 170 -40 36 32 127 127 157 87 85 112 -104 52 56 -176 88 104 -248 140 160 -0 0 0 -0 0 0 +127 116 143 +107 97 124 +74 67 90 +49 43 62 +46 40 44 +16 16 16 +230 209 181 +201 159 123 +99 63 59 diff --git a/graphics/pokemon/grookey/back.png b/graphics/pokemon/grookey/back.png index b7f6c6076e..bdcc5924d4 100644 Binary files a/graphics/pokemon/grookey/back.png and b/graphics/pokemon/grookey/back.png differ diff --git a/graphics/pokemon/grookey/overworld.png b/graphics/pokemon/grookey/overworld.png index 2fb8352956..928fd09bc4 100644 Binary files a/graphics/pokemon/grookey/overworld.png and b/graphics/pokemon/grookey/overworld.png differ diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 726a0414f4..4c6fa671e2 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -7696,7 +7696,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/front.4bpp.lz"); + const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/anim_front.4bpp.lz"); const u32 gMonPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/normal.gbapal.lz"); const u32 gMonBackPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/back.4bpp.lz"); const u32 gMonShinyPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/shiny.gbapal.lz"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index adf64468aa..74b90bb340 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -2845,7 +2845,7 @@ static const union AnimCmd sAnim_Quagsire_1[] = #if P_PALDEAN_FORMS PLACEHOLDER_ANIM_SINGLE_FRAME(WooperPaldea); -PLACEHOLDER_ANIM_SINGLE_FRAME(Clodsire); +PLACEHOLDER_ANIM_TWO_FRAMES(Clodsire); #endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER diff --git a/test/battle/trainer_control.h b/test/battle/trainer_control.h index 72db458de7..fb548e6558 100644 --- a/test/battle/trainer_control.h +++ b/test/battle/trainer_control.h @@ -17,7 +17,7 @@ .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1, #line 4 .trainerPic = TRAINER_PIC_RED, - .encounterMusic_gender = + .encounterMusic_gender = #line 6 TRAINER_ENCOUNTER_MUSIC_MALE, #line 7