diff --git a/graphics/pokemon/cutiefly/anim_front.png b/graphics/pokemon/cutiefly/anim_front.png new file mode 100644 index 000000000000..3a3a17092f78 Binary files /dev/null and b/graphics/pokemon/cutiefly/anim_front.png differ diff --git a/graphics/pokemon/cutiefly/front.png b/graphics/pokemon/cutiefly/front.png deleted file mode 100644 index 9e5756522203..000000000000 Binary files a/graphics/pokemon/cutiefly/front.png and /dev/null differ diff --git a/graphics/pokemon/dartrix/anim_front.png b/graphics/pokemon/dartrix/anim_front.png new file mode 100644 index 000000000000..6adf23406597 Binary files /dev/null and b/graphics/pokemon/dartrix/anim_front.png differ diff --git a/graphics/pokemon/dartrix/front.png b/graphics/pokemon/dartrix/front.png deleted file mode 100644 index 004fa43bdfbb..000000000000 Binary files a/graphics/pokemon/dartrix/front.png and /dev/null differ diff --git a/graphics/pokemon/decidueye/anim_front.png b/graphics/pokemon/decidueye/anim_front.png new file mode 100644 index 000000000000..f0d7e46bb192 Binary files /dev/null and b/graphics/pokemon/decidueye/anim_front.png differ diff --git a/graphics/pokemon/decidueye/front.png b/graphics/pokemon/decidueye/front.png deleted file mode 100644 index a13a33a2ae81..000000000000 Binary files a/graphics/pokemon/decidueye/front.png and /dev/null differ diff --git a/graphics/pokemon/drampa/anim_front.png b/graphics/pokemon/drampa/anim_front.png new file mode 100644 index 000000000000..c263a1572725 Binary files /dev/null and b/graphics/pokemon/drampa/anim_front.png differ diff --git a/graphics/pokemon/drampa/back.png b/graphics/pokemon/drampa/back.png index b3460057efb2..be44b000bce0 100644 Binary files a/graphics/pokemon/drampa/back.png and b/graphics/pokemon/drampa/back.png differ diff --git a/graphics/pokemon/drampa/front.png b/graphics/pokemon/drampa/front.png deleted file mode 100644 index 6aecba694918..000000000000 Binary files a/graphics/pokemon/drampa/front.png and /dev/null differ diff --git a/graphics/pokemon/drampa/normal.pal b/graphics/pokemon/drampa/normal.pal index 70303462789c..5639299f9565 100644 --- a/graphics/pokemon/drampa/normal.pal +++ b/graphics/pokemon/drampa/normal.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 176 232 +152 208 160 16 80 96 16 16 16 88 160 160 diff --git a/graphics/pokemon/drampa/shiny.pal b/graphics/pokemon/drampa/shiny.pal index ecfd99878010..1422a88ff12f 100644 --- a/graphics/pokemon/drampa/shiny.pal +++ b/graphics/pokemon/drampa/shiny.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 176 232 +152 208 160 152 96 56 16 16 16 224 176 112 diff --git a/graphics/pokemon/hakamo_o/anim_front.png b/graphics/pokemon/hakamo_o/anim_front.png index 2b5112a2d5b4..599bbe3eeb19 100644 Binary files a/graphics/pokemon/hakamo_o/anim_front.png and b/graphics/pokemon/hakamo_o/anim_front.png differ diff --git a/graphics/pokemon/hakamo_o/back.png b/graphics/pokemon/hakamo_o/back.png index f994a70e9d9d..402eabab0ded 100644 Binary files a/graphics/pokemon/hakamo_o/back.png and b/graphics/pokemon/hakamo_o/back.png differ diff --git a/graphics/pokemon/jangmo_o/anim_front.png b/graphics/pokemon/jangmo_o/anim_front.png index d462c0adb83c..9f3abb069677 100644 Binary files a/graphics/pokemon/jangmo_o/anim_front.png and b/graphics/pokemon/jangmo_o/anim_front.png differ diff --git a/graphics/pokemon/jangmo_o/back.png b/graphics/pokemon/jangmo_o/back.png index 6416369e961f..209011dfa70d 100644 Binary files a/graphics/pokemon/jangmo_o/back.png and b/graphics/pokemon/jangmo_o/back.png differ diff --git a/graphics/pokemon/kommo_o/anim_front.png b/graphics/pokemon/kommo_o/anim_front.png index 5f1a7382ba0d..090ef56f0bcc 100644 Binary files a/graphics/pokemon/kommo_o/anim_front.png and b/graphics/pokemon/kommo_o/anim_front.png differ diff --git a/graphics/pokemon/lycanroc/anim_front.png b/graphics/pokemon/lycanroc/anim_front.png new file mode 100644 index 000000000000..fc853cf24bf7 Binary files /dev/null and b/graphics/pokemon/lycanroc/anim_front.png differ diff --git a/graphics/pokemon/lycanroc/dusk/anim_front.png b/graphics/pokemon/lycanroc/dusk/anim_front.png new file mode 100644 index 000000000000..1df7c94d4122 Binary files /dev/null and b/graphics/pokemon/lycanroc/dusk/anim_front.png differ diff --git a/graphics/pokemon/lycanroc/dusk/back.png b/graphics/pokemon/lycanroc/dusk/back.png index d17f1dc635fa..c9ed8b89bf17 100644 Binary files a/graphics/pokemon/lycanroc/dusk/back.png and b/graphics/pokemon/lycanroc/dusk/back.png differ diff --git a/graphics/pokemon/lycanroc/dusk/front.png b/graphics/pokemon/lycanroc/dusk/front.png deleted file mode 100644 index 8e8beb2311ce..000000000000 Binary files a/graphics/pokemon/lycanroc/dusk/front.png and /dev/null differ diff --git a/graphics/pokemon/lycanroc/dusk/icon.png b/graphics/pokemon/lycanroc/dusk/icon.png index 7ff67638d333..65d8394f4e67 100644 Binary files a/graphics/pokemon/lycanroc/dusk/icon.png and b/graphics/pokemon/lycanroc/dusk/icon.png differ diff --git a/graphics/pokemon/lycanroc/dusk/normal.pal b/graphics/pokemon/lycanroc/dusk/normal.pal index 151d43c5245f..4eb21dce4acf 100644 --- a/graphics/pokemon/lycanroc/dusk/normal.pal +++ b/graphics/pokemon/lycanroc/dusk/normal.pal @@ -15,5 +15,5 @@ JASC-PAL 192 176 160 248 248 248 29 204 62 -0 0 0 -0 0 0 +112 45 15 +255 0 255 diff --git a/graphics/pokemon/lycanroc/dusk/shiny.pal b/graphics/pokemon/lycanroc/dusk/shiny.pal index 758e607a8442..9fc8da295102 100644 --- a/graphics/pokemon/lycanroc/dusk/shiny.pal +++ b/graphics/pokemon/lycanroc/dusk/shiny.pal @@ -15,5 +15,5 @@ JASC-PAL 192 176 160 248 248 248 168 208 32 -0 0 0 +26 38 56 0 0 0 diff --git a/graphics/pokemon/lycanroc/front.png b/graphics/pokemon/lycanroc/front.png deleted file mode 100644 index a5058205ec34..000000000000 Binary files a/graphics/pokemon/lycanroc/front.png and /dev/null differ diff --git a/graphics/pokemon/lycanroc/midnight/anim_front.png b/graphics/pokemon/lycanroc/midnight/anim_front.png new file mode 100644 index 000000000000..fdd549d9493c Binary files /dev/null and b/graphics/pokemon/lycanroc/midnight/anim_front.png differ diff --git a/graphics/pokemon/lycanroc/midnight/front.png b/graphics/pokemon/lycanroc/midnight/front.png deleted file mode 100644 index 73a49530dd43..000000000000 Binary files a/graphics/pokemon/lycanroc/midnight/front.png and /dev/null differ diff --git a/graphics/pokemon/oranguru/anim_front.png b/graphics/pokemon/oranguru/anim_front.png new file mode 100644 index 000000000000..c3f9a5948474 Binary files /dev/null and b/graphics/pokemon/oranguru/anim_front.png differ diff --git a/graphics/pokemon/oranguru/front.png b/graphics/pokemon/oranguru/front.png deleted file mode 100644 index b0ba3510c1d0..000000000000 Binary files a/graphics/pokemon/oranguru/front.png and /dev/null differ diff --git a/graphics/pokemon/passimian/anim_front.png b/graphics/pokemon/passimian/anim_front.png new file mode 100644 index 000000000000..c69fd6a2e4f6 Binary files /dev/null and b/graphics/pokemon/passimian/anim_front.png differ diff --git a/graphics/pokemon/passimian/back.png b/graphics/pokemon/passimian/back.png index e27f88bb02c3..93b992c84dd2 100644 Binary files a/graphics/pokemon/passimian/back.png and b/graphics/pokemon/passimian/back.png differ diff --git a/graphics/pokemon/passimian/front.png b/graphics/pokemon/passimian/front.png deleted file mode 100644 index 94ebe658c2b7..000000000000 Binary files a/graphics/pokemon/passimian/front.png and /dev/null differ diff --git a/graphics/pokemon/passimian/normal.pal b/graphics/pokemon/passimian/normal.pal index 26283bf52ef9..0b663aba0756 100644 --- a/graphics/pokemon/passimian/normal.pal +++ b/graphics/pokemon/passimian/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 48 32 -96 96 64 -16 16 16 -40 40 24 -24 200 80 -72 64 48 -248 248 248 -120 160 64 -184 224 104 -192 184 160 -240 128 24 -88 80 56 -248 216 0 +54 48 41 +89 83 76 +8 8 8 +238 238 238 248 248 248 +54 48 41 +82 76 70 +107 100 93 248 248 248 +186 186 186 +242 179 39 +197 222 95 +144 163 60 +255 255 0 +24 200 80 diff --git a/graphics/pokemon/passimian/shiny.pal b/graphics/pokemon/passimian/shiny.pal index 9b8f0f4a8fad..833f0df2fce3 100644 --- a/graphics/pokemon/passimian/shiny.pal +++ b/graphics/pokemon/passimian/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 48 32 -112 104 64 -16 16 16 -16 16 120 +14 47 132 +23 68 181 +8 8 8 +115 115 64 +22 70 181 +66 58 40 +91 81 61 +112 112 66 +248 248 248 +186 186 186 +248 248 248 +240 173 29 +156 110 12 +255 255 0 24 200 80 -80 64 48 -16 64 224 -152 64 24 -208 112 32 -192 184 160 -240 240 232 -8 48 216 -248 216 0 -248 240 216 -104 96 64 diff --git a/graphics/pokemon/pikipek/anim_front.png b/graphics/pokemon/pikipek/anim_front.png new file mode 100644 index 000000000000..f7b765876cbb Binary files /dev/null and b/graphics/pokemon/pikipek/anim_front.png differ diff --git a/graphics/pokemon/pikipek/back.png b/graphics/pokemon/pikipek/back.png index 030eea3c14b8..2175a1f1830f 100644 Binary files a/graphics/pokemon/pikipek/back.png and b/graphics/pokemon/pikipek/back.png differ diff --git a/graphics/pokemon/pikipek/front.png b/graphics/pokemon/pikipek/front.png deleted file mode 100644 index a16e45512f03..000000000000 Binary files a/graphics/pokemon/pikipek/front.png and /dev/null differ diff --git a/graphics/pokemon/ribombee/anim_front.png b/graphics/pokemon/ribombee/anim_front.png new file mode 100644 index 000000000000..fb1c5ad41ac4 Binary files /dev/null and b/graphics/pokemon/ribombee/anim_front.png differ diff --git a/graphics/pokemon/ribombee/front.png b/graphics/pokemon/ribombee/front.png deleted file mode 100644 index 77a4dd1497f3..000000000000 Binary files a/graphics/pokemon/ribombee/front.png and /dev/null differ diff --git a/graphics/pokemon/rockruff/anim_front.png b/graphics/pokemon/rockruff/anim_front.png new file mode 100644 index 000000000000..d806387c61c6 Binary files /dev/null and b/graphics/pokemon/rockruff/anim_front.png differ diff --git a/graphics/pokemon/rockruff/front.png b/graphics/pokemon/rockruff/front.png deleted file mode 100644 index 1199fbb592f9..000000000000 Binary files a/graphics/pokemon/rockruff/front.png and /dev/null differ diff --git a/graphics/pokemon/rowlet/anim_front.png b/graphics/pokemon/rowlet/anim_front.png new file mode 100644 index 000000000000..eea15ffec133 Binary files /dev/null and b/graphics/pokemon/rowlet/anim_front.png differ diff --git a/graphics/pokemon/rowlet/front.png b/graphics/pokemon/rowlet/front.png deleted file mode 100644 index 55953244eca0..000000000000 Binary files a/graphics/pokemon/rowlet/front.png and /dev/null differ diff --git a/graphics/pokemon/togedemaru/anim_front.png b/graphics/pokemon/togedemaru/anim_front.png new file mode 100644 index 000000000000..4e6534e2f816 Binary files /dev/null and b/graphics/pokemon/togedemaru/anim_front.png differ diff --git a/graphics/pokemon/togedemaru/front.png b/graphics/pokemon/togedemaru/front.png deleted file mode 100644 index aa0202eef3cf..000000000000 Binary files a/graphics/pokemon/togedemaru/front.png and /dev/null differ diff --git a/graphics/pokemon/toucannon/anim_front.png b/graphics/pokemon/toucannon/anim_front.png new file mode 100644 index 000000000000..fd42f4cc3f48 Binary files /dev/null and b/graphics/pokemon/toucannon/anim_front.png differ diff --git a/graphics/pokemon/toucannon/back.png b/graphics/pokemon/toucannon/back.png index 109a356dd7d9..fb6e6195aee4 100644 Binary files a/graphics/pokemon/toucannon/back.png and b/graphics/pokemon/toucannon/back.png differ diff --git a/graphics/pokemon/toucannon/front.png b/graphics/pokemon/toucannon/front.png deleted file mode 100644 index e9131805ac67..000000000000 Binary files a/graphics/pokemon/toucannon/front.png and /dev/null differ diff --git a/graphics/pokemon/toucannon/normal.pal b/graphics/pokemon/toucannon/normal.pal index eeb9ee6b6442..d2ba6f122680 100644 --- a/graphics/pokemon/toucannon/normal.pal +++ b/graphics/pokemon/toucannon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 40 24 +16 16 16 32 24 24 -232 232 64 -48 40 40 -88 80 72 -240 168 48 56 48 48 -168 168 168 -232 112 32 -32 112 168 -16 16 16 +120 40 24 +37 76 103 +88 80 72 224 48 16 -248 248 248 +32 112 168 +232 112 32 +168 168 168 +240 168 48 112 200 216 -184 184 192 +213 213 222 +232 232 64 +248 248 248 diff --git a/graphics/pokemon/toucannon/shiny.pal b/graphics/pokemon/toucannon/shiny.pal index 44b47e16b37c..e60414432f70 100644 --- a/graphics/pokemon/toucannon/shiny.pal +++ b/graphics/pokemon/toucannon/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 16 96 -16 24 24 -88 120 200 -48 40 40 -80 88 80 -64 64 168 -48 56 48 -200 208 104 -160 72 184 -24 160 48 16 16 16 +33 38 38 +48 56 48 +77 18 70 +24 92 102 +80 88 80 224 32 104 -248 248 248 +49 131 145 +160 72 184 +200 208 104 +64 64 168 112 200 216 -184 184 192 +213 213 222 +88 120 200 +248 248 248 diff --git a/graphics/pokemon/trumbeak/anim_front.png b/graphics/pokemon/trumbeak/anim_front.png new file mode 100644 index 000000000000..9bb3a97840b5 Binary files /dev/null and b/graphics/pokemon/trumbeak/anim_front.png differ diff --git a/graphics/pokemon/trumbeak/back.png b/graphics/pokemon/trumbeak/back.png index 552c32d26068..a9dc99ea25b3 100644 Binary files a/graphics/pokemon/trumbeak/back.png and b/graphics/pokemon/trumbeak/back.png differ diff --git a/graphics/pokemon/trumbeak/front.png b/graphics/pokemon/trumbeak/front.png deleted file mode 100644 index b51466e309ac..000000000000 Binary files a/graphics/pokemon/trumbeak/front.png and /dev/null differ diff --git a/graphics/pokemon/trumbeak/normal.pal b/graphics/pokemon/trumbeak/normal.pal index 315d2898c5ff..050033cdb5f7 100644 --- a/graphics/pokemon/trumbeak/normal.pal +++ b/graphics/pokemon/trumbeak/normal.pal @@ -6,7 +6,7 @@ JASC-PAL 96 88 80 16 16 16 64 56 56 -192 192 192 +212 212 212 120 120 128 168 168 168 248 248 248 @@ -15,5 +15,5 @@ JASC-PAL 248 136 64 232 56 48 184 24 24 -120 168 184 -0 0 0 +64 154 184 +115 28 28 diff --git a/graphics/pokemon/trumbeak/shiny.pal b/graphics/pokemon/trumbeak/shiny.pal index 0b87369f2cae..3a2e5ce71f0f 100644 --- a/graphics/pokemon/trumbeak/shiny.pal +++ b/graphics/pokemon/trumbeak/shiny.pal @@ -6,7 +6,7 @@ JASC-PAL 80 96 80 16 16 16 56 64 48 -192 192 192 +212 212 212 136 128 40 216 208 56 248 248 248 @@ -16,4 +16,4 @@ JASC-PAL 240 56 136 200 24 104 120 168 184 -0 0 0 +125 15 68 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index cfb9700b763b..b1f4cdf77c36 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -820,18 +820,18 @@ const u32 gMonFrontPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/anim const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/anim_front.4bpp.lz"); #endif #if P_GEN_7_POKEMON == TRUE -const u32 gMonFrontPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/front.4bpp.lz"); -const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/front.4bpp.lz"); -const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/front.4bpp.lz"); +const u32 gMonFrontPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/anim_front.4bpp.lz"); const u32 gMonFrontPic_Litten[] = INCBIN_U32("graphics/pokemon/litten/front.4bpp.lz"); const u32 gMonFrontPic_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/front.4bpp.lz"); const u32 gMonFrontPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/front.4bpp.lz"); const u32 gMonFrontPic_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/front.4bpp.lz"); const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/front.4bpp.lz"); const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/front.4bpp.lz"); -const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/front.4bpp.lz"); -const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/front.4bpp.lz"); -const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/front.4bpp.lz"); +const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/anim_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/anim_front.4bpp.lz"); @@ -840,10 +840,10 @@ const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/anim_f 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_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/front.4bpp.lz"); -const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/front.4bpp.lz"); -const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/front.4bpp.lz"); -const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/front.4bpp.lz"); -const u32 gMonFrontPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/front.4bpp.lz"); +const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/anim_front.4bpp.lz"); const u32 gMonFrontPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/front.4bpp.lz"); const u32 gMonFrontPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/front.4bpp.lz"); const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/front.4bpp.lz"); @@ -863,8 +863,8 @@ const u32 gMonFrontPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/fron 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_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/anim_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"); @@ -875,10 +875,10 @@ const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front. const u32 gMonFrontPic_MiniorMeteor[] = 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/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/front.4bpp.lz"); +const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/anim_front.4bpp.lz"); const u32 gMonFrontPic_MimikyuDisguised[] = 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_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/anim_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/anim_front.4bpp.lz"); const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/anim_front.4bpp.lz"); @@ -1255,8 +1255,8 @@ const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbou const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz"); const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/front.4bpp.lz"); -const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/front.4bpp.lz"); -const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/front.4bpp.lz"); +const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/anim_front.4bpp.lz"); const u32 gMonFrontPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/front.4bpp.lz"); const u32 gMonFrontPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/front.4bpp.lz"); const u32 gMonFrontPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/front.4bpp.lz"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 8937606fa841..740b871b83e0 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -752,9 +752,9 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_VOLCANION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, #endif #if P_GEN_7_POKEMON == TRUE - [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, - [SPECIES_DARTRIX] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_DECIDUEYE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, + [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(43, 36), .y_offset = 15 }, + [SPECIES_DARTRIX] = { .size = MON_COORDS_SIZE(56, 54), .y_offset = 4 }, + [SPECIES_DECIDUEYE] = { .size = MON_COORDS_SIZE(46, 62), .y_offset = 0 }, [SPECIES_LITTEN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_TORRACAT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_INCINEROAR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, @@ -796,7 +796,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_TSAREENA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_COMFEY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 11 }, [SPECIES_ORANGURU] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 12 }, - [SPECIES_PASSIMIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_PASSIMIAN] = { .size = MON_COORDS_SIZE(51, 52), .y_offset = 7 }, [SPECIES_WIMPOD] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 10 }, [SPECIES_GOLISOPOD] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, [SPECIES_SANDYGAST] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, @@ -812,9 +812,9 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 14 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, - [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 5 }, - [SPECIES_KOMMO_O] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(42, 56), .y_offset = 5 }, + [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(49, 56), .y_offset = 5 }, + [SPECIES_KOMMO_O] = { .size = MON_COORDS_SIZE(60, 60), .y_offset = 2 }, [SPECIES_TAPU_KOKO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_TAPU_LELE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_TAPU_BULU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index cc2fae2884bc..9a8f450f8038 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8371,19 +8371,22 @@ static const union AnimCmd sAnim_Volcanion_1[] = #if P_GEN_7_POKEMON == TRUE static const union AnimCmd sAnim_Rowlet_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_Dartrix_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_Decidueye_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; @@ -8425,19 +8428,25 @@ static const union AnimCmd sAnim_Primarina_1[] = static const union AnimCmd sAnim_Pikipek_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_Trumbeak_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_Toucannon_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; @@ -8501,25 +8510,71 @@ static const union AnimCmd sAnim_Oricorio_1[] = static const union AnimCmd sAnim_Cutiefly_1[] = { + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 35), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_Ribombee_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), ANIMCMD_END, }; static const union AnimCmd sAnim_Rockruff_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_LycanrocMidday_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; @@ -8654,13 +8709,15 @@ static const union AnimCmd sAnim_Comfey_1[] = static const union AnimCmd sAnim_Oranguru_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_Passimian_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; @@ -8734,7 +8791,8 @@ static const union AnimCmd sAnim_Turtonator_1[] = static const union AnimCmd sAnim_Togedemaru_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; @@ -8752,7 +8810,8 @@ static const union AnimCmd sAnim_Bruxish_1[] = static const union AnimCmd sAnim_Drampa_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 50), ANIMCMD_END, }; @@ -8764,17 +8823,15 @@ 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_FRAME(1, 15), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_HAKAMO_O_1[] = { - ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; @@ -10676,13 +10733,15 @@ static const union AnimCmd sAnim_MimikyuBusted_1[] = static const union AnimCmd sAnim_LycanrocMidnight_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_LycanrocDusk_1[] = { - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; #endif diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index e06e8f1e7bf1..4bdbb7bc263d 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -733,18 +733,18 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_VOLCANION] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif #if P_GEN_7_POKEMON == TRUE - [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 12 }, - [SPECIES_DARTRIX] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, - [SPECIES_DECIDUEYE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, + [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(31, 37), .y_offset = 12 }, + [SPECIES_DARTRIX] = { .size = MON_COORDS_SIZE(34, 47), .y_offset = 8 }, + [SPECIES_DECIDUEYE] = { .size = MON_COORDS_SIZE(45, 64), .y_offset = 0 }, [SPECIES_LITTEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_TORRACAT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_INCINEROAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_POPPLIO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_BRIONNE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_PRIMARINA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_PIKIPEK] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_TRUMBEAK] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_TOUCANNON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_PIKIPEK] = { .size = MON_COORDS_SIZE(29, 40), .y_offset = 10 }, + [SPECIES_TRUMBEAK] = { .size = MON_COORDS_SIZE(44, 53), .y_offset = 4 }, + [SPECIES_TOUCANNON] = { .size = MON_COORDS_SIZE(59, 59), .y_offset = 2 }, [SPECIES_YUNGOOS] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_GUMSHOOS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_GRUBBIN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, @@ -753,10 +753,10 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_CRABRAWLER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ORICORIO_BAILE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 16 }, - [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(33, 35), .y_offset = 16 }, + [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(32, 47), .y_offset = 5 }, + [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(37, 39), .y_offset = 11 }, + [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(57, 53), .y_offset = 6 }, [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, [SPECIES_MAREANIE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_TOXAPEX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -777,7 +777,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_TSAREENA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_COMFEY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_ORANGURU] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_PASSIMIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_PASSIMIAN] = { .size = MON_COORDS_SIZE(57, 60), .y_offset = 2 }, [SPECIES_WIMPOD] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_GOLISOPOD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SANDYGAST] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, @@ -788,14 +788,14 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, + [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 5 }, [SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, - [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, - [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_KOMMO_O] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(36, 43), .y_offset = 5 }, + [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(53, 61), .y_offset = 1 }, + [SPECIES_KOMMO_O] = { .size = MON_COORDS_SIZE(63, 63), .y_offset = 0 }, [SPECIES_TAPU_KOKO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_TAPU_LELE] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_TAPU_BULU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, @@ -1253,8 +1253,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, // Lycanroc - [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(56, 61), .y_offset = 0 }, + [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(57, 58), .y_offset = 6 }, // Wishiwashi [SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, // Silvally diff --git a/src/pokemon.c b/src/pokemon.c index e250d7abb1de..2d764d5fc873 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2747,18 +2747,18 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_VOLCANION - 1] = ANIM_V_SHAKE_TWICE, // Gen 7 - [SPECIES_ROWLET - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_DARTRIX - 1] = ANIM_H_STRETCH, - [SPECIES_DECIDUEYE - 1] = ANIM_H_VIBRATE, + [SPECIES_ROWLET - 1] = ANIM_CIRCULAR_STRETCH_TWICE, + [SPECIES_DARTRIX - 1] = ANIM_V_STRETCH, + [SPECIES_DECIDUEYE - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, [SPECIES_LITTEN - 1] = ANIM_H_STRETCH, [SPECIES_TORRACAT - 1] = ANIM_V_STRETCH, [SPECIES_INCINEROAR - 1] = ANIM_V_SHAKE, [SPECIES_POPPLIO - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, [SPECIES_BRIONNE - 1] = ANIM_SHRINK_GROW, [SPECIES_PRIMARINA - 1] = ANIM_SHAKE_GLOW_BLUE_SLOW, - [SPECIES_PIKIPEK - 1] = ANIM_V_JUMPS_SMALL, + [SPECIES_PIKIPEK - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TRUMBEAK - 1] = ANIM_H_STRETCH, - [SPECIES_TOUCANNON - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, + [SPECIES_TOUCANNON - 1] = ANIM_SHAKE_GLOW_RED_SLOW, [SPECIES_YUNGOOS - 1] = ANIM_V_STRETCH, [SPECIES_GUMSHOOS - 1] = ANIM_H_SHAKE, [SPECIES_GRUBBIN - 1] = ANIM_H_SLIDE, @@ -2767,7 +2767,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_CRABRAWLER - 1] = ANIM_V_SHAKE, [SPECIES_CRABOMINABLE - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, [SPECIES_ORICORIO_BAILE - 1] = ANIM_CONCAVE_ARC_SMALL, - [SPECIES_CUTIEFLY - 1] = ANIM_V_SLIDE_WOBBLE, + [SPECIES_CUTIEFLY - 1] = ANIM_H_SLIDE_WOBBLE, [SPECIES_RIBOMBEE - 1] = ANIM_CONVEX_DOUBLE_ARC_TWICE, [SPECIES_ROCKRUFF - 1] = ANIM_V_STRETCH, [SPECIES_LYCANROC_MIDDAY - 1] = ANIM_V_SHAKE, @@ -2790,8 +2790,8 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_STEENEE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_TSAREENA - 1] = ANIM_SHRINK_GROW, [SPECIES_COMFEY - 1] = ANIM_H_SLIDE_WOBBLE, - [SPECIES_ORANGURU - 1] = ANIM_SHRINK_GROW, - [SPECIES_PASSIMIAN - 1] = ANIM_V_SHAKE, + [SPECIES_ORANGURU - 1] = ANIM_SHRINK_GROW_SLOW, + [SPECIES_PASSIMIAN - 1] = ANIM_H_SHAKE, [SPECIES_WIMPOD - 1] = ANIM_V_SHAKE_H_SLIDE_FAST, [SPECIES_GOLISOPOD - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, [SPECIES_SANDYGAST - 1] = ANIM_CIRCULAR_STRETCH_TWICE, @@ -2802,14 +2802,14 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_MINIOR_METEOR_RED - 1] = ANIM_TUMBLING_FRONT_FLIP_TWICE, [SPECIES_KOMALA - 1] = ANIM_H_DIP, [SPECIES_TURTONATOR - 1] = ANIM_SHAKE_GLOW_RED, - [SPECIES_TOGEDEMARU - 1] = ANIM_SHAKE_FLASH_YELLOW, + [SPECIES_TOGEDEMARU - 1] = ANIM_FLASH_YELLOW, [SPECIES_MIMIKYU_DISGUISED - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, [SPECIES_BRUXISH - 1] = ANIM_RISING_WOBBLE, - [SPECIES_DRAMPA - 1] = ANIM_V_SHAKE, + [SPECIES_DRAMPA - 1] = ANIM_V_SHAKE_TWICE, [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_GROW_STUTTER_TWICE, + [SPECIES_KOMMO_O - 1] = ANIM_SHRINK_GROW_VIBRATE_FAST, [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, @@ -3061,8 +3061,8 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_ORICORIO_PAU - 1] = ANIM_V_SQUISH_AND_BOUNCE, //Todo [SPECIES_ORICORIO_SENSU - 1] = ANIM_V_SQUISH_AND_BOUNCE, //Todo [SPECIES_ROCKRUFF_OWN_TEMPO - 1] = ANIM_V_STRETCH, - [SPECIES_LYCANROC_MIDNIGHT - 1] = ANIM_V_SQUISH_AND_BOUNCE, //Todo - [SPECIES_LYCANROC_DUSK - 1] = ANIM_V_SQUISH_AND_BOUNCE, //Todo + [SPECIES_LYCANROC_MIDNIGHT - 1] = ANIM_SHRINK_GROW_VIBRATE_SLOW, + [SPECIES_LYCANROC_DUSK - 1] = ANIM_V_SHAKE, [SPECIES_WISHIWASHI_SCHOOL - 1] = ANIM_V_SQUISH_AND_BOUNCE, //Todo [SPECIES_SILVALLY_FIGHTING - 1] = ANIM_V_SHAKE, [SPECIES_SILVALLY_FLYING - 1] = ANIM_V_SHAKE, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 90988bc76497..a5e0cd8314ab 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -948,18 +948,18 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_VOLCANION] = BACK_ANIM_SHAKE_GLOW_RED, // Gen 7 todo: assign - [SPECIES_ROWLET] = BACK_ANIM_H_VIBRATE, - [SPECIES_DARTRIX] = BACK_ANIM_H_VIBRATE, - [SPECIES_DECIDUEYE] = BACK_ANIM_H_VIBRATE, + [SPECIES_ROWLET] = BACK_ANIM_CONCAVE_ARC_SMALL, + [SPECIES_DARTRIX] = BACK_ANIM_V_STRETCH, + [SPECIES_DECIDUEYE] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_LITTEN] = BACK_ANIM_H_VIBRATE, [SPECIES_TORRACAT] = BACK_ANIM_H_VIBRATE, [SPECIES_INCINEROAR] = BACK_ANIM_H_VIBRATE, [SPECIES_POPPLIO] = BACK_ANIM_H_VIBRATE, [SPECIES_BRIONNE] = BACK_ANIM_H_VIBRATE, [SPECIES_PRIMARINA] = BACK_ANIM_H_VIBRATE, - [SPECIES_PIKIPEK] = BACK_ANIM_H_VIBRATE, - [SPECIES_TRUMBEAK] = BACK_ANIM_H_VIBRATE, - [SPECIES_TOUCANNON] = BACK_ANIM_H_VIBRATE, + [SPECIES_PIKIPEK] = BACK_ANIM_SHRINK_GROW, + [SPECIES_TRUMBEAK] = BACK_ANIM_H_STRETCH, + [SPECIES_TOUCANNON] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_YUNGOOS] = BACK_ANIM_H_VIBRATE, [SPECIES_GUMSHOOS] = BACK_ANIM_H_VIBRATE, [SPECIES_GRUBBIN] = BACK_ANIM_H_VIBRATE, @@ -967,12 +967,12 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_VIKAVOLT] = BACK_ANIM_H_VIBRATE, [SPECIES_CRABRAWLER] = BACK_ANIM_H_VIBRATE, [SPECIES_CRABOMINABLE] = BACK_ANIM_H_VIBRATE, - [SPECIES_ORICORIO] = BACK_ANIM_H_VIBRATE, - [SPECIES_CUTIEFLY] = BACK_ANIM_H_VIBRATE, - [SPECIES_RIBOMBEE] = BACK_ANIM_H_VIBRATE, - [SPECIES_ROCKRUFF] = BACK_ANIM_H_VIBRATE, - [SPECIES_LYCANROC] = BACK_ANIM_H_VIBRATE, - [SPECIES_WISHIWASHI] = BACK_ANIM_H_VIBRATE, + [SPECIES_ORICORIO_BAILE] = BACK_ANIM_H_VIBRATE, + [SPECIES_CUTIEFLY] = BACK_ANIM_CONCAVE_ARC_LARGE, + [SPECIES_RIBOMBEE] = BACK_ANIM_CONVEX_DOUBLE_ARC, + [SPECIES_ROCKRUFF] = BACK_ANIM_V_STRETCH, + [SPECIES_LYCANROC_MIDDAY] = BACK_ANIM_V_SHAKE, + [SPECIES_WISHIWASHI_SOLO] = BACK_ANIM_H_VIBRATE, [SPECIES_MAREANIE] = BACK_ANIM_H_VIBRATE, [SPECIES_TOXAPEX] = BACK_ANIM_H_VIBRATE, [SPECIES_MUDBRAY] = BACK_ANIM_H_VIBRATE, @@ -991,26 +991,26 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_STEENEE] = BACK_ANIM_H_VIBRATE, [SPECIES_TSAREENA] = BACK_ANIM_H_VIBRATE, [SPECIES_COMFEY] = BACK_ANIM_H_VIBRATE, - [SPECIES_ORANGURU] = BACK_ANIM_H_VIBRATE, - [SPECIES_PASSIMIAN] = BACK_ANIM_H_VIBRATE, + [SPECIES_ORANGURU] = BACK_ANIM_H_SLIDE, + [SPECIES_PASSIMIAN] = BACK_ANIM_H_SHAKE, [SPECIES_WIMPOD] = BACK_ANIM_H_VIBRATE, [SPECIES_GOLISOPOD] = BACK_ANIM_H_VIBRATE, [SPECIES_SANDYGAST] = BACK_ANIM_H_VIBRATE, [SPECIES_PALOSSAND] = BACK_ANIM_H_VIBRATE, [SPECIES_PYUKUMUKU] = BACK_ANIM_H_VIBRATE, [SPECIES_TYPE_NULL] = BACK_ANIM_H_VIBRATE, - [SPECIES_SILVALLY] = BACK_ANIM_H_VIBRATE, - [SPECIES_MINIOR] = BACK_ANIM_H_VIBRATE, + [SPECIES_SILVALLY_NORMAL] = BACK_ANIM_H_VIBRATE, + [SPECIES_MINIOR_METEOR_RED] = BACK_ANIM_H_VIBRATE, [SPECIES_KOMALA] = BACK_ANIM_H_VIBRATE, [SPECIES_TURTONATOR] = BACK_ANIM_H_VIBRATE, - [SPECIES_TOGEDEMARU] = BACK_ANIM_H_VIBRATE, - [SPECIES_MIMIKYU] = BACK_ANIM_H_VIBRATE, + [SPECIES_TOGEDEMARU] = BACK_ANIM_GROW_STUTTER, + [SPECIES_MIMIKYU_DISGUISED] = BACK_ANIM_H_VIBRATE, [SPECIES_BRUXISH] = BACK_ANIM_H_VIBRATE, - [SPECIES_DRAMPA] = BACK_ANIM_H_VIBRATE, + [SPECIES_DRAMPA] = BACK_ANIM_H_SLIDE, [SPECIES_DHELMISE] = BACK_ANIM_H_VIBRATE, - [SPECIES_JANGMO_O] = BACK_ANIM_H_VIBRATE, - [SPECIES_HAKAMO_O] = BACK_ANIM_H_VIBRATE, - [SPECIES_KOMMO_O] = BACK_ANIM_H_VIBRATE, + [SPECIES_JANGMO_O] = BACK_ANIM_GROW_STUTTER, + [SPECIES_HAKAMO_O] = BACK_ANIM_H_STRETCH, + [SPECIES_KOMMO_O] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_TAPU_KOKO] = BACK_ANIM_H_VIBRATE, [SPECIES_TAPU_LELE] = BACK_ANIM_H_VIBRATE, [SPECIES_TAPU_BULU] = BACK_ANIM_H_VIBRATE, @@ -1077,13 +1077,13 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_ARROKUDA] = BACK_ANIM_H_VIBRATE, [SPECIES_BARRASKEWDA] = BACK_ANIM_H_VIBRATE, [SPECIES_TOXEL] = BACK_ANIM_H_VIBRATE, - [SPECIES_TOXTRICITY] = BACK_ANIM_H_VIBRATE, + [SPECIES_TOXTRICITY_AMPED] = BACK_ANIM_H_VIBRATE, [SPECIES_SIZZLIPEDE] = BACK_ANIM_H_VIBRATE, [SPECIES_CENTISKORCH] = BACK_ANIM_H_VIBRATE, [SPECIES_CLOBBOPUS] = BACK_ANIM_H_VIBRATE, [SPECIES_GRAPPLOCT] = BACK_ANIM_H_VIBRATE, - [SPECIES_SINISTEA] = BACK_ANIM_H_VIBRATE, - [SPECIES_POLTEAGEIST] = BACK_ANIM_H_VIBRATE, + [SPECIES_SINISTEA_PHONY] = BACK_ANIM_H_VIBRATE, + [SPECIES_POLTEAGEIST_PHONY] = BACK_ANIM_H_VIBRATE, [SPECIES_HATENNA] = BACK_ANIM_H_VIBRATE, [SPECIES_HATTREM] = BACK_ANIM_H_VIBRATE, [SPECIES_HATTERENE] = BACK_ANIM_H_VIBRATE, @@ -1097,15 +1097,15 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_MR_RIME] = BACK_ANIM_H_VIBRATE, [SPECIES_RUNERIGUS] = BACK_ANIM_H_VIBRATE, [SPECIES_MILCERY] = BACK_ANIM_H_VIBRATE, - [SPECIES_ALCREMIE] = BACK_ANIM_H_VIBRATE, + [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = BACK_ANIM_H_VIBRATE, [SPECIES_FALINKS] = BACK_ANIM_H_VIBRATE, [SPECIES_PINCURCHIN] = BACK_ANIM_H_VIBRATE, [SPECIES_SNOM] = BACK_ANIM_H_VIBRATE, [SPECIES_FROSMOTH] = BACK_ANIM_H_VIBRATE, [SPECIES_STONJOURNER] = BACK_ANIM_H_VIBRATE, - [SPECIES_EISCUE] = BACK_ANIM_H_VIBRATE, - [SPECIES_INDEEDEE] = BACK_ANIM_H_VIBRATE, - [SPECIES_MORPEKO] = BACK_ANIM_H_VIBRATE, + [SPECIES_EISCUE_ICE_FACE] = BACK_ANIM_H_VIBRATE, + [SPECIES_INDEEDEE_MALE] = BACK_ANIM_H_VIBRATE, + [SPECIES_MORPEKO_FULL_BELLY] = BACK_ANIM_H_VIBRATE, [SPECIES_CUFANT] = BACK_ANIM_H_VIBRATE, [SPECIES_COPPERAJAH] = BACK_ANIM_H_VIBRATE, [SPECIES_DRACOZOLT] = BACK_ANIM_H_VIBRATE, @@ -1116,11 +1116,11 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_DREEPY] = BACK_ANIM_H_VIBRATE, [SPECIES_DRAKLOAK] = BACK_ANIM_H_VIBRATE, [SPECIES_DRAGAPULT] = BACK_ANIM_H_VIBRATE, - [SPECIES_ZACIAN] = BACK_ANIM_H_VIBRATE, - [SPECIES_ZAMAZENTA] = BACK_ANIM_H_VIBRATE, + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = BACK_ANIM_H_VIBRATE, + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = BACK_ANIM_H_VIBRATE, [SPECIES_ETERNATUS] = BACK_ANIM_H_VIBRATE, [SPECIES_KUBFU] = BACK_ANIM_H_VIBRATE, - [SPECIES_URSHIFU] = BACK_ANIM_H_VIBRATE, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = BACK_ANIM_H_VIBRATE, [SPECIES_ZARUDE] = BACK_ANIM_H_VIBRATE, [SPECIES_REGIELEKI] = BACK_ANIM_H_VIBRATE, [SPECIES_REGIDRAGO] = BACK_ANIM_H_VIBRATE, @@ -1130,10 +1130,10 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_WYRDEER] = BACK_ANIM_H_VIBRATE, [SPECIES_KLEAVOR] = BACK_ANIM_H_VIBRATE, [SPECIES_URSALUNA] = BACK_ANIM_H_VIBRATE, - [SPECIES_BASCULEGION] = BACK_ANIM_H_VIBRATE, + [SPECIES_BASCULEGION_MALE] = BACK_ANIM_H_VIBRATE, [SPECIES_SNEASLER] = BACK_ANIM_H_VIBRATE, [SPECIES_OVERQWIL] = BACK_ANIM_H_VIBRATE, - [SPECIES_ENAMORUS] = BACK_ANIM_H_VIBRATE, + [SPECIES_ENAMORUS_INCARNATE] = BACK_ANIM_H_VIBRATE, // Gen 3 Forms [SPECIES_CASTFORM_SUNNY] = BACK_ANIM_SHAKE_GLOW_RED, @@ -1262,8 +1262,8 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_ORICORIO_PAU] = BACK_ANIM_H_VIBRATE, [SPECIES_ORICORIO_SENSU] = BACK_ANIM_H_VIBRATE, [SPECIES_ROCKRUFF_OWN_TEMPO] = BACK_ANIM_H_VIBRATE, - [SPECIES_LYCANROC_MIDNIGHT] = BACK_ANIM_H_VIBRATE, - [SPECIES_LYCANROC_DUSK] = BACK_ANIM_H_VIBRATE, + [SPECIES_LYCANROC_MIDNIGHT] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_LYCANROC_DUSK] = BACK_ANIM_V_SHAKE, [SPECIES_WISHIWASHI_SCHOOL] = BACK_ANIM_H_VIBRATE, [SPECIES_SILVALLY_FIGHTING] = BACK_ANIM_H_VIBRATE, [SPECIES_SILVALLY_FLYING] = BACK_ANIM_H_VIBRATE,