diff --git a/graphics/pokemon/abomasnow/anim_frontf.png b/graphics/pokemon/abomasnow/anim_frontf.png new file mode 100644 index 0000000000..49fdfb706a Binary files /dev/null and b/graphics/pokemon/abomasnow/anim_frontf.png differ diff --git a/graphics/pokemon/bibarel/anim_front.png b/graphics/pokemon/bibarel/anim_front.png index f50a42ae64..2143b6996f 100644 Binary files a/graphics/pokemon/bibarel/anim_front.png and b/graphics/pokemon/bibarel/anim_front.png differ diff --git a/graphics/pokemon/bibarel/anim_frontf.png b/graphics/pokemon/bibarel/anim_frontf.png new file mode 100644 index 0000000000..a15a6b5f89 Binary files /dev/null and b/graphics/pokemon/bibarel/anim_frontf.png differ diff --git a/graphics/pokemon/bibarel/normal.pal b/graphics/pokemon/bibarel/normal.pal index 71a5f280ae..cc531ec662 100644 --- a/graphics/pokemon/bibarel/normal.pal +++ b/graphics/pokemon/bibarel/normal.pal @@ -10,7 +10,7 @@ JASC-PAL 168 144 120 192 192 176 248 248 248 -56 48 40 +98 82 57 232 64 32 176 24 16 64 56 48 diff --git a/graphics/pokemon/bidoof/anim_frontf.png b/graphics/pokemon/bidoof/anim_frontf.png index c5e7b97c11..16f873bc2d 100644 Binary files a/graphics/pokemon/bidoof/anim_frontf.png and b/graphics/pokemon/bidoof/anim_frontf.png differ diff --git a/graphics/pokemon/bidoof/backf.png b/graphics/pokemon/bidoof/backf.png index 27ec709a93..e5b18638df 100644 Binary files a/graphics/pokemon/bidoof/backf.png and b/graphics/pokemon/bidoof/backf.png differ diff --git a/graphics/pokemon/buizel/backf.png b/graphics/pokemon/buizel/backf.png new file mode 100644 index 0000000000..3d8a71f2a3 Binary files /dev/null and b/graphics/pokemon/buizel/backf.png differ diff --git a/graphics/pokemon/cacturne/anim_frontf.png b/graphics/pokemon/cacturne/anim_frontf.png new file mode 100644 index 0000000000..2dbdb47772 Binary files /dev/null and b/graphics/pokemon/cacturne/anim_frontf.png differ diff --git a/graphics/pokemon/camerupt/anim_front.png b/graphics/pokemon/camerupt/anim_front.png index 61f11f8c25..785798f764 100644 Binary files a/graphics/pokemon/camerupt/anim_front.png and b/graphics/pokemon/camerupt/anim_front.png differ diff --git a/graphics/pokemon/camerupt/anim_frontf.png b/graphics/pokemon/camerupt/anim_frontf.png new file mode 100644 index 0000000000..b746a2d187 Binary files /dev/null and b/graphics/pokemon/camerupt/anim_frontf.png differ diff --git a/graphics/pokemon/camerupt/back.png b/graphics/pokemon/camerupt/back.png index f97031b2c0..4481f8262b 100644 Binary files a/graphics/pokemon/camerupt/back.png and b/graphics/pokemon/camerupt/back.png differ diff --git a/graphics/pokemon/camerupt/backf.png b/graphics/pokemon/camerupt/backf.png new file mode 100644 index 0000000000..f97031b2c0 Binary files /dev/null and b/graphics/pokemon/camerupt/backf.png differ diff --git a/graphics/pokemon/croagunk/anim_frontf.png b/graphics/pokemon/croagunk/anim_frontf.png new file mode 100644 index 0000000000..1d0ab61e1b Binary files /dev/null and b/graphics/pokemon/croagunk/anim_frontf.png differ diff --git a/graphics/pokemon/croagunk/backf.png b/graphics/pokemon/croagunk/backf.png new file mode 100644 index 0000000000..07292925c5 Binary files /dev/null and b/graphics/pokemon/croagunk/backf.png differ diff --git a/graphics/pokemon/finneon/anim_frontf.png b/graphics/pokemon/finneon/anim_frontf.png new file mode 100644 index 0000000000..26a385af46 Binary files /dev/null and b/graphics/pokemon/finneon/anim_frontf.png differ diff --git a/graphics/pokemon/finneon/backf.png b/graphics/pokemon/finneon/backf.png new file mode 100644 index 0000000000..2e05aecb68 Binary files /dev/null and b/graphics/pokemon/finneon/backf.png differ diff --git a/graphics/pokemon/floatzel/anim_front.png b/graphics/pokemon/floatzel/anim_front.png index cc97f8baa8..e6f56514c4 100644 Binary files a/graphics/pokemon/floatzel/anim_front.png and b/graphics/pokemon/floatzel/anim_front.png differ diff --git a/graphics/pokemon/floatzel/backf.png b/graphics/pokemon/floatzel/backf.png new file mode 100644 index 0000000000..82005cbd29 Binary files /dev/null and b/graphics/pokemon/floatzel/backf.png differ diff --git a/graphics/pokemon/gulpin/anim_frontf.png b/graphics/pokemon/gulpin/anim_frontf.png new file mode 100644 index 0000000000..c8b4d13d1e Binary files /dev/null and b/graphics/pokemon/gulpin/anim_frontf.png differ diff --git a/graphics/pokemon/gulpin/backf.png b/graphics/pokemon/gulpin/backf.png new file mode 100644 index 0000000000..5d73b0d24f Binary files /dev/null and b/graphics/pokemon/gulpin/backf.png differ diff --git a/graphics/pokemon/kricketot/anim_front.png b/graphics/pokemon/kricketot/anim_front.png index 1b23ff111a..e9a485ef0c 100644 Binary files a/graphics/pokemon/kricketot/anim_front.png and b/graphics/pokemon/kricketot/anim_front.png differ diff --git a/graphics/pokemon/kricketot/anim_frontf.png b/graphics/pokemon/kricketot/anim_frontf.png index 6cc750f273..ef0ca6d879 100644 Binary files a/graphics/pokemon/kricketot/anim_frontf.png and b/graphics/pokemon/kricketot/anim_frontf.png differ diff --git a/graphics/pokemon/kricketot/backf.png b/graphics/pokemon/kricketot/backf.png index c88076a28c..effaf04f32 100644 Binary files a/graphics/pokemon/kricketot/backf.png and b/graphics/pokemon/kricketot/backf.png differ diff --git a/graphics/pokemon/kricketune/backf.png b/graphics/pokemon/kricketune/backf.png index 4f7f225d2b..b07e1451b9 100644 Binary files a/graphics/pokemon/kricketune/backf.png and b/graphics/pokemon/kricketune/backf.png differ diff --git a/graphics/pokemon/lumineon/anim_frontf.png b/graphics/pokemon/lumineon/anim_frontf.png new file mode 100644 index 0000000000..ac511018d4 Binary files /dev/null and b/graphics/pokemon/lumineon/anim_frontf.png differ diff --git a/graphics/pokemon/lumineon/backf.png b/graphics/pokemon/lumineon/backf.png new file mode 100644 index 0000000000..f94e5d1daf Binary files /dev/null and b/graphics/pokemon/lumineon/backf.png differ diff --git a/graphics/pokemon/luxio/anim_front.png b/graphics/pokemon/luxio/anim_front.png index 36368cddf4..691f23e60a 100644 Binary files a/graphics/pokemon/luxio/anim_front.png and b/graphics/pokemon/luxio/anim_front.png differ diff --git a/graphics/pokemon/luxio/anim_frontf.png b/graphics/pokemon/luxio/anim_frontf.png new file mode 100644 index 0000000000..30ec79e6cd Binary files /dev/null and b/graphics/pokemon/luxio/anim_frontf.png differ diff --git a/graphics/pokemon/luxio/backf.png b/graphics/pokemon/luxio/backf.png new file mode 100644 index 0000000000..e1b5e4bb9a Binary files /dev/null and b/graphics/pokemon/luxio/backf.png differ diff --git a/graphics/pokemon/luxray/anim_front.png b/graphics/pokemon/luxray/anim_front.png index 989470b19b..b2de7e12e6 100644 Binary files a/graphics/pokemon/luxray/anim_front.png and b/graphics/pokemon/luxray/anim_front.png differ diff --git a/graphics/pokemon/luxray/anim_frontf.png b/graphics/pokemon/luxray/anim_frontf.png new file mode 100644 index 0000000000..49d83d6b75 Binary files /dev/null and b/graphics/pokemon/luxray/anim_frontf.png differ diff --git a/graphics/pokemon/luxray/backf.png b/graphics/pokemon/luxray/backf.png new file mode 100644 index 0000000000..ce0fe29e44 Binary files /dev/null and b/graphics/pokemon/luxray/backf.png differ diff --git a/graphics/pokemon/luxray/normal.pal b/graphics/pokemon/luxray/normal.pal index 302dceb373..c81dbd3677 100644 --- a/graphics/pokemon/luxray/normal.pal +++ b/graphics/pokemon/luxray/normal.pal @@ -15,5 +15,5 @@ JASC-PAL 144 56 80 72 72 112 168 56 80 -0 0 0 +255 255 255 0 0 0 diff --git a/graphics/pokemon/milotic/anim_front.png b/graphics/pokemon/milotic/anim_front.png index 3b6b12b032..56543bff7e 100644 Binary files a/graphics/pokemon/milotic/anim_front.png and b/graphics/pokemon/milotic/anim_front.png differ diff --git a/graphics/pokemon/milotic/anim_frontf.png b/graphics/pokemon/milotic/anim_frontf.png new file mode 100644 index 0000000000..a7c8fe0c2b Binary files /dev/null and b/graphics/pokemon/milotic/anim_frontf.png differ diff --git a/graphics/pokemon/milotic/back.png b/graphics/pokemon/milotic/back.png index 77cc96ab14..98dadef06a 100644 Binary files a/graphics/pokemon/milotic/back.png and b/graphics/pokemon/milotic/back.png differ diff --git a/graphics/pokemon/milotic/backf.png b/graphics/pokemon/milotic/backf.png new file mode 100644 index 0000000000..0519c4b016 Binary files /dev/null and b/graphics/pokemon/milotic/backf.png differ diff --git a/graphics/pokemon/numel/anim_front.png b/graphics/pokemon/numel/anim_front.png index b6e95b4670..1cea61e993 100644 Binary files a/graphics/pokemon/numel/anim_front.png and b/graphics/pokemon/numel/anim_front.png differ diff --git a/graphics/pokemon/numel/anim_frontf.png b/graphics/pokemon/numel/anim_frontf.png new file mode 100644 index 0000000000..6ef4e79541 Binary files /dev/null and b/graphics/pokemon/numel/anim_frontf.png differ diff --git a/graphics/pokemon/numel/back.png b/graphics/pokemon/numel/back.png index e895fefbb0..a631f1c2a9 100644 Binary files a/graphics/pokemon/numel/back.png and b/graphics/pokemon/numel/back.png differ diff --git a/graphics/pokemon/numel/backf.png b/graphics/pokemon/numel/backf.png new file mode 100644 index 0000000000..e895fefbb0 Binary files /dev/null and b/graphics/pokemon/numel/backf.png differ diff --git a/graphics/pokemon/pachirisu/anim_frontf.png b/graphics/pokemon/pachirisu/anim_frontf.png new file mode 100644 index 0000000000..55d20e4922 Binary files /dev/null and b/graphics/pokemon/pachirisu/anim_frontf.png differ diff --git a/graphics/pokemon/relicanth/anim_front.png b/graphics/pokemon/relicanth/anim_front.png index 1ff9f7ba30..c93761ec3d 100644 Binary files a/graphics/pokemon/relicanth/anim_front.png and b/graphics/pokemon/relicanth/anim_front.png differ diff --git a/graphics/pokemon/relicanth/anim_frontf.png b/graphics/pokemon/relicanth/anim_frontf.png new file mode 100644 index 0000000000..1ff9f7ba30 Binary files /dev/null and b/graphics/pokemon/relicanth/anim_frontf.png differ diff --git a/graphics/pokemon/relicanth/backf.png b/graphics/pokemon/relicanth/backf.png new file mode 100644 index 0000000000..f900aa794f Binary files /dev/null and b/graphics/pokemon/relicanth/backf.png differ diff --git a/graphics/pokemon/roselia/anim_front.png b/graphics/pokemon/roselia/anim_front.png index 814568e648..218bac70d9 100644 Binary files a/graphics/pokemon/roselia/anim_front.png and b/graphics/pokemon/roselia/anim_front.png differ diff --git a/graphics/pokemon/roselia/anim_frontf.png b/graphics/pokemon/roselia/anim_frontf.png new file mode 100644 index 0000000000..ba9bec2764 Binary files /dev/null and b/graphics/pokemon/roselia/anim_frontf.png differ diff --git a/graphics/pokemon/roselia/backf.png b/graphics/pokemon/roselia/backf.png new file mode 100644 index 0000000000..27ff84ec68 Binary files /dev/null and b/graphics/pokemon/roselia/backf.png differ diff --git a/graphics/pokemon/roserade/anim_front.png b/graphics/pokemon/roserade/anim_front.png index e742c7a2c1..5630199f79 100644 Binary files a/graphics/pokemon/roserade/anim_front.png and b/graphics/pokemon/roserade/anim_front.png differ diff --git a/graphics/pokemon/roserade/anim_frontf.png b/graphics/pokemon/roserade/anim_frontf.png new file mode 100644 index 0000000000..b6bcee6a9b Binary files /dev/null and b/graphics/pokemon/roserade/anim_frontf.png differ diff --git a/graphics/pokemon/roserade/backf.png b/graphics/pokemon/roserade/backf.png new file mode 100644 index 0000000000..1b037aada6 Binary files /dev/null and b/graphics/pokemon/roserade/backf.png differ diff --git a/graphics/pokemon/shinx/anim_front.png b/graphics/pokemon/shinx/anim_front.png index 6f888ec4ef..064589b336 100644 Binary files a/graphics/pokemon/shinx/anim_front.png and b/graphics/pokemon/shinx/anim_front.png differ diff --git a/graphics/pokemon/shinx/anim_frontf.png b/graphics/pokemon/shinx/anim_frontf.png index 00e387be20..8ebfd688f9 100644 Binary files a/graphics/pokemon/shinx/anim_frontf.png and b/graphics/pokemon/shinx/anim_frontf.png differ diff --git a/graphics/pokemon/shinx/back.png b/graphics/pokemon/shinx/back.png index 9c89683b5b..8232bcc72c 100644 Binary files a/graphics/pokemon/shinx/back.png and b/graphics/pokemon/shinx/back.png differ diff --git a/graphics/pokemon/shinx/backf.png b/graphics/pokemon/shinx/backf.png index df82be9b30..cc02626f8a 100644 Binary files a/graphics/pokemon/shinx/backf.png and b/graphics/pokemon/shinx/backf.png differ diff --git a/graphics/pokemon/snover/anim_frontf.png b/graphics/pokemon/snover/anim_frontf.png new file mode 100644 index 0000000000..64606881f8 Binary files /dev/null and b/graphics/pokemon/snover/anim_frontf.png differ diff --git a/graphics/pokemon/snover/backf.png b/graphics/pokemon/snover/backf.png new file mode 100644 index 0000000000..8a3ed308e4 Binary files /dev/null and b/graphics/pokemon/snover/backf.png differ diff --git a/graphics/pokemon/staraptor/anim_frontf.png b/graphics/pokemon/staraptor/anim_frontf.png index 62715651bb..37e8b5cfe1 100644 Binary files a/graphics/pokemon/staraptor/anim_frontf.png and b/graphics/pokemon/staraptor/anim_frontf.png differ diff --git a/graphics/pokemon/staravia/anim_frontf.png b/graphics/pokemon/staravia/anim_frontf.png index 8658532ac7..40de79a608 100644 Binary files a/graphics/pokemon/staravia/anim_frontf.png and b/graphics/pokemon/staravia/anim_frontf.png differ diff --git a/graphics/pokemon/staravia/backf.png b/graphics/pokemon/staravia/backf.png index 36e2f2169d..51fec5992d 100644 Binary files a/graphics/pokemon/staravia/backf.png and b/graphics/pokemon/staravia/backf.png differ diff --git a/graphics/pokemon/starly/anim_front.png b/graphics/pokemon/starly/anim_front.png index 0e834f3bd3..b897ef874a 100644 Binary files a/graphics/pokemon/starly/anim_front.png and b/graphics/pokemon/starly/anim_front.png differ diff --git a/graphics/pokemon/starly/anim_frontf.png b/graphics/pokemon/starly/anim_frontf.png index 9639185e90..7209679bfa 100644 Binary files a/graphics/pokemon/starly/anim_frontf.png and b/graphics/pokemon/starly/anim_frontf.png differ diff --git a/graphics/pokemon/starly/back.png b/graphics/pokemon/starly/back.png index 17b2b70011..abea0fd5ed 100644 Binary files a/graphics/pokemon/starly/back.png and b/graphics/pokemon/starly/back.png differ diff --git a/graphics/pokemon/starly/backf.png b/graphics/pokemon/starly/backf.png index 3851350df0..f1c45a7bc6 100644 Binary files a/graphics/pokemon/starly/backf.png and b/graphics/pokemon/starly/backf.png differ diff --git a/graphics/pokemon/starly/shiny.pal b/graphics/pokemon/starly/shiny.pal index f077f79746..c49fb7aed3 100644 --- a/graphics/pokemon/starly/shiny.pal +++ b/graphics/pokemon/starly/shiny.pal @@ -4,7 +4,7 @@ JASC-PAL 152 208 160 96 64 48 16 16 16 -136 104 80 +164 115 82 56 24 24 216 200 160 248 248 248 @@ -14,6 +14,6 @@ JASC-PAL 208 152 0 192 152 128 160 112 80 -112 96 96 +139 98 74 247 82 66 0 0 0 diff --git a/graphics/pokemon/swalot/anim_frontf.png b/graphics/pokemon/swalot/anim_frontf.png new file mode 100644 index 0000000000..da17817ece Binary files /dev/null and b/graphics/pokemon/swalot/anim_frontf.png differ diff --git a/graphics/pokemon/swalot/backf.png b/graphics/pokemon/swalot/backf.png new file mode 100644 index 0000000000..fcd92c887a Binary files /dev/null and b/graphics/pokemon/swalot/backf.png differ diff --git a/graphics/pokemon/toxicroak/anim_frontf.png b/graphics/pokemon/toxicroak/anim_frontf.png new file mode 100644 index 0000000000..40f86c45ec Binary files /dev/null and b/graphics/pokemon/toxicroak/anim_frontf.png differ diff --git a/graphics/pokemon/toxicroak/backf.png b/graphics/pokemon/toxicroak/backf.png new file mode 100644 index 0000000000..dde6b0be22 Binary files /dev/null and b/graphics/pokemon/toxicroak/backf.png differ diff --git a/include/graphics.h b/include/graphics.h index 14c2e4c6a6..2d94fd7266 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -436,14 +436,19 @@ extern const u32 gMonFrontPic_Minun[]; extern const u32 gMonFrontPic_Volbeat[]; extern const u32 gMonFrontPic_Illumise[]; extern const u32 gMonFrontPic_Roselia[]; +extern const u32 gMonFrontPic_RoseliaF[]; extern const u32 gMonFrontPic_Gulpin[]; +extern const u32 gMonFrontPic_GulpinF[]; extern const u32 gMonFrontPic_Swalot[]; +extern const u32 gMonFrontPic_SwalotF[]; extern const u32 gMonFrontPic_Carvanha[]; extern const u32 gMonFrontPic_Sharpedo[]; extern const u32 gMonFrontPic_Wailmer[]; extern const u32 gMonFrontPic_Wailord[]; extern const u32 gMonFrontPic_Numel[]; +extern const u32 gMonFrontPic_NumelF[]; extern const u32 gMonFrontPic_Camerupt[]; +extern const u32 gMonFrontPic_CameruptF[]; extern const u32 gMonFrontPic_Torkoal[]; extern const u32 gMonFrontPic_Spoink[]; extern const u32 gMonFrontPic_Grumpig[]; @@ -453,6 +458,7 @@ extern const u32 gMonFrontPic_Vibrava[]; extern const u32 gMonFrontPic_Flygon[]; extern const u32 gMonFrontPic_Cacnea[]; extern const u32 gMonFrontPic_Cacturne[]; +extern const u32 gMonFrontPic_CacturneF[]; extern const u32 gMonFrontPic_Swablu[]; extern const u32 gMonFrontPic_Altaria[]; extern const u32 gMonFrontPic_Zangoose[]; @@ -471,6 +477,7 @@ extern const u32 gMonFrontPic_Anorith[]; extern const u32 gMonFrontPic_Armaldo[]; extern const u32 gMonFrontPic_Feebas[]; extern const u32 gMonFrontPic_Milotic[]; +extern const u32 gMonFrontPic_MiloticF[]; extern const u32 gMonFrontPic_Castform[]; extern const u32 gMonFrontPic_Kecleon[]; extern const u32 gMonFrontPic_Shuppet[]; @@ -490,6 +497,7 @@ extern const u32 gMonFrontPic_Clamperl[]; extern const u32 gMonFrontPic_Huntail[]; extern const u32 gMonFrontPic_Gorebyss[]; extern const u32 gMonFrontPic_Relicanth[]; +extern const u32 gMonFrontPic_RelicanthF[]; extern const u32 gMonFrontPic_Luvdisc[]; extern const u32 gMonFrontPic_Bagon[]; extern const u32 gMonFrontPic_Shelgon[]; @@ -526,6 +534,7 @@ extern const u32 gMonFrontPic_StaraptorF[]; extern const u32 gMonFrontPic_Bidoof[]; extern const u32 gMonFrontPic_BidoofF[]; extern const u32 gMonFrontPic_Bibarel[]; +extern const u32 gMonFrontPic_BibarelF[]; extern const u32 gMonFrontPic_Kricketot[]; extern const u32 gMonFrontPic_KricketotF[]; extern const u32 gMonFrontPic_Kricketune[]; @@ -533,9 +542,12 @@ extern const u32 gMonFrontPic_KricketuneF[]; extern const u32 gMonFrontPic_Shinx[]; extern const u32 gMonFrontPic_ShinxF[]; extern const u32 gMonFrontPic_Luxio[]; +extern const u32 gMonFrontPic_LuxioF[]; extern const u32 gMonFrontPic_Luxray[]; +extern const u32 gMonFrontPic_LuxrayF[]; extern const u32 gMonFrontPic_Budew[]; extern const u32 gMonFrontPic_Roserade[]; +extern const u32 gMonFrontPic_RoseradeF[]; extern const u32 gMonFrontPic_Cranidos[]; extern const u32 gMonFrontPic_Rampardos[]; extern const u32 gMonFrontPic_Shieldon[]; @@ -546,6 +558,7 @@ extern const u32 gMonFrontPic_Mothim[]; extern const u32 gMonFrontPic_Combee[]; extern const u32 gMonFrontPic_Vespiquen[]; extern const u32 gMonFrontPic_Pachirisu[]; +extern const u32 gMonFrontPic_PachirisuF[]; extern const u32 gMonFrontPic_Buizel[]; extern const u32 gMonFrontPic_Floatzel[]; extern const u32 gMonFrontPic_Cherubi[]; @@ -586,13 +599,19 @@ extern const u32 gMonFrontPic_Hippowdon[]; extern const u32 gMonFrontPic_Skorupi[]; extern const u32 gMonFrontPic_Drapion[]; extern const u32 gMonFrontPic_Croagunk[]; +extern const u32 gMonFrontPic_CroagunkF[]; extern const u32 gMonFrontPic_Toxicroak[]; +extern const u32 gMonFrontPic_ToxicroakF[]; extern const u32 gMonFrontPic_Carnivine[]; extern const u32 gMonFrontPic_Finneon[]; +extern const u32 gMonFrontPic_FinneonF[]; extern const u32 gMonFrontPic_Lumineon[]; +extern const u32 gMonFrontPic_LumineonF[]; extern const u32 gMonFrontPic_Mantyke[]; extern const u32 gMonFrontPic_Snover[]; +extern const u32 gMonFrontPic_SnoverF[]; extern const u32 gMonFrontPic_Abomasnow[]; +extern const u32 gMonFrontPic_AbomasnowF[]; extern const u32 gMonFrontPic_Weavile[]; extern const u32 gMonFrontPic_WeavileF[]; extern const u32 gMonFrontPic_Magnezone[]; @@ -1710,14 +1729,19 @@ extern const u32 gMonBackPic_Minun[]; extern const u32 gMonBackPic_Volbeat[]; extern const u32 gMonBackPic_Illumise[]; extern const u32 gMonBackPic_Roselia[]; +extern const u32 gMonBackPic_RoseliaF[]; extern const u32 gMonBackPic_Gulpin[]; +extern const u32 gMonBackPic_GulpinF[]; extern const u32 gMonBackPic_Swalot[]; +extern const u32 gMonBackPic_SwalotF[]; extern const u32 gMonBackPic_Carvanha[]; extern const u32 gMonBackPic_Sharpedo[]; extern const u32 gMonBackPic_Wailmer[]; extern const u32 gMonBackPic_Wailord[]; extern const u32 gMonBackPic_Numel[]; +extern const u32 gMonBackPic_NumelF[]; extern const u32 gMonBackPic_Camerupt[]; +extern const u32 gMonBackPic_CameruptF[]; extern const u32 gMonBackPic_Torkoal[]; extern const u32 gMonBackPic_Spoink[]; extern const u32 gMonBackPic_Grumpig[]; @@ -1745,6 +1769,7 @@ extern const u32 gMonBackPic_Anorith[]; extern const u32 gMonBackPic_Armaldo[]; extern const u32 gMonBackPic_Feebas[]; extern const u32 gMonBackPic_Milotic[]; +extern const u32 gMonBackPic_MiloticF[]; extern const u32 gMonBackPic_Castform[]; extern const u32 gMonBackPic_Kecleon[]; extern const u32 gMonBackPic_Shuppet[]; @@ -1764,6 +1789,7 @@ extern const u32 gMonBackPic_Clamperl[]; extern const u32 gMonBackPic_Huntail[]; extern const u32 gMonBackPic_Gorebyss[]; extern const u32 gMonBackPic_Relicanth[]; +extern const u32 gMonBackPic_RelicanthF[]; extern const u32 gMonBackPic_Luvdisc[]; extern const u32 gMonBackPic_Bagon[]; extern const u32 gMonBackPic_Shelgon[]; @@ -1806,9 +1832,12 @@ extern const u32 gMonBackPic_KricketuneF[]; extern const u32 gMonBackPic_Shinx[]; extern const u32 gMonBackPic_ShinxF[]; extern const u32 gMonBackPic_Luxio[]; +extern const u32 gMonBackPic_LuxioF[]; extern const u32 gMonBackPic_Luxray[]; +extern const u32 gMonBackPic_LuxrayF[]; extern const u32 gMonBackPic_Budew[]; extern const u32 gMonBackPic_Roserade[]; +extern const u32 gMonBackPic_RoseradeF[]; extern const u32 gMonBackPic_Cranidos[]; extern const u32 gMonBackPic_Rampardos[]; extern const u32 gMonBackPic_Shieldon[]; @@ -1820,7 +1849,9 @@ extern const u32 gMonBackPic_Combee[]; extern const u32 gMonBackPic_Vespiquen[]; extern const u32 gMonBackPic_Pachirisu[]; extern const u32 gMonBackPic_Buizel[]; +extern const u32 gMonBackPic_BuizelF[]; extern const u32 gMonBackPic_Floatzel[]; +extern const u32 gMonBackPic_FloatzelF[]; extern const u32 gMonBackPic_Cherubi[]; extern const u32 gMonBackPic_Cherrim[]; extern const u32 gMonBackPic_Shellos[]; @@ -1858,12 +1889,17 @@ extern const u32 gMonBackPic_Hippowdon[]; extern const u32 gMonBackPic_Skorupi[]; extern const u32 gMonBackPic_Drapion[]; extern const u32 gMonBackPic_Croagunk[]; +extern const u32 gMonBackPic_CroagunkF[]; extern const u32 gMonBackPic_Toxicroak[]; +extern const u32 gMonBackPic_ToxicroakF[]; extern const u32 gMonBackPic_Carnivine[]; extern const u32 gMonBackPic_Finneon[]; +extern const u32 gMonBackPic_FinneonF[]; extern const u32 gMonBackPic_Lumineon[]; +extern const u32 gMonBackPic_LumineonF[]; extern const u32 gMonBackPic_Mantyke[]; extern const u32 gMonBackPic_Snover[]; +extern const u32 gMonBackPic_SnoverF[]; extern const u32 gMonBackPic_Abomasnow[]; extern const u32 gMonBackPic_Weavile[]; extern const u32 gMonBackPic_WeavileF[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 63d65079e2..7c8afc0066 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -369,14 +369,19 @@ const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/anim_front.4 const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/anim_front.4bpp.lz"); const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/anim_front.4bpp.lz"); const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/anim_front.4bpp.lz"); +const u32 gMonFrontPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/anim_front.4bpp.lz"); const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/anim_front.4bpp.lz"); +const u32 gMonFrontPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/anim_front.4bpp.lz"); const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/anim_front.4bpp.lz"); const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/anim_front.4bpp.lz"); @@ -386,6 +391,7 @@ const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/anim_fro const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/anim_front.4bpp.lz"); +const u32 gMonFrontPic_CacturneF[] = INCBIN_U32("graphics/pokemon/cacturne/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/anim_front.4bpp.lz"); const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/anim_front.4bpp.lz"); @@ -404,6 +410,7 @@ const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/anim_fro const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_front.4bpp.lz"); const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/anim_front.4bpp.lz"); const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/anim_front.4bpp.lz"); @@ -423,6 +430,7 @@ const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/anim_f const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/anim_front.4bpp.lz"); const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/anim_front.4bpp.lz"); const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/anim_front.4bpp.lz"); @@ -459,6 +467,7 @@ const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/staraptor/ani const u32 gMonFrontPic_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/anim_front.4bpp.lz"); const u32 gMonFrontPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_BibarelF[] = INCBIN_U32("graphics/pokemon/bibarel/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/anim_front.4bpp.lz"); const u32 gMonFrontPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/anim_front.4bpp.lz"); @@ -466,9 +475,12 @@ const u32 gMonFrontPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/a const u32 gMonFrontPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/anim_front.4bpp.lz"); const u32 gMonFrontPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/anim_front.4bpp.lz"); const u32 gMonFrontPic_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/anim_front.4bpp.lz"); const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/anim_front.4bpp.lz"); const u32 gMonFrontPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/anim_front.4bpp.lz"); @@ -479,6 +491,7 @@ const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz"); const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz"); const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/anim_front.4bpp.lz"); @@ -519,13 +532,19 @@ const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/anim const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/anim_front.4bpp.lz"); const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/anim_front.4bpp.lz"); const u32 gMonFrontPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/anim_front.4bpp.lz"); +const u32 gMonFrontPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/anim_front.4bpp.lz"); const u32 gMonFrontPic_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/anim_front.4bpp.lz"); const u32 gMonFrontPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/anim_front.4bpp.lz"); +const u32 gMonFrontPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_front.4bpp.lz"); +const u32 gMonFrontPic_AbomasnowF[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/anim_front.4bpp.lz"); const u32 gMonFrontPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/anim_front.4bpp.lz"); @@ -1641,14 +1660,19 @@ const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/back.4bpp.lz" const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/back.4bpp.lz"); const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/back.4bpp.lz"); const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/back.4bpp.lz"); +const u32 gMonBackPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/backf.4bpp.lz"); const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/back.4bpp.lz"); +const u32 gMonBackPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/backf.4bpp.lz"); const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/back.4bpp.lz"); +const u32 gMonBackPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/backf.4bpp.lz"); const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/back.4bpp.lz"); const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/back.4bpp.lz"); const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/back.4bpp.lz"); const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/back.4bpp.lz"); const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/back.4bpp.lz"); +const u32 gMonBackPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/backf.4bpp.lz"); const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/back.4bpp.lz"); +const u32 gMonBackPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/backf.4bpp.lz"); const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/back.4bpp.lz"); const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/back.4bpp.lz"); const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/back.4bpp.lz"); @@ -1676,6 +1700,7 @@ const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/back.4bpp const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/back.4bpp.lz"); const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/back.4bpp.lz"); const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/back.4bpp.lz"); +const u32 gMonBackPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/backf.4bpp.lz"); const u32 gMonBackPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.lz"); const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/back.4bpp.lz"); const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/back.4bpp.lz"); @@ -1695,6 +1720,7 @@ const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/back.4b const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/back.4bpp.lz"); const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/back.4bpp.lz"); const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/back.4bpp.lz"); +const u32 gMonBackPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/backf.4bpp.lz"); const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/back.4bpp.lz"); const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/back.4bpp.lz"); const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/back.4bpp.lz"); @@ -1737,9 +1763,12 @@ const u32 gMonBackPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/ba const u32 gMonBackPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/back.4bpp.lz"); const u32 gMonBackPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/backf.4bpp.lz"); const u32 gMonBackPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/back.4bpp.lz"); +const u32 gMonBackPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/backf.4bpp.lz"); const u32 gMonBackPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/back.4bpp.lz"); +const u32 gMonBackPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/backf.4bpp.lz"); const u32 gMonBackPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/back.4bpp.lz"); const u32 gMonBackPic_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/back.4bpp.lz"); +const u32 gMonBackPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/backf.4bpp.lz"); const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/back.4bpp.lz"); const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/back.4bpp.lz"); const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/back.4bpp.lz"); @@ -1751,7 +1780,9 @@ const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/back.4bpp.l const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/back.4bpp.lz"); const u32 gMonBackPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/back.4bpp.lz"); const u32 gMonBackPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/back.4bpp.lz"); +const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/buizel/backf.4bpp.lz"); const u32 gMonBackPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/back.4bpp.lz"); +const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/floatzel/backf.4bpp.lz"); const u32 gMonBackPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/back.4bpp.lz"); const u32 gMonBackPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/normal/back.4bpp.lz"); const u32 gMonBackPic_Shellos[] = INCBIN_U32("graphics/pokemon/shellos/back.4bpp.lz"); @@ -1789,12 +1820,17 @@ const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/back. const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/back.4bpp.lz"); const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/back.4bpp.lz"); const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/back.4bpp.lz"); +const u32 gMonBackPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/backf.4bpp.lz"); const u32 gMonBackPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/back.4bpp.lz"); +const u32 gMonBackPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/backf.4bpp.lz"); const u32 gMonBackPic_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/back.4bpp.lz"); const u32 gMonBackPic_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/back.4bpp.lz"); +const u32 gMonBackPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/backf.4bpp.lz"); const u32 gMonBackPic_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/back.4bpp.lz"); +const u32 gMonBackPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/backf.4bpp.lz"); const u32 gMonBackPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/back.4bpp.lz"); const u32 gMonBackPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/back.4bpp.lz"); +const u32 gMonBackPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/backf.4bpp.lz"); const u32 gMonBackPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/back.4bpp.lz"); const u32 gMonBackPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/back.4bpp.lz"); const u32 gMonBackPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/backf.4bpp.lz"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index c849eaf2f2..d967a50fca 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -480,7 +480,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_CROAGUNK] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_TOXICROAK] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_CARNIVINE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, - [SPECIES_FINNEON] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, + [SPECIES_FINNEON] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_LUMINEON] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_MANTYKE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_SNOVER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 7ade799523..a232abb567 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1345,7 +1345,6 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[NUM_SPECIES + 1] = SPECIES_SPRITE(RATTATA, gMonBackPic_RattataF), SPECIES_SPRITE(RATICATE, gMonBackPic_RaticateF), SPECIES_SPRITE(PIKACHU, gMonBackPic_PikachuF), - SPECIES_SPRITE(RAICHU, gMonBackPic_Raichu), SPECIES_SPRITE(ZUBAT, gMonBackPic_ZubatF), SPECIES_SPRITE(GOLBAT, gMonBackPic_GolbatF), SPECIES_SPRITE(GLOOM, gMonBackPic_GloomF), @@ -1359,14 +1358,12 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[NUM_SPECIES + 1] = SPECIES_SPRITE(RHYDON, gMonBackPic_RhydonF), SPECIES_SPRITE(GOLDEEN, gMonBackPic_GoldeenF), SPECIES_SPRITE(SEAKING, gMonBackPic_SeakingF), - SPECIES_SPRITE(SCYTHER, gMonBackPic_Scyther), SPECIES_SPRITE(MAGIKARP, gMonBackPic_MagikarpF), SPECIES_SPRITE(GYARADOS, gMonBackPic_GyaradosF), SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF), SPECIES_SPRITE(MEGANIUM, gMonBackPic_MeganiumF), SPECIES_SPRITE(LEDYBA, gMonBackPic_LedybaF), SPECIES_SPRITE(LEDIAN, gMonBackPic_LedianF), - SPECIES_SPRITE(XATU, gMonBackPic_Xatu), SPECIES_SPRITE(SUDOWOODO, gMonBackPic_SudowoodoF), SPECIES_SPRITE(POLITOED, gMonBackPic_PolitoedF), SPECIES_SPRITE(AIPOM, gMonBackPic_AipomF), @@ -1377,7 +1374,6 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[NUM_SPECIES + 1] = SPECIES_SPRITE(GIRAFARIG, gMonBackPic_GirafarigF), SPECIES_SPRITE(GLIGAR, gMonBackPic_GligarF), SPECIES_SPRITE(STEELIX, gMonBackPic_SteelixF), - SPECIES_SPRITE(SCIZOR, gMonBackPic_Scizor), SPECIES_SPRITE(HERACROSS, gMonBackPic_HeracrossF), SPECIES_SPRITE(SNEASEL, gMonBackPic_SneaselF), SPECIES_SPRITE(URSARING, gMonBackPic_UrsaringF), @@ -1395,6 +1391,13 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[NUM_SPECIES + 1] = SPECIES_SPRITE(SHIFTRY, gMonBackPic_ShiftryF), SPECIES_SPRITE(MEDITITE, gMonBackPic_MedititeF), SPECIES_SPRITE(MEDICHAM, gMonBackPic_MedichamF), + SPECIES_SPRITE(ROSELIA, gMonBackPic_RoseliaF), + SPECIES_SPRITE(GULPIN, gMonBackPic_GulpinF), + SPECIES_SPRITE(SWALOT, gMonBackPic_SwalotF), + SPECIES_SPRITE(NUMEL, gMonBackPic_NumelF), + SPECIES_SPRITE(CAMERUPT, gMonBackPic_CameruptF), + SPECIES_SPRITE(MILOTIC, gMonBackPic_MiloticF), + SPECIES_SPRITE(RELICANTH, gMonBackPic_RelicanthF), #if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF), @@ -1404,17 +1407,21 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[NUM_SPECIES + 1] = SPECIES_SPRITE(KRICKETOT, gMonBackPic_KricketotF), SPECIES_SPRITE(KRICKETUNE, gMonBackPic_KricketuneF), SPECIES_SPRITE(SHINX, gMonBackPic_ShinxF), - SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), + SPECIES_SPRITE(LUXIO, gMonBackPic_LuxioF), + SPECIES_SPRITE(LUXRAY, gMonBackPic_LuxrayF), + SPECIES_SPRITE(ROSERADE, gMonBackPic_RoseradeF), + SPECIES_SPRITE(BUIZEL, gMonBackPic_BuizelF), + SPECIES_SPRITE(FLOATZEL, gMonBackPic_FloatzelF), SPECIES_SPRITE(AMBIPOM, gMonBackPic_AmbipomF), SPECIES_SPRITE(GIBLE, gMonBackPic_GibleF), SPECIES_SPRITE(GABITE, gMonBackPic_GabiteF), - SPECIES_SPRITE(GARCHOMP, gMonBackPic_Garchomp), - SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_Hippopotas), - SPECIES_SPRITE(HIPPOWDON, gMonBackPic_Hippowdon), + SPECIES_SPRITE(CROAGUNK, gMonBackPic_CroagunkF), + SPECIES_SPRITE(TOXICROAK, gMonBackPic_ToxicroakF), + SPECIES_SPRITE(FINNEON, gMonBackPic_FinneonF), + SPECIES_SPRITE(LUMINEON, gMonBackPic_LumineonF), + SPECIES_SPRITE(SNOVER, gMonBackPic_SnoverF), SPECIES_SPRITE(WEAVILE, gMonBackPic_WeavileF), SPECIES_SPRITE(RHYPERIOR, gMonBackPic_RhyperiorF), - SPECIES_SPRITE(TANGROWTH, gMonBackPic_Tangrowth), - SPECIES_SPRITE(MAMOSWINE, gMonBackPic_Mamoswine), #endif #if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 8ef0d34c36..27fefa9507 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1384,7 +1384,6 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[NUM_SPECIES + 1] = SPECIES_SPRITE(OCTILLERY, gMonFrontPic_OctilleryF), SPECIES_SPRITE(HOUNDOOM, gMonFrontPic_HoundoomF), SPECIES_SPRITE(DONPHAN, gMonFrontPic_DonphanF), - SPECIES_SPRITE(TORCHIC, gMonFrontPic_Torchic), SPECIES_SPRITE(COMBUSKEN, gMonFrontPic_CombuskenF), SPECIES_SPRITE(BLAZIKEN, gMonFrontPic_BlazikenF), SPECIES_SPRITE(BEAUTIFLY, gMonFrontPic_BeautiflyF), @@ -1394,18 +1393,37 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[NUM_SPECIES + 1] = SPECIES_SPRITE(SHIFTRY, gMonFrontPic_ShiftryF), SPECIES_SPRITE(MEDITITE, gMonFrontPic_MedititeF), SPECIES_SPRITE(MEDICHAM, gMonFrontPic_MedichamF), + SPECIES_SPRITE(ROSELIA, gMonFrontPic_RoseliaF), + SPECIES_SPRITE(GULPIN, gMonFrontPic_GulpinF), + SPECIES_SPRITE(SWALOT, gMonFrontPic_SwalotF), + SPECIES_SPRITE(NUMEL, gMonFrontPic_NumelF), + SPECIES_SPRITE(CAMERUPT, gMonFrontPic_CameruptF), + SPECIES_SPRITE(CACTURNE, gMonFrontPic_CacturneF), + SPECIES_SPRITE(MILOTIC, gMonFrontPic_MiloticF), + SPECIES_SPRITE(RELICANTH, gMonFrontPic_RelicanthF), #if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF), SPECIES_SPRITE(STARAPTOR, gMonFrontPic_StaraptorF), SPECIES_SPRITE(BIDOOF, gMonFrontPic_BidoofF), + SPECIES_SPRITE(BIBAREL, gMonFrontPic_BibarelF), SPECIES_SPRITE(KRICKETOT, gMonFrontPic_KricketotF), SPECIES_SPRITE(KRICKETUNE, gMonFrontPic_KricketuneF), SPECIES_SPRITE(SHINX, gMonFrontPic_ShinxF), + SPECIES_SPRITE(LUXIO, gMonFrontPic_LuxioF), + SPECIES_SPRITE(LUXRAY, gMonFrontPic_LuxrayF), + SPECIES_SPRITE(ROSERADE, gMonFrontPic_RoseradeF), SPECIES_SPRITE(AMBIPOM, gMonFrontPic_AmbipomF), + SPECIES_SPRITE(PACHIRISU, gMonFrontPic_PachirisuF), SPECIES_SPRITE(GIBLE, gMonFrontPic_GibleF), SPECIES_SPRITE(GABITE, gMonFrontPic_GabiteF), SPECIES_SPRITE(GARCHOMP, gMonFrontPic_GarchompF), + SPECIES_SPRITE(CROAGUNK, gMonFrontPic_CroagunkF), + SPECIES_SPRITE(TOXICROAK, gMonFrontPic_ToxicroakF), + SPECIES_SPRITE(FINNEON, gMonFrontPic_FinneonF), + SPECIES_SPRITE(LUMINEON, gMonFrontPic_LumineonF), + SPECIES_SPRITE(SNOVER, gMonFrontPic_SnoverF), + SPECIES_SPRITE(ABOMASNOW, gMonFrontPic_AbomasnowF), SPECIES_SPRITE(WEAVILE, gMonFrontPic_WeavileF), SPECIES_SPRITE(RHYPERIOR, gMonFrontPic_RhyperiorF), SPECIES_SPRITE(TANGROWTH, gMonFrontPic_TangrowthF),