diff --git a/graphics/pokemon/brionne/anim_front.png b/graphics/pokemon/brionne/anim_front.png new file mode 100644 index 0000000000..773a0c405b Binary files /dev/null and b/graphics/pokemon/brionne/anim_front.png differ diff --git a/graphics/pokemon/brionne/front.png b/graphics/pokemon/brionne/front.png deleted file mode 100644 index d592b4aa1a..0000000000 Binary files a/graphics/pokemon/brionne/front.png and /dev/null differ diff --git a/graphics/pokemon/gumshoos/anim_front.png b/graphics/pokemon/gumshoos/anim_front.png new file mode 100644 index 0000000000..f64620ef26 Binary files /dev/null and b/graphics/pokemon/gumshoos/anim_front.png differ diff --git a/graphics/pokemon/gumshoos/front.png b/graphics/pokemon/gumshoos/front.png deleted file mode 100644 index acfc23ef01..0000000000 Binary files a/graphics/pokemon/gumshoos/front.png and /dev/null differ diff --git a/graphics/pokemon/incineroar/anim_front.png b/graphics/pokemon/incineroar/anim_front.png new file mode 100644 index 0000000000..99702b1079 Binary files /dev/null and b/graphics/pokemon/incineroar/anim_front.png differ diff --git a/graphics/pokemon/incineroar/front.png b/graphics/pokemon/incineroar/front.png deleted file mode 100644 index 216602d647..0000000000 Binary files a/graphics/pokemon/incineroar/front.png and /dev/null differ diff --git a/graphics/pokemon/litten/anim_front.png b/graphics/pokemon/litten/anim_front.png new file mode 100644 index 0000000000..69bf10981a Binary files /dev/null and b/graphics/pokemon/litten/anim_front.png differ diff --git a/graphics/pokemon/litten/back.png b/graphics/pokemon/litten/back.png index 7250f7b809..62e4bd0300 100644 Binary files a/graphics/pokemon/litten/back.png and b/graphics/pokemon/litten/back.png differ diff --git a/graphics/pokemon/litten/front.png b/graphics/pokemon/litten/front.png deleted file mode 100644 index f4d99ae216..0000000000 Binary files a/graphics/pokemon/litten/front.png and /dev/null differ diff --git a/graphics/pokemon/litten/normal.pal b/graphics/pokemon/litten/normal.pal index 8195bb059e..f0900e8197 100644 --- a/graphics/pokemon/litten/normal.pal +++ b/graphics/pokemon/litten/normal.pal @@ -16,4 +16,4 @@ JASC-PAL 128 32 32 104 104 120 32 24 56 -0 0 0 +149 149 149 diff --git a/graphics/pokemon/litten/shiny.pal b/graphics/pokemon/litten/shiny.pal index 2d55ac04d1..d19d231523 100644 --- a/graphics/pokemon/litten/shiny.pal +++ b/graphics/pokemon/litten/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 128 32 32 248 248 248 32 24 56 -0 0 0 +149 149 149 diff --git a/graphics/pokemon/mareanie/anim_front.png b/graphics/pokemon/mareanie/anim_front.png new file mode 100644 index 0000000000..fa9473e926 Binary files /dev/null and b/graphics/pokemon/mareanie/anim_front.png differ diff --git a/graphics/pokemon/mareanie/back.png b/graphics/pokemon/mareanie/back.png index fd9ac27e94..fd273e8174 100644 Binary files a/graphics/pokemon/mareanie/back.png and b/graphics/pokemon/mareanie/back.png differ diff --git a/graphics/pokemon/mareanie/front.png b/graphics/pokemon/mareanie/front.png deleted file mode 100644 index 6bf9dd059e..0000000000 Binary files a/graphics/pokemon/mareanie/front.png and /dev/null differ diff --git a/graphics/pokemon/mareanie/normal.pal b/graphics/pokemon/mareanie/normal.pal index 4acef7a64b..d924c9d5bd 100644 --- a/graphics/pokemon/mareanie/normal.pal +++ b/graphics/pokemon/mareanie/normal.pal @@ -14,6 +14,6 @@ JASC-PAL 216 168 208 152 216 208 248 248 248 -0 0 0 -0 0 0 +228 31 31 +145 43 43 0 0 0 diff --git a/graphics/pokemon/mareanie/shiny.pal b/graphics/pokemon/mareanie/shiny.pal index 5f0e3c4d3b..6aad5d9fae 100644 --- a/graphics/pokemon/mareanie/shiny.pal +++ b/graphics/pokemon/mareanie/shiny.pal @@ -14,6 +14,6 @@ JASC-PAL 240 152 112 232 104 160 248 248 248 -0 0 0 -0 0 0 +232 124 218 +185 94 173 0 0 0 diff --git a/graphics/pokemon/mimikyu/anim_front.png b/graphics/pokemon/mimikyu/anim_front.png new file mode 100644 index 0000000000..5797ed88cd Binary files /dev/null and b/graphics/pokemon/mimikyu/anim_front.png differ diff --git a/graphics/pokemon/mimikyu/front.png b/graphics/pokemon/mimikyu/front.png deleted file mode 100644 index 9d1a9181d3..0000000000 Binary files a/graphics/pokemon/mimikyu/front.png and /dev/null differ diff --git a/graphics/pokemon/minior/anim_front.png b/graphics/pokemon/minior/anim_front.png new file mode 100644 index 0000000000..01c34d4e6c Binary files /dev/null and b/graphics/pokemon/minior/anim_front.png differ diff --git a/graphics/pokemon/minior/back.png b/graphics/pokemon/minior/back.png index 2e99bdc5e1..65b8892cd3 100644 Binary files a/graphics/pokemon/minior/back.png and b/graphics/pokemon/minior/back.png differ diff --git a/graphics/pokemon/minior/core/anim_front.png b/graphics/pokemon/minior/core/anim_front.png new file mode 100644 index 0000000000..aaee945f71 Binary files /dev/null and b/graphics/pokemon/minior/core/anim_front.png differ diff --git a/graphics/pokemon/minior/core/back.png b/graphics/pokemon/minior/core/back.png index f93b5fd8fd..ade22e6021 100644 Binary files a/graphics/pokemon/minior/core/back.png and b/graphics/pokemon/minior/core/back.png differ diff --git a/graphics/pokemon/minior/core/blue/normal.pal b/graphics/pokemon/minior/core/blue/normal.pal index f22a495642..ce74378a24 100644 --- a/graphics/pokemon/minior/core/blue/normal.pal +++ b/graphics/pokemon/minior/core/blue/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -69 141 163 -243 243 243 -16 16 16 -191 227 224 -123 215 234 -65 173 214 -55 158 198 -55 160 200 -50 153 203 -45 130 170 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 208 160 +56 88 104 +248 248 248 +192 216 216 +88 192 208 +80 144 184 0 0 0 +80 144 184 +192 224 216 +56 96 112 +134 174 204 +58 88 104 +58 88 104 +115 162 196 +58 88 104 +58 88 104 diff --git a/graphics/pokemon/minior/core/front.png b/graphics/pokemon/minior/core/front.png deleted file mode 100644 index cf21d88dbc..0000000000 Binary files a/graphics/pokemon/minior/core/front.png and /dev/null differ diff --git a/graphics/pokemon/minior/core/green/normal.pal b/graphics/pokemon/minior/core/green/normal.pal index a3d601c5cd..496c5dff60 100644 --- a/graphics/pokemon/minior/core/green/normal.pal +++ b/graphics/pokemon/minior/core/green/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -55 133 44 -243 243 243 -16 16 16 -190 238 168 -148 222 82 -100 176 53 -54 146 52 -55 149 53 -53 145 57 -57 117 49 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 208 160 +88 112 48 +248 248 248 +224 232 200 +152 224 72 +120 176 72 0 0 0 +120 176 72 +216 232 200 +96 112 48 +140 191 88 +88 104 48 +88 104 48 +140 191 98 +88 112 48 +88 112 48 diff --git a/graphics/pokemon/minior/core/indigo/normal.pal b/graphics/pokemon/minior/core/indigo/normal.pal index 7e64119fee..a462aa9acd 100644 --- a/graphics/pokemon/minior/core/indigo/normal.pal +++ b/graphics/pokemon/minior/core/indigo/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -69 141 163 -243 243 243 -16 16 16 -137 209 229 -49 175 223 -51 109 198 -29 92 163 -30 95 166 -30 89 162 -35 56 143 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 208 160 +56 72 96 +248 248 248 +200 216 216 +104 144 192 +88 104 176 0 0 0 +88 104 176 +192 216 216 +72 128 184 +100 112 181 +56 72 96 +56 72 96 +100 112 181 +56 72 96 +56 72 96 diff --git a/graphics/pokemon/minior/core/orange/normal.pal b/graphics/pokemon/minior/core/orange/normal.pal index 221ab8b0c3..4c228f2e4c 100644 --- a/graphics/pokemon/minior/core/orange/normal.pal +++ b/graphics/pokemon/minior/core/orange/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -173 80 39 -243 243 243 -16 16 16 -252 215 161 -247 172 62 -234 104 26 -210 102 21 -211 103 22 -209 97 22 -167 88 31 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 208 160 +112 80 48 +248 248 248 +232 216 200 +232 168 64 +200 120 72 0 0 0 +200 120 72 +232 206 218 +120 80 48 +207 138 97 +112 80 48 +112 80 48 +207 138 97 +112 80 48 +112 80 48 diff --git a/graphics/pokemon/minior/core/red/normal.pal b/graphics/pokemon/minior/core/red/normal.pal index deb2598ddc..d42357f006 100644 --- a/graphics/pokemon/minior/core/red/normal.pal +++ b/graphics/pokemon/minior/core/red/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -163 48 68 -243 243 243 -16 16 16 -241 156 179 -242 97 145 -208 43 84 -192 29 86 -197 29 87 -186 29 84 -160 33 78 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 208 160 +136 48 72 +248 248 248 +248 208 224 +248 120 152 +184 80 104 0 0 0 +184 80 112 +248 208 216 +184 72 104 +192 96 120 +128 48 72 +128 48 64 +194 105 125 +136 48 72 +136 48 72 diff --git a/graphics/pokemon/minior/core/shiny.pal b/graphics/pokemon/minior/core/shiny.pal index ee5a40196c..4558523997 100644 --- a/graphics/pokemon/minior/core/shiny.pal +++ b/graphics/pokemon/minior/core/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -41 41 41 -243 243 243 -16 16 16 -153 153 162 +152 208 160 +40 40 40 +248 248 248 +210 207 231 89 89 89 58 58 58 -251 223 66 -148 222 82 -49 175 223 -247 172 62 -0 0 0 -0 0 0 -0 0 0 -0 0 0 0 0 0 +130 209 202 +213 201 45 +184 72 104 +192 136 200 +56 72 96 +128 48 64 +160 209 88 +128 48 72 +232 168 64 diff --git a/graphics/pokemon/minior/core/violet/normal.pal b/graphics/pokemon/minior/core/violet/normal.pal index 019ded8cbb..8d98e32753 100644 --- a/graphics/pokemon/minior/core/violet/normal.pal +++ b/graphics/pokemon/minior/core/violet/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -91 52 131 -243 243 243 -16 16 16 -209 186 217 -170 97 242 -123 62 198 -107 57 168 -106 56 167 -104 55 170 -82 52 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 208 160 +96 64 96 +248 248 248 +208 200 216 +192 136 200 +168 96 152 0 0 0 +168 96 152 +208 200 216 +88 64 88 +168 104 160 +96 64 96 +96 64 96 +168 104 160 +96 64 96 +96 64 96 diff --git a/graphics/pokemon/minior/core/yellow/normal.pal b/graphics/pokemon/minior/core/yellow/normal.pal index eacaa34ac0..90e190610b 100644 --- a/graphics/pokemon/minior/core/yellow/normal.pal +++ b/graphics/pokemon/minior/core/yellow/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 211 165 -145 107 30 -243 243 243 -16 16 16 -255 247 152 -251 223 66 -228 174 12 -186 163 29 -191 167 30 -188 156 27 -164 138 34 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 208 160 +112 104 48 +248 248 248 +240 232 200 +232 224 56 +176 184 56 0 0 0 +184 184 56 +240 232 200 +192 192 80 +197 197 71 +112 96 48 +112 96 40 +197 197 71 +112 104 48 +112 104 48 diff --git a/graphics/pokemon/minior/front.png b/graphics/pokemon/minior/front.png deleted file mode 100644 index 4d1330b65a..0000000000 Binary files a/graphics/pokemon/minior/front.png and /dev/null differ diff --git a/graphics/pokemon/minior/normal.pal b/graphics/pokemon/minior/normal.pal index 1470377747..7a3781a482 100644 --- a/graphics/pokemon/minior/normal.pal +++ b/graphics/pokemon/minior/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 104 104 -240 240 240 -16 16 16 -176 176 176 -96 32 32 -176 120 104 -152 56 32 -144 72 72 -24 24 32 -120 40 24 -192 144 120 -0 0 0 +0 0 0 +216 216 216 +160 168 168 +32 24 24 +56 56 56 +112 88 88 +64 48 48 +80 64 56 +160 120 112 +104 80 80 +184 168 136 +56 40 40 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/minior/shiny.pal b/graphics/pokemon/minior/shiny.pal index 1470377747..7a3781a482 100644 --- a/graphics/pokemon/minior/shiny.pal +++ b/graphics/pokemon/minior/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 104 104 -240 240 240 -16 16 16 -176 176 176 -96 32 32 -176 120 104 -152 56 32 -144 72 72 -24 24 32 -120 40 24 -192 144 120 -0 0 0 +0 0 0 +216 216 216 +160 168 168 +32 24 24 +56 56 56 +112 88 88 +64 48 48 +80 64 56 +160 120 112 +104 80 80 +184 168 136 +56 40 40 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/popplio/anim_front.png b/graphics/pokemon/popplio/anim_front.png new file mode 100644 index 0000000000..f0adf8eaa3 Binary files /dev/null and b/graphics/pokemon/popplio/anim_front.png differ diff --git a/graphics/pokemon/popplio/front.png b/graphics/pokemon/popplio/front.png deleted file mode 100644 index 3e66227b49..0000000000 Binary files a/graphics/pokemon/popplio/front.png and /dev/null differ diff --git a/graphics/pokemon/primarina/anim_front.png b/graphics/pokemon/primarina/anim_front.png new file mode 100644 index 0000000000..2caee3b25c Binary files /dev/null and b/graphics/pokemon/primarina/anim_front.png differ diff --git a/graphics/pokemon/primarina/front.png b/graphics/pokemon/primarina/front.png deleted file mode 100644 index e203b8e0ff..0000000000 Binary files a/graphics/pokemon/primarina/front.png and /dev/null differ diff --git a/graphics/pokemon/torracat/anim_front.png b/graphics/pokemon/torracat/anim_front.png new file mode 100644 index 0000000000..28c72f1331 Binary files /dev/null and b/graphics/pokemon/torracat/anim_front.png differ diff --git a/graphics/pokemon/torracat/front.png b/graphics/pokemon/torracat/front.png deleted file mode 100644 index 488f5fa58d..0000000000 Binary files a/graphics/pokemon/torracat/front.png and /dev/null differ diff --git a/graphics/pokemon/toxapex/anim_front.png b/graphics/pokemon/toxapex/anim_front.png new file mode 100644 index 0000000000..69b24eefe5 Binary files /dev/null and b/graphics/pokemon/toxapex/anim_front.png differ diff --git a/graphics/pokemon/toxapex/front.png b/graphics/pokemon/toxapex/front.png deleted file mode 100644 index a3da78e436..0000000000 Binary files a/graphics/pokemon/toxapex/front.png and /dev/null differ diff --git a/graphics/pokemon/wishiwashi/anim_front.png b/graphics/pokemon/wishiwashi/anim_front.png new file mode 100644 index 0000000000..72b53cb3db Binary files /dev/null and b/graphics/pokemon/wishiwashi/anim_front.png differ diff --git a/graphics/pokemon/wishiwashi/front.png b/graphics/pokemon/wishiwashi/front.png deleted file mode 100644 index 69c224a3d1..0000000000 Binary files a/graphics/pokemon/wishiwashi/front.png and /dev/null differ diff --git a/graphics/pokemon/yungoos/anim_front.png b/graphics/pokemon/yungoos/anim_front.png new file mode 100644 index 0000000000..b0b454d7a1 Binary files /dev/null and b/graphics/pokemon/yungoos/anim_front.png differ diff --git a/graphics/pokemon/yungoos/front.png b/graphics/pokemon/yungoos/front.png deleted file mode 100644 index 4476a445b3..0000000000 Binary files a/graphics/pokemon/yungoos/front.png and /dev/null differ diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 20439c32ea..503ca34556 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -21450,7 +21450,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //P_FAMILY_ROWLET #if P_FAMILY_LITTEN - const u32 gMonFrontPic_Litten[] = INCGFX_U32("graphics/pokemon/litten/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Litten[] = INCGFX_U32("graphics/pokemon/litten/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Litten[] = INCGFX_U16("graphics/pokemon/litten/normal.pal", ".gbapal"); const u32 gMonBackPic_Litten[] = INCGFX_U32("graphics/pokemon/litten/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Litten[] = INCGFX_U16("graphics/pokemon/litten/shiny.pal", ".gbapal"); @@ -21466,7 +21466,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_Torracat[] = INCGFX_U32("graphics/pokemon/torracat/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Torracat[] = INCGFX_U32("graphics/pokemon/torracat/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Torracat[] = INCGFX_U16("graphics/pokemon/torracat/normal.pal", ".gbapal"); const u32 gMonBackPic_Torracat[] = INCGFX_U32("graphics/pokemon/torracat/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Torracat[] = INCGFX_U16("graphics/pokemon/torracat/shiny.pal", ".gbapal"); @@ -21482,7 +21482,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_Incineroar[] = INCGFX_U32("graphics/pokemon/incineroar/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Incineroar[] = INCGFX_U32("graphics/pokemon/incineroar/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Incineroar[] = INCGFX_U16("graphics/pokemon/incineroar/normal.pal", ".gbapal"); const u32 gMonBackPic_Incineroar[] = INCGFX_U32("graphics/pokemon/incineroar/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Incineroar[] = INCGFX_U16("graphics/pokemon/incineroar/shiny.pal", ".gbapal"); @@ -21500,7 +21500,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //P_FAMILY_LITTEN #if P_FAMILY_POPPLIO - const u32 gMonFrontPic_Popplio[] = INCGFX_U32("graphics/pokemon/popplio/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Popplio[] = INCGFX_U32("graphics/pokemon/popplio/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Popplio[] = INCGFX_U16("graphics/pokemon/popplio/normal.pal", ".gbapal"); const u32 gMonBackPic_Popplio[] = INCGFX_U32("graphics/pokemon/popplio/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Popplio[] = INCGFX_U16("graphics/pokemon/popplio/shiny.pal", ".gbapal"); @@ -21516,7 +21516,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_Brionne[] = INCGFX_U32("graphics/pokemon/brionne/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Brionne[] = INCGFX_U32("graphics/pokemon/brionne/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Brionne[] = INCGFX_U16("graphics/pokemon/brionne/normal.pal", ".gbapal"); const u32 gMonBackPic_Brionne[] = INCGFX_U32("graphics/pokemon/brionne/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Brionne[] = INCGFX_U16("graphics/pokemon/brionne/shiny.pal", ".gbapal"); @@ -21532,7 +21532,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_Primarina[] = INCGFX_U32("graphics/pokemon/primarina/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Primarina[] = INCGFX_U32("graphics/pokemon/primarina/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Primarina[] = INCGFX_U16("graphics/pokemon/primarina/normal.pal", ".gbapal"); const u32 gMonBackPic_Primarina[] = INCGFX_U32("graphics/pokemon/primarina/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Primarina[] = INCGFX_U16("graphics/pokemon/primarina/shiny.pal", ".gbapal"); @@ -21600,7 +21600,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //P_FAMILY_PIKIPEK #if P_FAMILY_YUNGOOS - const u32 gMonFrontPic_Yungoos[] = INCGFX_U32("graphics/pokemon/yungoos/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Yungoos[] = INCGFX_U32("graphics/pokemon/yungoos/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Yungoos[] = INCGFX_U16("graphics/pokemon/yungoos/normal.pal", ".gbapal"); const u32 gMonBackPic_Yungoos[] = INCGFX_U32("graphics/pokemon/yungoos/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Yungoos[] = INCGFX_U16("graphics/pokemon/yungoos/shiny.pal", ".gbapal"); @@ -21616,7 +21616,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_Gumshoos[] = INCGFX_U32("graphics/pokemon/gumshoos/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Gumshoos[] = INCGFX_U32("graphics/pokemon/gumshoos/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Gumshoos[] = INCGFX_U16("graphics/pokemon/gumshoos/normal.pal", ".gbapal"); const u32 gMonBackPic_Gumshoos[] = INCGFX_U32("graphics/pokemon/gumshoos/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Gumshoos[] = INCGFX_U16("graphics/pokemon/gumshoos/shiny.pal", ".gbapal"); @@ -21884,7 +21884,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //P_FAMILY_ROCKRUFF #if P_FAMILY_WISHIWASHI - const u32 gMonFrontPic_WishiwashiSolo[] = INCGFX_U32("graphics/pokemon/wishiwashi/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_WishiwashiSolo[] = INCGFX_U32("graphics/pokemon/wishiwashi/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_WishiwashiSolo[] = INCGFX_U16("graphics/pokemon/wishiwashi/normal.pal", ".gbapal"); const u32 gMonBackPic_WishiwashiSolo[] = INCGFX_U32("graphics/pokemon/wishiwashi/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_WishiwashiSolo[] = INCGFX_U16("graphics/pokemon/wishiwashi/shiny.pal", ".gbapal"); @@ -21915,7 +21915,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //P_FAMILY_WISHIWASHI #if P_FAMILY_MAREANIE - const u32 gMonFrontPic_Mareanie[] = INCGFX_U32("graphics/pokemon/mareanie/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Mareanie[] = INCGFX_U32("graphics/pokemon/mareanie/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Mareanie[] = INCGFX_U16("graphics/pokemon/mareanie/normal.pal", ".gbapal"); const u32 gMonBackPic_Mareanie[] = INCGFX_U32("graphics/pokemon/mareanie/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Mareanie[] = INCGFX_U16("graphics/pokemon/mareanie/shiny.pal", ".gbapal"); @@ -21931,7 +21931,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_Toxapex[] = INCGFX_U32("graphics/pokemon/toxapex/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_Toxapex[] = INCGFX_U32("graphics/pokemon/toxapex/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_Toxapex[] = INCGFX_U16("graphics/pokemon/toxapex/normal.pal", ".gbapal"); const u32 gMonBackPic_Toxapex[] = INCGFX_U32("graphics/pokemon/toxapex/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_Toxapex[] = INCGFX_U16("graphics/pokemon/toxapex/shiny.pal", ".gbapal"); @@ -22444,7 +22444,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //P_FAMILY_TYPE_NULL #if P_FAMILY_MINIOR - const u32 gMonFrontPic_MiniorMeteor[] = INCGFX_U32("graphics/pokemon/minior/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_MiniorMeteor[] = INCGFX_U32("graphics/pokemon/minior/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_MiniorMeteor[] = INCGFX_U16("graphics/pokemon/minior/normal.pal", ".gbapal"); const u32 gMonBackPic_MiniorMeteor[] = INCGFX_U32("graphics/pokemon/minior/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_MiniorMeteor[] = INCGFX_U16("graphics/pokemon/minior/shiny.pal", ".gbapal"); @@ -22453,7 +22453,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Minior[] = INCGFX_U8("graphics/pokemon/minior/footprint.png", ".1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MiniorCore[] = INCGFX_U32("graphics/pokemon/minior/core/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_MiniorCore[] = INCGFX_U32("graphics/pokemon/minior/core/anim_front.png", ".4bpp.smol"); const u32 gMonBackPic_MiniorCore[] = INCGFX_U32("graphics/pokemon/minior/core/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_MiniorCore[] = INCGFX_U16("graphics/pokemon/minior/core/shiny.pal", ".gbapal"); @@ -22542,7 +22542,7 @@ const u32 gObjectEventPic_Substitute[] = INCGFX_COMP("graphics/pokemon/question_ #endif //P_FAMILY_TOGEDEMARU #if P_FAMILY_MIMIKYU - const u32 gMonFrontPic_MimikyuDisguised[] = INCGFX_U32("graphics/pokemon/mimikyu/front.png", ".4bpp.smol"); + const u32 gMonFrontPic_MimikyuDisguised[] = INCGFX_U32("graphics/pokemon/mimikyu/anim_front.png", ".4bpp.smol"); const u16 gMonPalette_MimikyuDisguised[] = INCGFX_U16("graphics/pokemon/mimikyu/normal.pal", ".gbapal"); const u32 gMonBackPic_MimikyuDisguised[] = INCGFX_U32("graphics/pokemon/mimikyu/back.png", ".4bpp.smol"); const u16 gMonShinyPalette_MimikyuDisguised[] = INCGFX_U16("graphics/pokemon/mimikyu/shiny.pal", ".gbapal"); diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index 1613ff5302..179a6c549b 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -318,8 +318,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Litten, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, - .frontAnimId = ANIM_H_STRETCH, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), + .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Litten, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, @@ -383,7 +386,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Torracat, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Torracat, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -447,8 +453,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Incineroar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, - .frontAnimId = ANIM_V_SHAKE, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), + .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Incineroar, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, @@ -512,7 +521,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Popplio, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Popplio, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -577,8 +589,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Brionne, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, - .frontAnimId = ANIM_SHRINK_GROW, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), + .frontAnimId = ANIM_SWING_CONCAVE_FAST, .backPic = gMonBackPic_Brionne, .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, @@ -641,7 +658,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Primarina, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(1, 60), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_SHAKE_GLOW_BLUE_SLOW, .backPic = gMonBackPic_Primarina, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -917,8 +939,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Yungoos, .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, - .frontAnimId = ANIM_V_STRETCH, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), + .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Yungoos, .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 14, @@ -979,8 +1004,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Gumshoos, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, - .frontAnimId = ANIM_H_SHAKE, + .frontAnimFrames = sAnims_Gumshoos, + .frontAnimId = ANIM_H_SHAKE_SLOW, .backPic = gMonBackPic_Gumshoos, .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, @@ -1040,8 +1065,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Gumshoos, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, - .frontAnimId = ANIM_H_SHAKE, + .frontAnimFrames = sAnims_Gumshoos, + .frontAnimId = ANIM_H_SHAKE_SLOW, .backPic = gMonBackPic_Gumshoos, .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, @@ -2399,7 +2424,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_WishiwashiSolo, .frontPicSize = MON_COORDS_SIZE(40, 24), .frontPicYOffset = 20, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 12, .backPic = gMonBackPic_WishiwashiSolo, @@ -2526,8 +2558,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Mareanie, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, - .frontAnimId = ANIM_GLOW_PURPLE, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 1), + ), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Mareanie, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 15, @@ -2592,7 +2628,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_Toxapex, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_SHAKE_GLOW_PURPLE_SLOW, .backPic = gMonBackPic_Toxapex, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4620,12 +4659,16 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_MiniorMeteor, \ .frontPicSize = MON_COORDS_SIZE(48, 40), \ .frontPicYOffset = 14, \ - .frontAnimFrames = sAnims_SingleFramePlaceHolder, \ - .frontAnimId = ANIM_TUMBLING_FRONT_FLIP_TWICE, \ + .frontAnimFrames = ANIM_FRAMES( \ + ANIMCMD_FRAME(0, 10), \ + ANIMCMD_FRAME(1, 30), \ + ANIMCMD_FRAME(0, 1), \ + ), \ + .frontAnimId = ANIM_BACK_FLIP_BIG, \ .enemyMonElevation = 17, \ .backPic = gMonBackPic_MiniorMeteor, \ .backPicSize = MON_COORDS_SIZE(56, 40), \ - .backPicYOffset = 14, \ + .backPicYOffset = 11, \ /*.backAnimId = BACK_ANIM_NONE,*/ \ .palette = gMonPalette_MiniorMeteor, \ .shinyPalette = gMonShinyPalette_MiniorMeteor, \ @@ -4660,12 +4703,16 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_MiniorCore, \ .frontPicSize = MON_COORDS_SIZE(48, 40), \ .frontPicYOffset = 16, \ - .frontAnimFrames = sAnims_SingleFramePlaceHolder, \ + .frontAnimFrames = ANIM_FRAMES( \ + ANIMCMD_FRAME(0, 30), \ + ANIMCMD_FRAME(1, 50), \ + ANIMCMD_FRAME(0, 1), \ + ), \ .frontAnimId = ANIM_TUMBLING_FRONT_FLIP_TWICE, \ .enemyMonElevation = 17, \ .backPic = gMonBackPic_MiniorCore, \ .backPicSize = MON_COORDS_SIZE(56, 40), \ - .backPicYOffset = 15, \ + .backPicYOffset = 13, \ /*.backAnimId = BACK_ANIM_NONE,*/ \ .palette = gMonPalette_MiniorCore##Form, \ .shinyPalette = gMonShinyPalette_MiniorCore, \ @@ -4993,8 +5040,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_MimikyuDisguised, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, - .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, + .frontAnimFrames = sAnims_MimikyuDisguised, + .frontAnimId = ANIM_SWING_CONCAVE_FAST_SHORT, .backPic = gMonBackPic_MimikyuDisguised, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, @@ -5110,7 +5157,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPic = gMonFrontPic_MimikyuDisguised, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_SingleFramePlaceHolder, + .frontAnimFrames = sAnims_MimikyuDisguised, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MimikyuDisguised, .backPicSize = MON_COORDS_SIZE(56, 56), diff --git a/src/data/pokemon/species_info/shared_front_pic_anims.h b/src/data/pokemon/species_info/shared_front_pic_anims.h index ba1ddfd53e..08ef9bb022 100644 --- a/src/data/pokemon/species_info/shared_front_pic_anims.h +++ b/src/data/pokemon/species_info/shared_front_pic_anims.h @@ -345,6 +345,19 @@ static const union AnimCmd *const sAnims_Zygarde10[] = }; #endif //P_FAMILY_ZYGARDE +#if P_FAMILY_YUNGOOS +static const union AnimCmd *const sAnims_Gumshoos[] = +{ + sAnim_GeneralFrame0, + (const union AnimCmd[]) { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 60), + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, + }, +}; +#endif //P_FAMILY_YUNGOOS + #if P_FAMILY_GRUBBIN static const union AnimCmd *const sAnims_Vikavolt[] = { @@ -432,6 +445,20 @@ static const union AnimCmd *const sAnims_Togedemaru[] = }; #endif //P_FAMILY_TOGEDEMARU +#if P_FAMILY_MIMIKYU +static const union AnimCmd *const sAnims_MimikyuDisguised[] = +{ + sAnim_GeneralFrame0, + (const union AnimCmd[]) { + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, + }, +}; +#endif //P_FAMILY_MIMIKYU + #if P_FAMILY_JANGMO_O static const union AnimCmd *const sAnims_Kommo_O[] = {