diff --git a/graphics/pokemon/appletun/anim_front.png b/graphics/pokemon/appletun/anim_front.png new file mode 100644 index 0000000000..da5c23eb54 Binary files /dev/null and b/graphics/pokemon/appletun/anim_front.png differ diff --git a/graphics/pokemon/appletun/front.png b/graphics/pokemon/appletun/front.png deleted file mode 100644 index b33eece6de..0000000000 Binary files a/graphics/pokemon/appletun/front.png and /dev/null differ diff --git a/graphics/pokemon/applin/anim_front.png b/graphics/pokemon/applin/anim_front.png new file mode 100644 index 0000000000..b2ec38de28 Binary files /dev/null and b/graphics/pokemon/applin/anim_front.png differ diff --git a/graphics/pokemon/applin/front.png b/graphics/pokemon/applin/front.png deleted file mode 100644 index 0a722a7936..0000000000 Binary files a/graphics/pokemon/applin/front.png and /dev/null differ diff --git a/graphics/pokemon/araquanid/anim_front.png b/graphics/pokemon/araquanid/anim_front.png new file mode 100644 index 0000000000..d6bff38c76 Binary files /dev/null and b/graphics/pokemon/araquanid/anim_front.png differ diff --git a/graphics/pokemon/araquanid/front.png b/graphics/pokemon/araquanid/front.png deleted file mode 100644 index 2bc81b2f02..0000000000 Binary files a/graphics/pokemon/araquanid/front.png and /dev/null differ diff --git a/graphics/pokemon/bewear/anim_front.png b/graphics/pokemon/bewear/anim_front.png new file mode 100644 index 0000000000..45ce9a2901 Binary files /dev/null and b/graphics/pokemon/bewear/anim_front.png differ diff --git a/graphics/pokemon/bewear/front.png b/graphics/pokemon/bewear/front.png deleted file mode 100644 index f9f447d4d1..0000000000 Binary files a/graphics/pokemon/bewear/front.png and /dev/null differ diff --git a/graphics/pokemon/carkol/anim_front.png b/graphics/pokemon/carkol/anim_front.png new file mode 100644 index 0000000000..770b8799b2 Binary files /dev/null and b/graphics/pokemon/carkol/anim_front.png differ diff --git a/graphics/pokemon/carkol/front.png b/graphics/pokemon/carkol/front.png deleted file mode 100644 index 5530dc822f..0000000000 Binary files a/graphics/pokemon/carkol/front.png and /dev/null differ diff --git a/graphics/pokemon/centiskorch/anim_front.png b/graphics/pokemon/centiskorch/anim_front.png new file mode 100644 index 0000000000..a5dc3813f6 Binary files /dev/null and b/graphics/pokemon/centiskorch/anim_front.png differ diff --git a/graphics/pokemon/centiskorch/front.png b/graphics/pokemon/centiskorch/front.png deleted file mode 100644 index 61018aa601..0000000000 Binary files a/graphics/pokemon/centiskorch/front.png and /dev/null differ diff --git a/graphics/pokemon/charjabug/anim_front.png b/graphics/pokemon/charjabug/anim_front.png new file mode 100644 index 0000000000..163ab2ba2d Binary files /dev/null and b/graphics/pokemon/charjabug/anim_front.png differ diff --git a/graphics/pokemon/charjabug/front.png b/graphics/pokemon/charjabug/front.png deleted file mode 100644 index d2f1139c55..0000000000 Binary files a/graphics/pokemon/charjabug/front.png and /dev/null differ diff --git a/graphics/pokemon/charjabug/normal.pal b/graphics/pokemon/charjabug/normal.pal index 3e58c79d17..b44500e78c 100644 --- a/graphics/pokemon/charjabug/normal.pal +++ b/graphics/pokemon/charjabug/normal.pal @@ -15,5 +15,5 @@ JASC-PAL 240 184 96 128 80 8 224 144 16 -0 0 0 -0 0 0 +8 64 88 +176 168 176 diff --git a/graphics/pokemon/chewtle/anim_front.png b/graphics/pokemon/chewtle/anim_front.png new file mode 100644 index 0000000000..b340cf9ae2 Binary files /dev/null and b/graphics/pokemon/chewtle/anim_front.png differ diff --git a/graphics/pokemon/chewtle/front.png b/graphics/pokemon/chewtle/front.png deleted file mode 100644 index b121a2c7c4..0000000000 Binary files a/graphics/pokemon/chewtle/front.png and /dev/null differ diff --git a/graphics/pokemon/coalossal/anim_front.png b/graphics/pokemon/coalossal/anim_front.png new file mode 100644 index 0000000000..6ae1b32599 Binary files /dev/null and b/graphics/pokemon/coalossal/anim_front.png differ diff --git a/graphics/pokemon/coalossal/front.png b/graphics/pokemon/coalossal/front.png deleted file mode 100644 index 9b68771eeb..0000000000 Binary files a/graphics/pokemon/coalossal/front.png and /dev/null differ diff --git a/graphics/pokemon/corviknight/anim_front.png b/graphics/pokemon/corviknight/anim_front.png new file mode 100644 index 0000000000..6f18425352 Binary files /dev/null and b/graphics/pokemon/corviknight/anim_front.png differ diff --git a/graphics/pokemon/corviknight/front.png b/graphics/pokemon/corviknight/front.png deleted file mode 100644 index 69ea0e5769..0000000000 Binary files a/graphics/pokemon/corviknight/front.png and /dev/null differ diff --git a/graphics/pokemon/corvisquire/anim_front.png b/graphics/pokemon/corvisquire/anim_front.png new file mode 100644 index 0000000000..35ad0bdfba Binary files /dev/null and b/graphics/pokemon/corvisquire/anim_front.png differ diff --git a/graphics/pokemon/corvisquire/front.png b/graphics/pokemon/corvisquire/front.png deleted file mode 100644 index 9339cc44e9..0000000000 Binary files a/graphics/pokemon/corvisquire/front.png and /dev/null differ diff --git a/graphics/pokemon/dewpider/anim_front.png b/graphics/pokemon/dewpider/anim_front.png new file mode 100644 index 0000000000..3689c24561 Binary files /dev/null and b/graphics/pokemon/dewpider/anim_front.png differ diff --git a/graphics/pokemon/dewpider/front.png b/graphics/pokemon/dewpider/front.png deleted file mode 100644 index e936ef9404..0000000000 Binary files a/graphics/pokemon/dewpider/front.png and /dev/null differ diff --git a/graphics/pokemon/drednaw/anim_front.png b/graphics/pokemon/drednaw/anim_front.png new file mode 100644 index 0000000000..bc4ed3bf5a Binary files /dev/null and b/graphics/pokemon/drednaw/anim_front.png differ diff --git a/graphics/pokemon/drednaw/front.png b/graphics/pokemon/drednaw/front.png deleted file mode 100644 index e5d8d056a2..0000000000 Binary files a/graphics/pokemon/drednaw/front.png and /dev/null differ diff --git a/graphics/pokemon/exeggutor/alolan/anim_front.png b/graphics/pokemon/exeggutor/alolan/anim_front.png new file mode 100644 index 0000000000..33f0caa366 Binary files /dev/null and b/graphics/pokemon/exeggutor/alolan/anim_front.png differ diff --git a/graphics/pokemon/exeggutor/alolan/back.png b/graphics/pokemon/exeggutor/alolan/back.png index 4996c1a255..09b1bad270 100644 Binary files a/graphics/pokemon/exeggutor/alolan/back.png and b/graphics/pokemon/exeggutor/alolan/back.png differ diff --git a/graphics/pokemon/exeggutor/alolan/front.png b/graphics/pokemon/exeggutor/alolan/front.png deleted file mode 100644 index 21d4ee8d64..0000000000 Binary files a/graphics/pokemon/exeggutor/alolan/front.png and /dev/null differ diff --git a/graphics/pokemon/exeggutor/alolan/normal.pal b/graphics/pokemon/exeggutor/alolan/normal.pal index dfcbbf2466..f7b4bc50d2 100644 --- a/graphics/pokemon/exeggutor/alolan/normal.pal +++ b/graphics/pokemon/exeggutor/alolan/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -56 160 64 -40 96 48 -136 224 112 +192 216 224 +64 48 32 16 16 16 -80 192 96 -80 72 56 +192 168 128 +160 128 88 208 184 104 -248 240 184 136 128 48 -248 248 248 -200 104 136 232 160 200 -144 120 96 -192 176 152 -136 168 64 +200 104 136 +248 248 248 +248 240 184 +56 160 64 +248 248 200 +40 96 48 +80 192 96 +136 224 112 diff --git a/graphics/pokemon/exeggutor/alolan/shiny.pal b/graphics/pokemon/exeggutor/alolan/shiny.pal index c55c7f5917..1cfefbdd69 100644 --- a/graphics/pokemon/exeggutor/alolan/shiny.pal +++ b/graphics/pokemon/exeggutor/alolan/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -192 96 56 -152 56 16 -248 184 104 +192 216 224 +120 96 24 16 16 16 -224 128 72 -136 104 0 +240 232 96 +200 176 40 224 168 88 -248 216 104 -160 104 32 -248 248 248 -200 104 136 +120 80 16 232 160 200 -192 160 0 -248 240 40 -136 168 64 +200 104 136 +248 248 248 +248 224 136 +192 104 64 +248 248 200 +136 56 24 +224 144 96 +232 168 136 diff --git a/graphics/pokemon/flapple/anim_front.png b/graphics/pokemon/flapple/anim_front.png new file mode 100644 index 0000000000..1020b08dd3 Binary files /dev/null and b/graphics/pokemon/flapple/anim_front.png differ diff --git a/graphics/pokemon/flapple/front.png b/graphics/pokemon/flapple/front.png deleted file mode 100644 index 97385858fa..0000000000 Binary files a/graphics/pokemon/flapple/front.png and /dev/null differ diff --git a/graphics/pokemon/golisopod/anim_front.png b/graphics/pokemon/golisopod/anim_front.png new file mode 100644 index 0000000000..67701cffc6 Binary files /dev/null and b/graphics/pokemon/golisopod/anim_front.png differ diff --git a/graphics/pokemon/golisopod/front.png b/graphics/pokemon/golisopod/front.png deleted file mode 100644 index 8ac7af79e6..0000000000 Binary files a/graphics/pokemon/golisopod/front.png and /dev/null differ diff --git a/graphics/pokemon/grubbin/anim_front.png b/graphics/pokemon/grubbin/anim_front.png new file mode 100644 index 0000000000..f144cb10f0 Binary files /dev/null and b/graphics/pokemon/grubbin/anim_front.png differ diff --git a/graphics/pokemon/grubbin/front.png b/graphics/pokemon/grubbin/front.png deleted file mode 100644 index c478305927..0000000000 Binary files a/graphics/pokemon/grubbin/front.png and /dev/null differ diff --git a/graphics/pokemon/hakamo_o/anim_front.png b/graphics/pokemon/hakamo_o/anim_front.png new file mode 100644 index 0000000000..2b5112a2d5 Binary files /dev/null and b/graphics/pokemon/hakamo_o/anim_front.png differ diff --git a/graphics/pokemon/hakamo_o/front.png b/graphics/pokemon/hakamo_o/front.png deleted file mode 100644 index f2b4f2dd9e..0000000000 Binary files a/graphics/pokemon/hakamo_o/front.png and /dev/null differ diff --git a/graphics/pokemon/jangmo_o/anim_front.png b/graphics/pokemon/jangmo_o/anim_front.png new file mode 100644 index 0000000000..d462c0adb8 Binary files /dev/null and b/graphics/pokemon/jangmo_o/anim_front.png differ diff --git a/graphics/pokemon/jangmo_o/front.png b/graphics/pokemon/jangmo_o/front.png deleted file mode 100644 index d5fe638b9c..0000000000 Binary files a/graphics/pokemon/jangmo_o/front.png and /dev/null differ diff --git a/graphics/pokemon/kommo_o/anim_front.png b/graphics/pokemon/kommo_o/anim_front.png new file mode 100644 index 0000000000..5f1a7382ba Binary files /dev/null and b/graphics/pokemon/kommo_o/anim_front.png differ diff --git a/graphics/pokemon/kommo_o/front.png b/graphics/pokemon/kommo_o/front.png deleted file mode 100644 index d327ade644..0000000000 Binary files a/graphics/pokemon/kommo_o/front.png and /dev/null differ diff --git a/graphics/pokemon/pincurchin/anim_front.png b/graphics/pokemon/pincurchin/anim_front.png new file mode 100644 index 0000000000..b8ed4964e4 Binary files /dev/null and b/graphics/pokemon/pincurchin/anim_front.png differ diff --git a/graphics/pokemon/pincurchin/back.png b/graphics/pokemon/pincurchin/back.png index 700b15591b..b444c850b1 100644 Binary files a/graphics/pokemon/pincurchin/back.png and b/graphics/pokemon/pincurchin/back.png differ diff --git a/graphics/pokemon/pincurchin/front.png b/graphics/pokemon/pincurchin/front.png deleted file mode 100644 index 06cd6b3798..0000000000 Binary files a/graphics/pokemon/pincurchin/front.png and /dev/null differ diff --git a/graphics/pokemon/pincurchin/normal.pal b/graphics/pokemon/pincurchin/normal.pal index 5b791f23ee..8598a84661 100644 --- a/graphics/pokemon/pincurchin/normal.pal +++ b/graphics/pokemon/pincurchin/normal.pal @@ -13,7 +13,7 @@ JASC-PAL 248 184 40 248 240 40 208 136 16 -0 0 0 -0 0 0 +173 255 239 +20 255 210 0 0 0 0 0 0 diff --git a/graphics/pokemon/pyukumuku/anim_front.png b/graphics/pokemon/pyukumuku/anim_front.png new file mode 100644 index 0000000000..93363fa831 Binary files /dev/null and b/graphics/pokemon/pyukumuku/anim_front.png differ diff --git a/graphics/pokemon/pyukumuku/front.png b/graphics/pokemon/pyukumuku/front.png deleted file mode 100644 index f1a1327445..0000000000 Binary files a/graphics/pokemon/pyukumuku/front.png and /dev/null differ diff --git a/graphics/pokemon/rolycoly/anim_front.png b/graphics/pokemon/rolycoly/anim_front.png new file mode 100644 index 0000000000..0bd7ab0822 Binary files /dev/null and b/graphics/pokemon/rolycoly/anim_front.png differ diff --git a/graphics/pokemon/rolycoly/front.png b/graphics/pokemon/rolycoly/front.png deleted file mode 100644 index 332f43f231..0000000000 Binary files a/graphics/pokemon/rolycoly/front.png and /dev/null differ diff --git a/graphics/pokemon/rookidee/anim_front.png b/graphics/pokemon/rookidee/anim_front.png new file mode 100644 index 0000000000..c9447052d1 Binary files /dev/null and b/graphics/pokemon/rookidee/anim_front.png differ diff --git a/graphics/pokemon/rookidee/front.png b/graphics/pokemon/rookidee/front.png deleted file mode 100644 index f2879fe7d5..0000000000 Binary files a/graphics/pokemon/rookidee/front.png and /dev/null differ diff --git a/graphics/pokemon/salandit/anim_front.png b/graphics/pokemon/salandit/anim_front.png new file mode 100644 index 0000000000..6bcd63d4d3 Binary files /dev/null and b/graphics/pokemon/salandit/anim_front.png differ diff --git a/graphics/pokemon/salandit/back.png b/graphics/pokemon/salandit/back.png index 0766d5107f..461f7015a3 100644 Binary files a/graphics/pokemon/salandit/back.png and b/graphics/pokemon/salandit/back.png differ diff --git a/graphics/pokemon/salandit/front.png b/graphics/pokemon/salandit/front.png deleted file mode 100644 index fde28b78c6..0000000000 Binary files a/graphics/pokemon/salandit/front.png and /dev/null differ diff --git a/graphics/pokemon/salazzle/anim_front.png b/graphics/pokemon/salazzle/anim_front.png new file mode 100644 index 0000000000..d169166ecd Binary files /dev/null and b/graphics/pokemon/salazzle/anim_front.png differ diff --git a/graphics/pokemon/salazzle/front.png b/graphics/pokemon/salazzle/front.png deleted file mode 100644 index b127a7c5a3..0000000000 Binary files a/graphics/pokemon/salazzle/front.png and /dev/null differ diff --git a/graphics/pokemon/sizzlipede/anim_front.png b/graphics/pokemon/sizzlipede/anim_front.png new file mode 100644 index 0000000000..21b275df39 Binary files /dev/null and b/graphics/pokemon/sizzlipede/anim_front.png differ diff --git a/graphics/pokemon/sizzlipede/front.png b/graphics/pokemon/sizzlipede/front.png deleted file mode 100644 index 9045672714..0000000000 Binary files a/graphics/pokemon/sizzlipede/front.png and /dev/null differ diff --git a/graphics/pokemon/stufful/anim_front.png b/graphics/pokemon/stufful/anim_front.png new file mode 100644 index 0000000000..2863d38493 Binary files /dev/null and b/graphics/pokemon/stufful/anim_front.png differ diff --git a/graphics/pokemon/stufful/front.png b/graphics/pokemon/stufful/front.png deleted file mode 100644 index 242940359a..0000000000 Binary files a/graphics/pokemon/stufful/front.png and /dev/null differ diff --git a/graphics/pokemon/turtonator/anim_front.png b/graphics/pokemon/turtonator/anim_front.png new file mode 100644 index 0000000000..6f2a3c456d Binary files /dev/null and b/graphics/pokemon/turtonator/anim_front.png differ diff --git a/graphics/pokemon/turtonator/front.png b/graphics/pokemon/turtonator/front.png deleted file mode 100644 index e2d21a1b4e..0000000000 Binary files a/graphics/pokemon/turtonator/front.png and /dev/null differ diff --git a/graphics/pokemon/vikavolt/anim_front.png b/graphics/pokemon/vikavolt/anim_front.png new file mode 100644 index 0000000000..e3bf6f0661 Binary files /dev/null and b/graphics/pokemon/vikavolt/anim_front.png differ diff --git a/graphics/pokemon/vikavolt/front.png b/graphics/pokemon/vikavolt/front.png deleted file mode 100644 index 5fb4a87c3f..0000000000 Binary files a/graphics/pokemon/vikavolt/front.png and /dev/null differ diff --git a/graphics/pokemon/wimpod/anim_front.png b/graphics/pokemon/wimpod/anim_front.png new file mode 100644 index 0000000000..b1c46e5ae6 Binary files /dev/null and b/graphics/pokemon/wimpod/anim_front.png differ diff --git a/graphics/pokemon/wimpod/front.png b/graphics/pokemon/wimpod/front.png deleted file mode 100644 index 2fde9f4dc8..0000000000 Binary files a/graphics/pokemon/wimpod/front.png and /dev/null differ diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index c6d0d3bb5a..74a0c579e5 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -785,9 +785,9 @@ const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/front. const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/front.4bpp.lz"); const u32 gMonFrontPic_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/front.4bpp.lz"); const u32 gMonFrontPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/front.4bpp.lz"); -const u32 gMonFrontPic_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/front.4bpp.lz"); -const u32 gMonFrontPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/front.4bpp.lz"); -const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/front.4bpp.lz"); +const u32 gMonFrontPic_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/anim_front.4bpp.lz"); const u32 gMonFrontPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/front.4bpp.lz"); const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/front.4bpp.lz"); const u32 gMonFrontPic_Oricorio[] = INCBIN_U32("graphics/pokemon/oricorio/front.4bpp.lz"); @@ -800,40 +800,40 @@ const u32 gMonFrontPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/front. const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/front.4bpp.lz"); const u32 gMonFrontPic_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/front.4bpp.lz"); const u32 gMonFrontPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/front.4bpp.lz"); -const u32 gMonFrontPic_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/front.4bpp.lz"); -const u32 gMonFrontPic_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/front.4bpp.lz"); +const u32 gMonFrontPic_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/anim_front.4bpp.lz"); const u32 gMonFrontPic_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/front.4bpp.lz"); const u32 gMonFrontPic_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/front.4bpp.lz"); const u32 gMonFrontPic_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/front.4bpp.lz"); const u32 gMonFrontPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/front.4bpp.lz"); -const u32 gMonFrontPic_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/front.4bpp.lz"); -const u32 gMonFrontPic_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/front.4bpp.lz"); -const u32 gMonFrontPic_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/front.4bpp.lz"); -const u32 gMonFrontPic_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/front.4bpp.lz"); +const u32 gMonFrontPic_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/front.4bpp.lz"); const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/front.4bpp.lz"); const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/front.4bpp.lz"); const u32 gMonFrontPic_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/front.4bpp.lz"); const u32 gMonFrontPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/front.4bpp.lz"); const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/front.4bpp.lz"); -const u32 gMonFrontPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/front.4bpp.lz"); -const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/front.4bpp.lz"); +const u32 gMonFrontPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/front.4bpp.lz"); const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/front.4bpp.lz"); -const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/front.4bpp.lz"); +const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/anim_front.4bpp.lz"); const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz"); const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz"); const u32 gMonFrontPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz"); const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/front.4bpp.lz"); -const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/front.4bpp.lz"); +const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/anim_front.4bpp.lz"); const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/front.4bpp.lz"); const u32 gMonFrontPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4bpp.lz"); const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz"); const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz"); const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz"); -const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); -const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); -const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); +const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/anim_front.4bpp.lz"); +const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/anim_front.4bpp.lz"); +const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/anim_front.4bpp.lz"); const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/anim_front.4bpp.lz"); const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/anim_front.4bpp.lz"); const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/anim_front.4bpp.lz"); @@ -872,9 +872,9 @@ const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/front. const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz"); const u32 gMonFrontPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/front.4bpp.lz"); const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/front.4bpp.lz"); -const u32 gMonFrontPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/front.4bpp.lz"); -const u32 gMonFrontPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/front.4bpp.lz"); -const u32 gMonFrontPic_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/front.4bpp.lz"); +const u32 gMonFrontPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/anim_front.4bpp.lz"); const u32 gMonFrontPic_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/front.4bpp.lz"); const u32 gMonFrontPic_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/front.4bpp.lz"); const u32 gMonFrontPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/front.4bpp.lz"); @@ -884,16 +884,16 @@ const u32 gMonFrontPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/fr const u32 gMonFrontPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/front.4bpp.lz"); const u32 gMonFrontPic_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/front.4bpp.lz"); const u32 gMonFrontPic_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/front.4bpp.lz"); -const u32 gMonFrontPic_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/front.4bpp.lz"); -const u32 gMonFrontPic_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/front.4bpp.lz"); +const u32 gMonFrontPic_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/anim_front.4bpp.lz"); const u32 gMonFrontPic_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/front.4bpp.lz"); const u32 gMonFrontPic_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/front.4bpp.lz"); -const u32 gMonFrontPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/front.4bpp.lz"); -const u32 gMonFrontPic_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/front.4bpp.lz"); -const u32 gMonFrontPic_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/front.4bpp.lz"); -const u32 gMonFrontPic_Applin[] = INCBIN_U32("graphics/pokemon/applin/front.4bpp.lz"); -const u32 gMonFrontPic_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/front.4bpp.lz"); -const u32 gMonFrontPic_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/front.4bpp.lz"); +const u32 gMonFrontPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Applin[] = INCBIN_U32("graphics/pokemon/applin/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/anim_front.4bpp.lz"); const u32 gMonFrontPic_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/front.4bpp.lz"); const u32 gMonFrontPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/front.4bpp.lz"); const u32 gMonFrontPic_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/front.4bpp.lz"); @@ -901,8 +901,8 @@ const u32 gMonFrontPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/front. const u32 gMonFrontPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/front.4bpp.lz"); const u32 gMonFrontPic_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/front.4bpp.lz"); const u32 gMonFrontPic_Toxtricity[] = INCBIN_U32("graphics/pokemon/toxtricity/front.4bpp.lz"); -const u32 gMonFrontPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/front.4bpp.lz"); -const u32 gMonFrontPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/front.4bpp.lz"); +const u32 gMonFrontPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/anim_front.4bpp.lz"); const u32 gMonFrontPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/front.4bpp.lz"); const u32 gMonFrontPic_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/front.4bpp.lz"); const u32 gMonFrontPic_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/front.4bpp.lz"); @@ -922,7 +922,7 @@ const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/fron const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/front.4bpp.lz"); const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/front.4bpp.lz"); const u32 gMonFrontPic_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/front.4bpp.lz"); -const u32 gMonFrontPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/front.4bpp.lz"); +const u32 gMonFrontPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/anim_front.4bpp.lz"); const u32 gMonFrontPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/front.4bpp.lz"); const u32 gMonFrontPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/front.4bpp.lz"); const u32 gMonFrontPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/front.4bpp.lz"); @@ -1030,7 +1030,7 @@ const u32 gMonFrontPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/ const u32 gMonFrontPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/front.4bpp.lz"); const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/front.4bpp.lz"); const u32 gMonFrontPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/front.4bpp.lz"); -const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/front.4bpp.lz"); +const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/anim_front.4bpp.lz"); const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/front.4bpp.lz"); const u32 gMonFrontPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/front.4bpp.lz"); const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 06bf461c9a..268975d582 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1013,7 +1013,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_GOLEM_ALOLAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 13 }, [SPECIES_GRIMER_ALOLAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_MUK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 0 }, [SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, // Galarian Forms [SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 326af6d1ee..f8f0bb119a 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -1,4 +1,13 @@ -static const union AnimCmd sAnim_None_1[] = +#define PLACEHOLDER_TWO_FRAME_ANIMATION(name) \ +static const union AnimCmd sAnim_##name##_1[] = \ +{ \ + ANIMCMD_FRAME(0, 30), \ + ANIMCMD_FRAME(1, 30), \ + ANIMCMD_FRAME(0, 1), \ + ANIMCMD_END, \ +} + +static const union AnimCmd sAnim_None_1[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), @@ -4818,7 +4827,6 @@ static const union AnimCmd sAnim_Prinplup_1[] = ANIMCMD_END, }; - static const union AnimCmd sAnim_Empoleon_1[] = { ANIMCMD_FRAME(0, 1), @@ -4923,7 +4931,6 @@ static const union AnimCmd sAnim_Shinx_1[] = ANIMCMD_END, }; - static const union AnimCmd sAnim_Luxio_1[] = { ANIMCMD_FRAME(1, 40), @@ -4990,7 +4997,6 @@ static const union AnimCmd sAnim_Shieldon_1[] = ANIMCMD_END, }; - static const union AnimCmd sAnim_Bastiodon_1[] = { ANIMCMD_FRAME(0, 10), @@ -5060,7 +5066,6 @@ static const union AnimCmd sAnim_Vespiquen_1[] = ANIMCMD_END, }; - static const union AnimCmd sAnim_Pachirisu_1[] = { ANIMCMD_FRAME(0, 5), @@ -5108,7 +5113,6 @@ static const union AnimCmd sAnim_Cherubi_1[] = ANIMCMD_END, }; - static const union AnimCmd sAnim_CherrimOvercast_1[] = { ANIMCMD_FRAME(0, 15), @@ -5196,7 +5200,6 @@ static const union AnimCmd sAnim_Buneary_1[] = ANIMCMD_END, }; - static const union AnimCmd sAnim_Lopunny_1[] = { ANIMCMD_FRAME(0, 15), @@ -5784,7 +5787,6 @@ static const union AnimCmd sAnim_RotomHeat_1[] = ANIMCMD_END, }; - static const union AnimCmd sAnim_RotomWash_1[] = { ANIMCMD_FRAME(0, 30), @@ -8477,18 +8479,28 @@ static const union AnimCmd sAnim_Gumshoos_1[] = static const union AnimCmd sAnim_Grubbin_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 15), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Charjabug_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 15), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Vikavolt_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -8567,12 +8579,19 @@ static const union AnimCmd sAnim_Mudsdale_1[] = static const union AnimCmd sAnim_Dewpider_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 9), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Araquanid_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 45), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -8603,25 +8622,33 @@ static const union AnimCmd sAnim_Shiinotic_1[] = static const union AnimCmd sAnim_Salandit_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; static const union AnimCmd sAnim_Salazzle_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Stufful_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; static const union AnimCmd sAnim_Bewear_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 60), + ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; @@ -8663,12 +8690,16 @@ static const union AnimCmd sAnim_Passimian_1[] = static const union AnimCmd sAnim_Wimpod_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 25), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Golisopod_1[] = { + ANIMCMD_FRAME(0, 25), + ANIMCMD_FRAME(1, 15), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -8687,6 +8718,8 @@ static const union AnimCmd sAnim_Palossand_1[] = static const union AnimCmd sAnim_Pyukumuku_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 25), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -8717,7 +8750,9 @@ static const union AnimCmd sAnim_Komala_1[] = static const union AnimCmd sAnim_Turtonator_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; @@ -8753,18 +8788,26 @@ static const union AnimCmd sAnim_Dhelmise_1[] = static const union AnimCmd sAnim_JANGMO_O_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 25), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_HAKAMO_O_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; static const union AnimCmd sAnim_KOMMO_O_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -9004,18 +9047,32 @@ static const union AnimCmd sAnim_Greedent_1[] = static const union AnimCmd sAnim_Rookidee_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Corvisquire_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Corviknight_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 50), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -9076,12 +9133,16 @@ static const union AnimCmd sAnim_Dubwool_1[] = static const union AnimCmd sAnim_Chewtle_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Drednaw_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -9098,41 +9159,12 @@ static const union AnimCmd sAnim_Boltund_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Rolycoly_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Carkol_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Coalossal_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Applin_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Flapple_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Appletun_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; +PLACEHOLDER_TWO_FRAME_ANIMATION(Rolycoly); +PLACEHOLDER_TWO_FRAME_ANIMATION(Carkol); +PLACEHOLDER_TWO_FRAME_ANIMATION(Coalossal); +PLACEHOLDER_TWO_FRAME_ANIMATION(Applin); +PLACEHOLDER_TWO_FRAME_ANIMATION(Flapple); +PLACEHOLDER_TWO_FRAME_ANIMATION(Appletun); static const union AnimCmd sAnim_Silicobra_1[] = { @@ -9178,12 +9210,16 @@ static const union AnimCmd sAnim_Toxtricity_1[] = static const union AnimCmd sAnim_Sizzlipede_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 25), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Centiskorch_1[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 35), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -9302,11 +9338,7 @@ static const union AnimCmd sAnim_Falinks_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Pincurchin_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; +PLACEHOLDER_TWO_FRAME_ANIMATION(Pincurchin); static const union AnimCmd sAnim_Snom_1[] = { @@ -9913,11 +9945,7 @@ static const union AnimCmd sAnim_MukAlolan_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_ExeggutorAlolan_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; +PLACEHOLDER_TWO_FRAME_ANIMATION(ExeggutorAlolan); static const union AnimCmd sAnim_MarowakAlolan_1[] = { diff --git a/src/pokemon.c b/src/pokemon.c index 58252f5fe5..748fcdfb08 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2710,7 +2710,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_GUMSHOOS - 1] = ANIM_H_SHAKE, [SPECIES_GRUBBIN - 1] = ANIM_H_SLIDE, [SPECIES_CHARJABUG - 1] = ANIM_SHAKE_FLASH_YELLOW_SLOW, - [SPECIES_VIKAVOLT - 1] = ANIM_H_VIBRATE, + [SPECIES_VIKAVOLT - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES, [SPECIES_CRABRAWLER - 1] = ANIM_V_SHAKE, [SPECIES_CRABOMINABLE - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, [SPECIES_ORICORIO - 1] = ANIM_CONCAVE_ARC_SMALL, @@ -2729,9 +2729,9 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_LURANTIS - 1] = ANIM_GROW_VIBRATE, [SPECIES_MORELULL - 1] = ANIM_SHAKE_FLASH_YELLOW, [SPECIES_SHIINOTIC - 1] = ANIM_SHAKE_GLOW_WHITE_SLOW, - [SPECIES_SALANDIT - 1] = ANIM_SHAKE_GLOW_RED_SLOW, + [SPECIES_SALANDIT - 1] = ANIM_GLOW_RED, [SPECIES_SALAZZLE - 1] = ANIM_GROW_VIBRATE, - [SPECIES_STUFFUL - 1] = ANIM_H_STRETCH, + [SPECIES_STUFFUL - 1] = ANIM_V_SHAKE, [SPECIES_BEWEAR - 1] = ANIM_H_STRETCH, [SPECIES_BOUNSWEET - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_STEENEE - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2756,7 +2756,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_DHELMISE - 1] = ANIM_SWING_CONVEX, [SPECIES_JANGMO_O - 1] = ANIM_H_STRETCH, [SPECIES_HAKAMO_O - 1] = ANIM_H_STRETCH, - [SPECIES_KOMMO_O - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_KOMMO_O - 1] = ANIM_GROW_STUTTER_TWICE, [SPECIES_TAPU_KOKO - 1] = ANIM_TRIANGLE_DOWN_TWICE, [SPECIES_TAPU_LELE - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, [SPECIES_TAPU_BULU - 1] = ANIM_V_SHAKE_TWICE, @@ -2795,9 +2795,9 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_INTELEON - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SKWOVET - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_GREEDENT - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROOKIDEE - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_CORVISQUIRE - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_CORVIKNIGHT - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROOKIDEE - 1] = ANIM_H_VIBRATE, + [SPECIES_CORVISQUIRE - 1] = ANIM_CIRCLE_INTO_BG, + [SPECIES_CORVIKNIGHT - 1] = ANIM_H_VIBRATE, [SPECIES_BLIPBUG - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DOTTLER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ORBEETLE - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2808,12 +2808,12 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_WOOLOO - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_DUBWOOL - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CHEWTLE - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_DREDNAW - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_DREDNAW - 1] = ANIM_GROW_VIBRATE, [SPECIES_YAMPER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_BOLTUND - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROLYCOLY - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROLYCOLY - 1] = ANIM_H_SLIDE_SLOW, [SPECIES_CARKOL - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_COALOSSAL - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_COALOSSAL - 1] = ANIM_GLOW_RED, [SPECIES_APPLIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_FLAPPLE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_APPLETUN - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2824,7 +2824,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_BARRASKEWDA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TOXEL - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TOXTRICITY - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_SIZZLIPEDE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SIZZLIPEDE - 1] = ANIM_H_VIBRATE, [SPECIES_CENTISKORCH - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CLOBBOPUS - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_GRAPPLOCT - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -2845,7 +2845,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_MILCERY - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ALCREMIE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_FALINKS - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_PINCURCHIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_PINCURCHIN - 1] = ANIM_SHRINK_GROW_VIBRATE, [SPECIES_SNOM - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_FROSMOTH - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_STONJOURNER - 1] = ANIM_V_SQUISH_AND_BOUNCE,