diff --git a/graphics/pokemon/dodrio/anim_front.png b/graphics/pokemon/dodrio/anim_front.png index cfda98021..5c970bf8e 100644 Binary files a/graphics/pokemon/dodrio/anim_front.png and b/graphics/pokemon/dodrio/anim_front.png differ diff --git a/graphics/pokemon/dodrio/anim_frontf.png b/graphics/pokemon/dodrio/anim_frontf.png new file mode 100644 index 000000000..c69ab602c Binary files /dev/null and b/graphics/pokemon/dodrio/anim_frontf.png differ diff --git a/graphics/pokemon/dodrio/back.png b/graphics/pokemon/dodrio/back.png index b84b258a3..a16061532 100644 Binary files a/graphics/pokemon/dodrio/back.png and b/graphics/pokemon/dodrio/back.png differ diff --git a/graphics/pokemon/dodrio/backf.png b/graphics/pokemon/dodrio/backf.png new file mode 100644 index 000000000..ad1f5bcf5 Binary files /dev/null and b/graphics/pokemon/dodrio/backf.png differ diff --git a/graphics/pokemon/doduo/anim_frontf.png b/graphics/pokemon/doduo/anim_frontf.png new file mode 100644 index 000000000..51d0d982e Binary files /dev/null and b/graphics/pokemon/doduo/anim_frontf.png differ diff --git a/graphics/pokemon/doduo/back.png b/graphics/pokemon/doduo/back.png index be54504de..dc2b09bc9 100644 Binary files a/graphics/pokemon/doduo/back.png and b/graphics/pokemon/doduo/back.png differ diff --git a/graphics/pokemon/doduo/backf.png b/graphics/pokemon/doduo/backf.png new file mode 100644 index 000000000..3e0ad49e5 Binary files /dev/null and b/graphics/pokemon/doduo/backf.png differ diff --git a/graphics/pokemon/doduo/shiny.pal b/graphics/pokemon/doduo/shiny.pal index 5afafcf4f..40d0d1146 100644 --- a/graphics/pokemon/doduo/shiny.pal +++ b/graphics/pokemon/doduo/shiny.pal @@ -12,8 +12,8 @@ JASC-PAL 96 96 96 160 152 72 232 224 168 -192 88 88 -64 64 56 216 200 136 0 0 0 0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/gabite/anim_frontf.png b/graphics/pokemon/gabite/anim_frontf.png new file mode 100644 index 000000000..bbcc77102 Binary files /dev/null and b/graphics/pokemon/gabite/anim_frontf.png differ diff --git a/graphics/pokemon/gabite/backf.png b/graphics/pokemon/gabite/backf.png new file mode 100644 index 000000000..a22d49ec4 Binary files /dev/null and b/graphics/pokemon/gabite/backf.png differ diff --git a/graphics/pokemon/garchomp/anim_frontf.png b/graphics/pokemon/garchomp/anim_frontf.png new file mode 100644 index 000000000..c28766a70 Binary files /dev/null and b/graphics/pokemon/garchomp/anim_frontf.png differ diff --git a/graphics/pokemon/gible/anim_frontf.png b/graphics/pokemon/gible/anim_frontf.png new file mode 100644 index 000000000..ee2e0216b Binary files /dev/null and b/graphics/pokemon/gible/anim_frontf.png differ diff --git a/graphics/pokemon/gible/backf.png b/graphics/pokemon/gible/backf.png new file mode 100644 index 000000000..e1ad84430 Binary files /dev/null and b/graphics/pokemon/gible/backf.png differ diff --git a/graphics/pokemon/gloom/anim_frontf.png b/graphics/pokemon/gloom/anim_frontf.png new file mode 100644 index 000000000..00203a392 Binary files /dev/null and b/graphics/pokemon/gloom/anim_frontf.png differ diff --git a/graphics/pokemon/gloom/backf.png b/graphics/pokemon/gloom/backf.png new file mode 100644 index 000000000..6f6bb3bcf Binary files /dev/null and b/graphics/pokemon/gloom/backf.png differ diff --git a/graphics/pokemon/goldeen/anim_frontf.png b/graphics/pokemon/goldeen/anim_frontf.png new file mode 100644 index 000000000..8ddb9d752 Binary files /dev/null and b/graphics/pokemon/goldeen/anim_frontf.png differ diff --git a/graphics/pokemon/goldeen/backf.png b/graphics/pokemon/goldeen/backf.png new file mode 100644 index 000000000..4ffefc316 Binary files /dev/null and b/graphics/pokemon/goldeen/backf.png differ diff --git a/graphics/pokemon/medicham/anim_frontf.png b/graphics/pokemon/medicham/anim_frontf.png new file mode 100644 index 000000000..29940c980 Binary files /dev/null and b/graphics/pokemon/medicham/anim_frontf.png differ diff --git a/graphics/pokemon/medicham/backf.png b/graphics/pokemon/medicham/backf.png new file mode 100644 index 000000000..fb4a0f9fa Binary files /dev/null and b/graphics/pokemon/medicham/backf.png differ diff --git a/graphics/pokemon/meditite/anim_front.png b/graphics/pokemon/meditite/anim_front.png index 162ebf20d..370244207 100644 Binary files a/graphics/pokemon/meditite/anim_front.png and b/graphics/pokemon/meditite/anim_front.png differ diff --git a/graphics/pokemon/meditite/anim_frontf.png b/graphics/pokemon/meditite/anim_frontf.png new file mode 100644 index 000000000..820cc8513 Binary files /dev/null and b/graphics/pokemon/meditite/anim_frontf.png differ diff --git a/graphics/pokemon/meditite/back.png b/graphics/pokemon/meditite/back.png index e2b8178fb..9fac7c183 100644 Binary files a/graphics/pokemon/meditite/back.png and b/graphics/pokemon/meditite/back.png differ diff --git a/graphics/pokemon/meditite/backf.png b/graphics/pokemon/meditite/backf.png new file mode 100644 index 000000000..e3f37ccd6 Binary files /dev/null and b/graphics/pokemon/meditite/backf.png differ diff --git a/graphics/pokemon/pikachu/anim_frontf.png b/graphics/pokemon/pikachu/anim_frontf.png new file mode 100644 index 000000000..c911e36cb Binary files /dev/null and b/graphics/pokemon/pikachu/anim_frontf.png differ diff --git a/graphics/pokemon/pikachu/backf.png b/graphics/pokemon/pikachu/backf.png new file mode 100644 index 000000000..f28863413 Binary files /dev/null and b/graphics/pokemon/pikachu/backf.png differ diff --git a/graphics/pokemon/politoed/anim_frontf.png b/graphics/pokemon/politoed/anim_frontf.png new file mode 100644 index 000000000..88c007e8a Binary files /dev/null and b/graphics/pokemon/politoed/anim_frontf.png differ diff --git a/graphics/pokemon/politoed/backf.png b/graphics/pokemon/politoed/backf.png new file mode 100644 index 000000000..80bbd233f Binary files /dev/null and b/graphics/pokemon/politoed/backf.png differ diff --git a/graphics/pokemon/raichu/anim_frontf.png b/graphics/pokemon/raichu/anim_frontf.png new file mode 100644 index 000000000..23ddf1fa7 Binary files /dev/null and b/graphics/pokemon/raichu/anim_frontf.png differ diff --git a/graphics/pokemon/seaking/anim_frontf.png b/graphics/pokemon/seaking/anim_frontf.png new file mode 100644 index 000000000..0ed5b9a27 Binary files /dev/null and b/graphics/pokemon/seaking/anim_frontf.png differ diff --git a/graphics/pokemon/seaking/backf.png b/graphics/pokemon/seaking/backf.png new file mode 100644 index 000000000..390a13592 Binary files /dev/null and b/graphics/pokemon/seaking/backf.png differ diff --git a/graphics/pokemon/vileplume/anim_frontf.png b/graphics/pokemon/vileplume/anim_frontf.png new file mode 100644 index 000000000..b77e9aadf Binary files /dev/null and b/graphics/pokemon/vileplume/anim_frontf.png differ diff --git a/graphics/pokemon/vileplume/backf.png b/graphics/pokemon/vileplume/backf.png new file mode 100644 index 000000000..0aa3c338c Binary files /dev/null and b/graphics/pokemon/vileplume/backf.png differ diff --git a/graphics/pokemon/xatu/anim_front.png b/graphics/pokemon/xatu/anim_front.png index 3bc6c66b2..828f993da 100644 Binary files a/graphics/pokemon/xatu/anim_front.png and b/graphics/pokemon/xatu/anim_front.png differ diff --git a/graphics/pokemon/xatu/anim_frontf.png b/graphics/pokemon/xatu/anim_frontf.png new file mode 100644 index 000000000..ca2e1166f Binary files /dev/null and b/graphics/pokemon/xatu/anim_frontf.png differ diff --git a/include/graphics.h b/include/graphics.h index 59d441bda..06b56f081 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -92,7 +92,9 @@ extern const u32 gMonFrontPic_Fearow[]; extern const u32 gMonFrontPic_Ekans[]; extern const u32 gMonFrontPic_Arbok[]; extern const u32 gMonFrontPic_Pikachu[]; +extern const u32 gMonFrontPic_PikachuF[]; extern const u32 gMonFrontPic_Raichu[]; +extern const u32 gMonFrontPic_RaichuF[]; extern const u32 gMonFrontPic_Sandshrew[]; extern const u32 gMonFrontPic_Sandslash[]; extern const u32 gMonFrontPic_NidoranF[]; @@ -111,7 +113,9 @@ extern const u32 gMonFrontPic_Zubat[]; extern const u32 gMonFrontPic_Golbat[]; extern const u32 gMonFrontPic_Oddish[]; extern const u32 gMonFrontPic_Gloom[]; +extern const u32 gMonFrontPic_GloomF[]; extern const u32 gMonFrontPic_Vileplume[]; +extern const u32 gMonFrontPic_VileplumeF[]; extern const u32 gMonFrontPic_Paras[]; extern const u32 gMonFrontPic_Parasect[]; extern const u32 gMonFrontPic_Venonat[]; @@ -151,7 +155,9 @@ extern const u32 gMonFrontPic_Magnemite[]; extern const u32 gMonFrontPic_Magneton[]; extern const u32 gMonFrontPic_Farfetchd[]; extern const u32 gMonFrontPic_Doduo[]; +extern const u32 gMonFrontPic_DoduoF[]; extern const u32 gMonFrontPic_Dodrio[]; +extern const u32 gMonFrontPic_DodrioF[]; extern const u32 gMonFrontPic_Seel[]; extern const u32 gMonFrontPic_Dewgong[]; extern const u32 gMonFrontPic_Grimer[]; @@ -185,7 +191,9 @@ extern const u32 gMonFrontPic_Kangaskhan[]; extern const u32 gMonFrontPic_Horsea[]; extern const u32 gMonFrontPic_Seadra[]; extern const u32 gMonFrontPic_Goldeen[]; +extern const u32 gMonFrontPic_GoldeenF[]; extern const u32 gMonFrontPic_Seaking[]; +extern const u32 gMonFrontPic_SeakingF[]; extern const u32 gMonFrontPic_Staryu[]; extern const u32 gMonFrontPic_Starmie[]; extern const u32 gMonFrontPic_MrMime[]; @@ -246,6 +254,7 @@ extern const u32 gMonFrontPic_Togepi[]; extern const u32 gMonFrontPic_Togetic[]; extern const u32 gMonFrontPic_Natu[]; extern const u32 gMonFrontPic_Xatu[]; +extern const u32 gMonFrontPic_XatuF[]; extern const u32 gMonFrontPic_Mareep[]; extern const u32 gMonFrontPic_Flaaffy[]; extern const u32 gMonFrontPic_Ampharos[]; @@ -254,6 +263,7 @@ extern const u32 gMonFrontPic_Marill[]; extern const u32 gMonFrontPic_Azumarill[]; extern const u32 gMonFrontPic_Sudowoodo[]; extern const u32 gMonFrontPic_Politoed[]; +extern const u32 gMonFrontPic_PolitoedF[]; extern const u32 gMonFrontPic_Hoppip[]; extern const u32 gMonFrontPic_Skiploom[]; extern const u32 gMonFrontPic_Jumpluff[]; @@ -375,7 +385,9 @@ extern const u32 gMonFrontPic_Aron[]; extern const u32 gMonFrontPic_Lairon[]; extern const u32 gMonFrontPic_Aggron[]; extern const u32 gMonFrontPic_Meditite[]; +extern const u32 gMonFrontPic_MedititeF[]; extern const u32 gMonFrontPic_Medicham[]; +extern const u32 gMonFrontPic_MedichamF[]; extern const u32 gMonFrontPic_Electrike[]; extern const u32 gMonFrontPic_Manectric[]; extern const u32 gMonFrontPic_Plusle[]; @@ -519,8 +531,11 @@ extern const u32 gMonFrontPic_Happiny[]; extern const u32 gMonFrontPic_Chatot[]; extern const u32 gMonFrontPic_Spiritomb[]; extern const u32 gMonFrontPic_Gible[]; +extern const u32 gMonFrontPic_GibleF[]; extern const u32 gMonFrontPic_Gabite[]; +extern const u32 gMonFrontPic_GabiteF[]; extern const u32 gMonFrontPic_Garchomp[]; +extern const u32 gMonFrontPic_GarchompF[]; extern const u32 gMonFrontPic_Munchlax[]; extern const u32 gMonFrontPic_Riolu[]; extern const u32 gMonFrontPic_Lucario[]; @@ -1307,6 +1322,7 @@ extern const u32 gMonBackPic_Fearow[]; extern const u32 gMonBackPic_Ekans[]; extern const u32 gMonBackPic_Arbok[]; extern const u32 gMonBackPic_Pikachu[]; +extern const u32 gMonBackPic_PikachuF[]; extern const u32 gMonBackPic_Raichu[]; extern const u32 gMonBackPic_Sandshrew[]; extern const u32 gMonBackPic_Sandslash[]; @@ -1326,7 +1342,9 @@ extern const u32 gMonBackPic_Zubat[]; extern const u32 gMonBackPic_Golbat[]; extern const u32 gMonBackPic_Oddish[]; extern const u32 gMonBackPic_Gloom[]; +extern const u32 gMonBackPic_GloomF[]; extern const u32 gMonBackPic_Vileplume[]; +extern const u32 gMonBackPic_VileplumeF[]; extern const u32 gMonBackPic_Paras[]; extern const u32 gMonBackPic_Parasect[]; extern const u32 gMonBackPic_Venonat[]; @@ -1366,7 +1384,9 @@ extern const u32 gMonBackPic_Magnemite[]; extern const u32 gMonBackPic_Magneton[]; extern const u32 gMonBackPic_Farfetchd[]; extern const u32 gMonBackPic_Doduo[]; +extern const u32 gMonBackPic_DoduoF[]; extern const u32 gMonBackPic_Dodrio[]; +extern const u32 gMonBackPic_DodrioF[]; extern const u32 gMonBackPic_Seel[]; extern const u32 gMonBackPic_Dewgong[]; extern const u32 gMonBackPic_Grimer[]; @@ -1400,7 +1420,9 @@ extern const u32 gMonBackPic_Kangaskhan[]; extern const u32 gMonBackPic_Horsea[]; extern const u32 gMonBackPic_Seadra[]; extern const u32 gMonBackPic_Goldeen[]; +extern const u32 gMonBackPic_GoldeenF[]; extern const u32 gMonBackPic_Seaking[]; +extern const u32 gMonBackPic_SeakingF[]; extern const u32 gMonBackPic_Staryu[]; extern const u32 gMonBackPic_Starmie[]; extern const u32 gMonBackPic_MrMime[]; @@ -1469,6 +1491,7 @@ extern const u32 gMonBackPic_Marill[]; extern const u32 gMonBackPic_Azumarill[]; extern const u32 gMonBackPic_Sudowoodo[]; extern const u32 gMonBackPic_Politoed[]; +extern const u32 gMonBackPic_PolitoedF[]; extern const u32 gMonBackPic_Hoppip[]; extern const u32 gMonBackPic_Skiploom[]; extern const u32 gMonBackPic_Jumpluff[]; @@ -1590,7 +1613,9 @@ extern const u32 gMonBackPic_Aron[]; extern const u32 gMonBackPic_Lairon[]; extern const u32 gMonBackPic_Aggron[]; extern const u32 gMonBackPic_Meditite[]; +extern const u32 gMonBackPic_MedititeF[]; extern const u32 gMonBackPic_Medicham[]; +extern const u32 gMonBackPic_MedichamF[]; extern const u32 gMonBackPic_Electrike[]; extern const u32 gMonBackPic_Manectric[]; extern const u32 gMonBackPic_Plusle[]; @@ -1733,7 +1758,9 @@ extern const u32 gMonBackPic_Happiny[]; extern const u32 gMonBackPic_Chatot[]; extern const u32 gMonBackPic_Spiritomb[]; extern const u32 gMonBackPic_Gible[]; +extern const u32 gMonBackPic_GibleF[]; extern const u32 gMonBackPic_Gabite[]; +extern const u32 gMonBackPic_GabiteF[]; extern const u32 gMonBackPic_Garchomp[]; extern const u32 gMonBackPic_Munchlax[]; extern const u32 gMonBackPic_Riolu[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 56e45283a..6b5ee4093 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -25,7 +25,9 @@ const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/anim_front const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/anim_front.4bpp.lz"); const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RaichuF[] = INCBIN_U32("graphics/pokemon/raichu/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/anim_front.4bpp.lz"); const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/anim_front.4bpp.lz"); @@ -44,7 +46,9 @@ const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/anim_front.4 const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/anim_front.4bpp.lz"); const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/anim_front.4bpp.lz"); const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/anim_front.4bpp.lz"); const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/anim_front.4bpp.lz"); const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/anim_front.4bpp.lz"); @@ -84,7 +88,9 @@ const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/anim const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/anim_front.4bpp.lz"); const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/anim_front.4bpp.lz"); const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/anim_front.4bpp.lz"); +const u32 gMonFrontPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/anim_front.4bpp.lz"); const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/anim_front.4bpp.lz"); const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/anim_front.4bpp.lz"); @@ -118,7 +124,9 @@ const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/an const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/anim_front.4bpp.lz"); const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/anim_front.4bpp.lz"); const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz"); +const u32 gMonFrontPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz"); const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); @@ -179,6 +187,7 @@ const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/anim_front const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/anim_front.4bpp.lz"); const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_XatuF[] = INCBIN_U32("graphics/pokemon/xatu/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/anim_front.4bpp.lz"); const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/anim_front.4bpp.lz"); @@ -187,6 +196,7 @@ const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_front.4bpp.lz"); const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/anim_front.4bpp.lz"); const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/anim_front.4bpp.lz"); const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/anim_front.4bpp.lz"); @@ -308,7 +318,9 @@ const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/anim_front.4bp const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/anim_front.4bpp.lz"); const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/anim_front.4bpp.lz"); const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/anim_front.4bpp.lz"); const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/anim_front.4bpp.lz"); @@ -452,8 +464,11 @@ const u32 gMonFrontPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/anim_fro const u32 gMonFrontPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/anim_front.4bpp.lz"); const u32 gMonFrontPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/anim_front.4bpp.lz"); const u32 gMonFrontPic_Gible[] = INCBIN_U32("graphics/pokemon/gible/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GarchompF[] = INCBIN_U32("graphics/pokemon/garchomp/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/anim_front.4bpp.lz"); const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/anim_front.4bpp.lz"); @@ -1238,6 +1253,7 @@ const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/back.4bpp.l const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/back.4bpp.lz"); const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/back.4bpp.lz"); const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/back.4bpp.lz"); +const u32 gMonBackPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/backf.4bpp.lz"); const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/back.4bpp.lz"); const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/back.4bpp.lz"); const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/back.4bpp.lz"); @@ -1257,7 +1273,9 @@ const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/back.4bpp.lz" const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/back.4bpp.lz"); const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/back.4bpp.lz"); const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/back.4bpp.lz"); +const u32 gMonBackPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/backf.4bpp.lz"); const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/back.4bpp.lz"); +const u32 gMonBackPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/backf.4bpp.lz"); const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/back.4bpp.lz"); const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/back.4bpp.lz"); const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/back.4bpp.lz"); @@ -1297,7 +1315,9 @@ const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/back. const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/back.4bpp.lz"); const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/back.4bpp.lz"); const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/back.4bpp.lz"); +const u32 gMonBackPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/backf.4bpp.lz"); const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/back.4bpp.lz"); +const u32 gMonBackPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/backf.4bpp.lz"); const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/back.4bpp.lz"); const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/back.4bpp.lz"); const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/back.4bpp.lz"); @@ -1331,7 +1351,9 @@ const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/bac const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/back.4bpp.lz"); const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/back.4bpp.lz"); const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp.lz"); +const u32 gMonBackPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/backf.4bpp.lz"); const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz"); +const u32 gMonBackPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/backf.4bpp.lz"); const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz"); const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz"); const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); @@ -1400,6 +1422,7 @@ const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/back.4bpp.l const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/back.4bpp.lz"); const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/back.4bpp.lz"); const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/back.4bpp.lz"); +const u32 gMonBackPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/backf.4bpp.lz"); const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/back.4bpp.lz"); const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/back.4bpp.lz"); const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/back.4bpp.lz"); @@ -1521,7 +1544,9 @@ const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/back.4bpp.lz"); const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/back.4bpp.lz"); const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/back.4bpp.lz"); const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/back.4bpp.lz"); +const u32 gMonBackPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/backf.4bpp.lz"); const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/back.4bpp.lz"); +const u32 gMonBackPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/backf.4bpp.lz"); const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/back.4bpp.lz"); const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/back.4bpp.lz"); const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/back.4bpp.lz"); @@ -1664,7 +1689,9 @@ const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/back.4bpp const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/back.4bpp.lz"); const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/back.4bpp.lz"); const u32 gMonBackPic_Gible[] = INCBIN_U32("graphics/pokemon/gible/back.4bpp.lz"); +const u32 gMonBackPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/backf.4bpp.lz"); const u32 gMonBackPic_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/back.4bpp.lz"); +const u32 gMonBackPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/backf.4bpp.lz"); const u32 gMonBackPic_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/back.4bpp.lz"); const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/back.4bpp.lz"); const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/back.4bpp.lz"); diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 6e99e6f34..cbe0955b6 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -17,7 +17,6 @@ #endif #define PIKACHU_SPECIES_INFO(gender, flip) \ - { \ .baseHP = 35, \ .baseAttack = 55, \ .baseSpeed = 90, \ @@ -35,11 +34,10 @@ .eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FAIRY}, \ .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD},\ .bodyColor = BODY_COLOR_YELLOW, \ - .noFlip = flip, \ - } + .noFlip = flip -#define COSPLAY_PIKACHU_SPECIES_INFO(flip) PIKACHU_SPECIES_INFO(MON_FEMALE, flip) -#define CAP_PIKACHU_SPECIES_INFO(flip) PIKACHU_SPECIES_INFO(MON_MALE, flip) +#define COSPLAY_PIKACHU_SPECIES_INFO(flip) { PIKACHU_SPECIES_INFO(MON_FEMALE, flip), } +#define CAP_PIKACHU_SPECIES_INFO(flip) { PIKACHU_SPECIES_INFO(MON_MALE, flip), } #define PICHU_SPECIES_INFO(flip) \ { \ @@ -1395,7 +1393,11 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_PIKACHU] = PIKACHU_SPECIES_INFO(PERCENT_FEMALE(50), FLIP), + [SPECIES_PIKACHU] = + { + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, + PIKACHU_SPECIES_INFO(PERCENT_FEMALE(50), FLIP), + }, [SPECIES_RAICHU] = { @@ -1421,6 +1423,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD}, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SANDSHREW] = @@ -1860,6 +1863,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE, ABILITY_STENCH}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_VILEPLUME] = @@ -1887,6 +1891,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE, ABILITY_EFFECT_SPORE}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_PARAS] = @@ -2799,6 +2804,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_RUN_AWAY, ABILITY_EARLY_BIRD, ABILITY_TANGLED_FEET}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_DODRIO] = @@ -2826,6 +2832,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_RUN_AWAY, ABILITY_EARLY_BIRD, ABILITY_TANGLED_FEET}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SEEL] = @@ -3582,6 +3589,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWIFT_SWIM, ABILITY_WATER_VEIL, ABILITY_LIGHTNING_ROD}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SEAKING] = @@ -3605,6 +3613,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWIFT_SWIM, ABILITY_WATER_VEIL, ABILITY_LIGHTNING_ROD}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_STARYU] = @@ -4948,6 +4957,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SYNCHRONIZE, ABILITY_EARLY_BIRD, ABILITY_MAGIC_BOUNCE}, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_MAREEP] = @@ -5146,6 +5156,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_WATER_ABSORB, ABILITY_DAMP, ABILITY_DRIZZLE}, .bodyColor = BODY_COLOR_GREEN, .noFlip = TRUE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_HOPPIP] = @@ -7959,6 +7970,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_PURE_POWER, ABILITY_NONE, ABILITY_TELEPATHY}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_MEDICHAM] = @@ -7981,6 +7993,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_PURE_POWER, ABILITY_NONE, ABILITY_TELEPATHY}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_ELECTRIKE] = @@ -10999,6 +11012,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SAND_VEIL, ABILITY_NONE, ABILITY_ROUGH_SKIN}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_GABITE] = @@ -11021,6 +11035,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SAND_VEIL, ABILITY_NONE, ABILITY_ROUGH_SKIN}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_GARCHOMP] = @@ -11043,6 +11058,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SAND_VEIL, ABILITY_NONE, ABILITY_ROUGH_SKIN}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_MUNCHLAX] = diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 32864907b..563eb436e 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1340,7 +1340,20 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = const struct CompressedSpriteSheet gMonBackPicTableFemale[] = { + SPECIES_SPRITE(PIKACHU, gMonBackPic_PikachuF), + SPECIES_SPRITE(RAICHU, gMonBackPic_Raichu), + SPECIES_SPRITE(GLOOM, gMonBackPic_GloomF), + SPECIES_SPRITE(VILEPLUME, gMonBackPic_VileplumeF), + SPECIES_SPRITE(DODUO, gMonBackPic_DoduoF), + SPECIES_SPRITE(DODRIO, gMonBackPic_DodrioF), + SPECIES_SPRITE(GOLDEEN, gMonBackPic_GoldeenF), + SPECIES_SPRITE(SEAKING, gMonBackPic_SeakingF), SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF), + SPECIES_SPRITE(XATU, gMonBackPic_Xatu), + SPECIES_SPRITE(POLITOED, gMonBackPic_PolitoedF), + SPECIES_SPRITE(MEDITITE, gMonBackPic_MedititeF), + SPECIES_SPRITE(MEDICHAM, gMonBackPic_MedichamF), + #if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonBackPic_StaraviaF), @@ -1350,6 +1363,9 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = SPECIES_SPRITE(KRICKETUNE, gMonBackPic_KricketuneF), SPECIES_SPRITE(SHINX, gMonBackPic_ShinxF), SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), + 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), #endif diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index fa56b8492..f416433af 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1339,7 +1339,20 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = { + SPECIES_SPRITE(PIKACHU, gMonFrontPic_PikachuF), + SPECIES_SPRITE(RAICHU, gMonFrontPic_RaichuF), + SPECIES_SPRITE(GLOOM, gMonFrontPic_GloomF), + SPECIES_SPRITE(VILEPLUME, gMonFrontPic_VileplumeF), + SPECIES_SPRITE(DODUO, gMonFrontPic_DoduoF), + SPECIES_SPRITE(DODRIO, gMonFrontPic_DodrioF), + SPECIES_SPRITE(GOLDEEN, gMonFrontPic_GoldeenF), + SPECIES_SPRITE(SEAKING, gMonFrontPic_SeakingF), SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), + SPECIES_SPRITE(XATU, gMonFrontPic_XatuF), + SPECIES_SPRITE(POLITOED, gMonFrontPic_PolitoedF), + SPECIES_SPRITE(MEDITITE, gMonFrontPic_MedititeF), + SPECIES_SPRITE(MEDICHAM, gMonFrontPic_MedichamF), + #if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF), @@ -1349,6 +1362,9 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(KRICKETUNE, gMonFrontPic_KricketuneF), SPECIES_SPRITE(SHINX, gMonFrontPic_ShinxF), SPECIES_SPRITE(COMBEE, gMonFrontPic_Combee), + SPECIES_SPRITE(GIBLE, gMonFrontPic_GibleF), + SPECIES_SPRITE(GABITE, gMonFrontPic_GabiteF), + SPECIES_SPRITE(GARCHOMP, gMonFrontPic_GarchompF), SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_Hippopotas), SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon), #endif diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 0e6c99642..9a02a643c 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1338,9 +1338,21 @@ const struct CompressedSpritePalette gMonPaletteTable[] = const struct CompressedSpritePalette gMonPaletteTableFemale[] = { + SPECIES_PAL(PIKACHU, gMonPalette_Pikachu), + SPECIES_PAL(RAICHU, gMonPalette_Raichu), + SPECIES_PAL(GLOOM, gMonPalette_Gloom), + SPECIES_PAL(VILEPLUME, gMonPalette_Vileplume), + SPECIES_PAL(DODUO, gMonPalette_Doduo), + SPECIES_PAL(DODRIO, gMonPalette_Dodrio), + SPECIES_PAL(GOLDEEN, gMonPalette_Goldeen), + SPECIES_PAL(SEAKING, gMonPalette_Seaking), SPECIES_PAL(EEVEE, gMonPalette_Eevee), + SPECIES_PAL(XATU, gMonPalette_Xatu), + SPECIES_PAL(POLITOED, gMonPalette_Politoed), + SPECIES_PAL(MEDITITE, gMonPalette_Meditite), + SPECIES_PAL(MEDICHAM, gMonPalette_Medicham), + #if P_GEN_4_POKEMON == TRUE - SPECIES_PAL(COMBEE, gMonPalette_CombeeF), SPECIES_PAL(STARLY, gMonPalette_Starly), SPECIES_PAL(STARAVIA, gMonPalette_Staravia), SPECIES_PAL(STARAPTOR, gMonPalette_Staraptor), @@ -1348,6 +1360,10 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(KRICKETOT, gMonPalette_Kricketot), SPECIES_PAL(KRICKETUNE, gMonPalette_Kricketune), SPECIES_PAL(SHINX, gMonPalette_Shinx), + SPECIES_PAL(COMBEE, gMonPalette_CombeeF), + SPECIES_PAL(GIBLE, gMonPalette_Gible), + SPECIES_PAL(GABITE, gMonPalette_Gabite), + SPECIES_PAL(GARCHOMP, gMonPalette_Garchomp), SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF), SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF), #endif diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 0123b0e1f..be917da7d 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1337,7 +1337,20 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = { + SPECIES_SHINY_PAL(PIKACHU, gMonShinyPalette_Pikachu), + SPECIES_SHINY_PAL(RAICHU, gMonShinyPalette_Raichu), + SPECIES_SHINY_PAL(GLOOM, gMonShinyPalette_Gloom), + SPECIES_SHINY_PAL(VILEPLUME, gMonShinyPalette_Vileplume), + SPECIES_SHINY_PAL(DODUO, gMonShinyPalette_Doduo), + SPECIES_SHINY_PAL(DODRIO, gMonShinyPalette_Dodrio), + SPECIES_SHINY_PAL(GOLDEEN, gMonShinyPalette_Goldeen), + SPECIES_SHINY_PAL(SEAKING, gMonShinyPalette_Seaking), SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), + SPECIES_SHINY_PAL(XATU, gMonShinyPalette_Xatu), + SPECIES_SHINY_PAL(POLITOED, gMonShinyPalette_Politoed), + SPECIES_SHINY_PAL(MEDITITE, gMonShinyPalette_Meditite), + SPECIES_SHINY_PAL(MEDICHAM, gMonShinyPalette_Medicham), + #if P_GEN_4_POKEMON == TRUE SPECIES_SHINY_PAL(STARLY, gMonShinyPalette_Starly), SPECIES_SHINY_PAL(STARAVIA, gMonShinyPalette_Staravia), @@ -1347,6 +1360,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(KRICKETUNE, gMonShinyPalette_Kricketune), SPECIES_SHINY_PAL(SHINX, gMonShinyPalette_Shinx), SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_CombeeF), + SPECIES_SHINY_PAL(GIBLE, gMonShinyPalette_Gible), + SPECIES_SHINY_PAL(GABITE, gMonShinyPalette_Gabite), + SPECIES_SHINY_PAL(GARCHOMP, gMonShinyPalette_Garchomp), SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF), SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF), #endif diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 9255e1c03..620c4fade 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1300,7 +1300,19 @@ const u8 *const gMonIconTable[] = const u8 *const gMonIconTableFemale[] = { + [SPECIES_PIKACHU] = gMonIcon_Pikachu, + [SPECIES_RAICHU] = gMonIcon_Raichu, + [SPECIES_GLOOM] = gMonIcon_Gloom, + [SPECIES_VILEPLUME] = gMonIcon_Vileplume, + [SPECIES_DODUO] = gMonIcon_Doduo, + [SPECIES_DODRIO] = gMonIcon_Dodrio, + [SPECIES_GOLDEEN] = gMonIcon_Goldeen, + [SPECIES_SEAKING] = gMonIcon_Seaking, [SPECIES_EEVEE] = gMonIcon_Eevee, + [SPECIES_XATU] = gMonIcon_Xatu, + [SPECIES_POLITOED] = gMonIcon_Politoed, + [SPECIES_MEDITITE] = gMonIcon_Meditite, + [SPECIES_MEDICHAM] = gMonIcon_Medicham, #if P_GEN_4_POKEMON == TRUE [SPECIES_STARLY] = gMonIcon_Starly, [SPECIES_STARAVIA] = gMonIcon_Staravia, @@ -1310,6 +1322,9 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_KRICKETUNE] = gMonIcon_Kricketune, [SPECIES_SHINX] = gMonIcon_Shinx, [SPECIES_COMBEE] = gMonIcon_Combee, + [SPECIES_GIBLE] = gMonIcon_Gible, + [SPECIES_GABITE] = gMonIcon_Gabite, + [SPECIES_GARCHOMP] = gMonIcon_Garchomp, #if P_HIPPO_GENDER_DIFF_ICONS == TRUE [SPECIES_HIPPOPOTAS] = gMonIcon_HippopotasF, [SPECIES_HIPPOWDON] = gMonIcon_HippowdonF, @@ -2547,7 +2562,19 @@ const u8 gMonIconPaletteIndices[] = const u8 gMonIconPaletteIndicesFemale[] = { + [SPECIES_PIKACHU] = 2, + [SPECIES_RAICHU] = 0, + [SPECIES_GLOOM] = 0, + [SPECIES_VILEPLUME] = 0, + [SPECIES_DODUO] = 2, + [SPECIES_DODRIO] = 2, + [SPECIES_GOLDEEN] = 0, + [SPECIES_SEAKING] = 0, [SPECIES_EEVEE] = 2, + [SPECIES_XATU] = 1, + [SPECIES_POLITOED] = 1, + [SPECIES_MEDITITE] = 0, + [SPECIES_MEDICHAM] = 0, #if P_GEN_4_POKEMON == TRUE [SPECIES_STARLY] = 0, [SPECIES_STARAVIA] = 0, @@ -2556,6 +2583,9 @@ const u8 gMonIconPaletteIndicesFemale[] = [SPECIES_KRICKETUNE] = 2, [SPECIES_SHINX] = 0, [SPECIES_COMBEE] = 0, + [SPECIES_GIBLE] = 0, + [SPECIES_GABITE] = 0, + [SPECIES_GARCHOMP] = 0, [SPECIES_HIPPOPOTAS] = 1, [SPECIES_HIPPOWDON] = 1, #endif