diff --git a/graphics/pokemon/alakazam/anim_frontf.png b/graphics/pokemon/alakazam/anim_frontf.png new file mode 100644 index 0000000000..123b8f9304 Binary files /dev/null and b/graphics/pokemon/alakazam/anim_frontf.png differ diff --git a/graphics/pokemon/alakazam/backf.png b/graphics/pokemon/alakazam/backf.png new file mode 100644 index 0000000000..c52471aeae Binary files /dev/null and b/graphics/pokemon/alakazam/backf.png differ diff --git a/graphics/pokemon/butterfree/anim_frontf.png b/graphics/pokemon/butterfree/anim_frontf.png new file mode 100644 index 0000000000..94768a4e62 Binary files /dev/null and b/graphics/pokemon/butterfree/anim_frontf.png differ diff --git a/graphics/pokemon/butterfree/backf.png b/graphics/pokemon/butterfree/backf.png new file mode 100644 index 0000000000..5d5236cd4b Binary files /dev/null and b/graphics/pokemon/butterfree/backf.png differ diff --git a/graphics/pokemon/golbat/anim_frontf.png b/graphics/pokemon/golbat/anim_frontf.png new file mode 100644 index 0000000000..b90cc8e7cd Binary files /dev/null and b/graphics/pokemon/golbat/anim_frontf.png differ diff --git a/graphics/pokemon/golbat/backf.png b/graphics/pokemon/golbat/backf.png new file mode 100644 index 0000000000..2518aca816 Binary files /dev/null and b/graphics/pokemon/golbat/backf.png differ diff --git a/graphics/pokemon/gyarados/anim_frontf.png b/graphics/pokemon/gyarados/anim_frontf.png new file mode 100644 index 0000000000..46dc45b31d Binary files /dev/null and b/graphics/pokemon/gyarados/anim_frontf.png differ diff --git a/graphics/pokemon/gyarados/backf.png b/graphics/pokemon/gyarados/backf.png new file mode 100644 index 0000000000..e211e82b9b Binary files /dev/null and b/graphics/pokemon/gyarados/backf.png differ diff --git a/graphics/pokemon/hypno/anim_frontf.png b/graphics/pokemon/hypno/anim_frontf.png new file mode 100644 index 0000000000..692bb8933b Binary files /dev/null and b/graphics/pokemon/hypno/anim_frontf.png differ diff --git a/graphics/pokemon/hypno/backf.png b/graphics/pokemon/hypno/backf.png new file mode 100644 index 0000000000..a92c0b9917 Binary files /dev/null and b/graphics/pokemon/hypno/backf.png differ diff --git a/graphics/pokemon/kadabra/anim_frontf.png b/graphics/pokemon/kadabra/anim_frontf.png new file mode 100644 index 0000000000..4e2c40e41d Binary files /dev/null and b/graphics/pokemon/kadabra/anim_frontf.png differ diff --git a/graphics/pokemon/kadabra/backf.png b/graphics/pokemon/kadabra/backf.png new file mode 100644 index 0000000000..6e4d57eff0 Binary files /dev/null and b/graphics/pokemon/kadabra/backf.png differ diff --git a/graphics/pokemon/magikarp/anim_frontf.png b/graphics/pokemon/magikarp/anim_frontf.png new file mode 100644 index 0000000000..a7fc994069 Binary files /dev/null and b/graphics/pokemon/magikarp/anim_frontf.png differ diff --git a/graphics/pokemon/magikarp/backf.png b/graphics/pokemon/magikarp/backf.png new file mode 100644 index 0000000000..edf58cb1fb Binary files /dev/null and b/graphics/pokemon/magikarp/backf.png differ diff --git a/graphics/pokemon/raticate/anim_frontf.png b/graphics/pokemon/raticate/anim_frontf.png new file mode 100644 index 0000000000..11f8feac13 Binary files /dev/null and b/graphics/pokemon/raticate/anim_frontf.png differ diff --git a/graphics/pokemon/raticate/backf.png b/graphics/pokemon/raticate/backf.png new file mode 100644 index 0000000000..3812d02ddb Binary files /dev/null and b/graphics/pokemon/raticate/backf.png differ diff --git a/graphics/pokemon/rattata/anim_frontf.png b/graphics/pokemon/rattata/anim_frontf.png new file mode 100644 index 0000000000..e3aef3a76a Binary files /dev/null and b/graphics/pokemon/rattata/anim_frontf.png differ diff --git a/graphics/pokemon/rattata/backf.png b/graphics/pokemon/rattata/backf.png new file mode 100644 index 0000000000..ca7c693dfe Binary files /dev/null and b/graphics/pokemon/rattata/backf.png differ diff --git a/graphics/pokemon/rhydon/anim_frontf.png b/graphics/pokemon/rhydon/anim_frontf.png new file mode 100644 index 0000000000..31fdb1e04f Binary files /dev/null and b/graphics/pokemon/rhydon/anim_frontf.png differ diff --git a/graphics/pokemon/rhydon/backf.png b/graphics/pokemon/rhydon/backf.png new file mode 100644 index 0000000000..4e40dc7798 Binary files /dev/null and b/graphics/pokemon/rhydon/backf.png differ diff --git a/graphics/pokemon/rhyhorn/anim_frontf.png b/graphics/pokemon/rhyhorn/anim_frontf.png new file mode 100644 index 0000000000..c086ed4d96 Binary files /dev/null and b/graphics/pokemon/rhyhorn/anim_frontf.png differ diff --git a/graphics/pokemon/rhyhorn/backf.png b/graphics/pokemon/rhyhorn/backf.png new file mode 100644 index 0000000000..c5a253b3be Binary files /dev/null and b/graphics/pokemon/rhyhorn/backf.png differ diff --git a/graphics/pokemon/rhyperior/anim_frontf.png b/graphics/pokemon/rhyperior/anim_frontf.png new file mode 100644 index 0000000000..a7f3733932 Binary files /dev/null and b/graphics/pokemon/rhyperior/anim_frontf.png differ diff --git a/graphics/pokemon/rhyperior/backf.png b/graphics/pokemon/rhyperior/backf.png new file mode 100644 index 0000000000..a976be2244 Binary files /dev/null and b/graphics/pokemon/rhyperior/backf.png differ diff --git a/graphics/pokemon/scizor/anim_frontf.png b/graphics/pokemon/scizor/anim_frontf.png new file mode 100644 index 0000000000..161c28cb5b Binary files /dev/null and b/graphics/pokemon/scizor/anim_frontf.png differ diff --git a/graphics/pokemon/scyther/anim_frontf.png b/graphics/pokemon/scyther/anim_frontf.png new file mode 100644 index 0000000000..38d5b859e7 Binary files /dev/null and b/graphics/pokemon/scyther/anim_frontf.png differ diff --git a/graphics/pokemon/venusaur/anim_frontf.png b/graphics/pokemon/venusaur/anim_frontf.png new file mode 100644 index 0000000000..57aec12940 Binary files /dev/null and b/graphics/pokemon/venusaur/anim_frontf.png differ diff --git a/graphics/pokemon/venusaur/backf.png b/graphics/pokemon/venusaur/backf.png new file mode 100644 index 0000000000..7c8661f8b3 Binary files /dev/null and b/graphics/pokemon/venusaur/backf.png differ diff --git a/graphics/pokemon/zubat/anim_frontf.png b/graphics/pokemon/zubat/anim_frontf.png new file mode 100644 index 0000000000..f0cd843a44 Binary files /dev/null and b/graphics/pokemon/zubat/anim_frontf.png differ diff --git a/graphics/pokemon/zubat/backf.png b/graphics/pokemon/zubat/backf.png new file mode 100644 index 0000000000..59ad49e138 Binary files /dev/null and b/graphics/pokemon/zubat/backf.png differ diff --git a/include/graphics.h b/include/graphics.h index 06b56f0817..a42b14fe67 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -70,6 +70,7 @@ extern const u32 gMonFrontPic_DoubleQuestionMark[]; extern const u32 gMonFrontPic_Bulbasaur[]; extern const u32 gMonFrontPic_Ivysaur[]; extern const u32 gMonFrontPic_Venusaur[]; +extern const u32 gMonFrontPic_VenusaurF[]; extern const u32 gMonFrontPic_Charmander[]; extern const u32 gMonFrontPic_Charmeleon[]; extern const u32 gMonFrontPic_Charizard[]; @@ -79,6 +80,7 @@ extern const u32 gMonFrontPic_Blastoise[]; extern const u32 gMonFrontPic_Caterpie[]; extern const u32 gMonFrontPic_Metapod[]; extern const u32 gMonFrontPic_Butterfree[]; +extern const u32 gMonFrontPic_ButterfreeF[]; extern const u32 gMonFrontPic_Weedle[]; extern const u32 gMonFrontPic_Kakuna[]; extern const u32 gMonFrontPic_Beedrill[]; @@ -86,7 +88,9 @@ extern const u32 gMonFrontPic_Pidgey[]; extern const u32 gMonFrontPic_Pidgeotto[]; extern const u32 gMonFrontPic_Pidgeot[]; extern const u32 gMonFrontPic_Rattata[]; +extern const u32 gMonFrontPic_RattataF[]; extern const u32 gMonFrontPic_Raticate[]; +extern const u32 gMonFrontPic_RaticateF[]; extern const u32 gMonFrontPic_Spearow[]; extern const u32 gMonFrontPic_Fearow[]; extern const u32 gMonFrontPic_Ekans[]; @@ -110,7 +114,9 @@ extern const u32 gMonFrontPic_Ninetales[]; extern const u32 gMonFrontPic_Jigglypuff[]; extern const u32 gMonFrontPic_Wigglytuff[]; extern const u32 gMonFrontPic_Zubat[]; +extern const u32 gMonFrontPic_ZubatF[]; extern const u32 gMonFrontPic_Golbat[]; +extern const u32 gMonFrontPic_GolbatF[]; extern const u32 gMonFrontPic_Oddish[]; extern const u32 gMonFrontPic_Gloom[]; extern const u32 gMonFrontPic_GloomF[]; @@ -135,7 +141,9 @@ extern const u32 gMonFrontPic_Poliwhirl[]; extern const u32 gMonFrontPic_Poliwrath[]; extern const u32 gMonFrontPic_Abra[]; extern const u32 gMonFrontPic_Kadabra[]; +extern const u32 gMonFrontPic_KadabraF[]; extern const u32 gMonFrontPic_Alakazam[]; +extern const u32 gMonFrontPic_AlakazamF[]; extern const u32 gMonFrontPic_Machop[]; extern const u32 gMonFrontPic_Machoke[]; extern const u32 gMonFrontPic_Machamp[]; @@ -170,6 +178,7 @@ extern const u32 gMonFrontPic_Gengar[]; extern const u32 gMonFrontPic_Onix[]; extern const u32 gMonFrontPic_Drowzee[]; extern const u32 gMonFrontPic_Hypno[]; +extern const u32 gMonFrontPic_HypnoF[]; extern const u32 gMonFrontPic_Krabby[]; extern const u32 gMonFrontPic_Kingler[]; extern const u32 gMonFrontPic_Voltorb[]; @@ -184,7 +193,9 @@ extern const u32 gMonFrontPic_Lickitung[]; extern const u32 gMonFrontPic_Koffing[]; extern const u32 gMonFrontPic_Weezing[]; extern const u32 gMonFrontPic_Rhyhorn[]; +extern const u32 gMonFrontPic_RhyhornF[]; extern const u32 gMonFrontPic_Rhydon[]; +extern const u32 gMonFrontPic_RhydonF[]; extern const u32 gMonFrontPic_Chansey[]; extern const u32 gMonFrontPic_Tangela[]; extern const u32 gMonFrontPic_Kangaskhan[]; @@ -198,13 +209,16 @@ extern const u32 gMonFrontPic_Staryu[]; extern const u32 gMonFrontPic_Starmie[]; extern const u32 gMonFrontPic_MrMime[]; extern const u32 gMonFrontPic_Scyther[]; +extern const u32 gMonFrontPic_ScytherF[]; extern const u32 gMonFrontPic_Jynx[]; extern const u32 gMonFrontPic_Electabuzz[]; extern const u32 gMonFrontPic_Magmar[]; extern const u32 gMonFrontPic_Pinsir[]; extern const u32 gMonFrontPic_Tauros[]; extern const u32 gMonFrontPic_Magikarp[]; +extern const u32 gMonFrontPic_MagikarpF[]; extern const u32 gMonFrontPic_Gyarados[]; +extern const u32 gMonFrontPic_GyaradosF[]; extern const u32 gMonFrontPic_Lapras[]; extern const u32 gMonFrontPic_Ditto[]; extern const u32 gMonFrontPic_Eevee[]; @@ -290,6 +304,7 @@ extern const u32 gMonFrontPic_Snubbull[]; extern const u32 gMonFrontPic_Granbull[]; extern const u32 gMonFrontPic_Qwilfish[]; extern const u32 gMonFrontPic_Scizor[]; +extern const u32 gMonFrontPic_ScizorF[]; extern const u32 gMonFrontPic_Shuckle[]; extern const u32 gMonFrontPic_Heracross[]; extern const u32 gMonFrontPic_Sneasel[]; @@ -555,6 +570,7 @@ extern const u32 gMonFrontPic_Weavile[]; extern const u32 gMonFrontPic_Magnezone[]; extern const u32 gMonFrontPic_Lickilicky[]; extern const u32 gMonFrontPic_Rhyperior[]; +extern const u32 gMonFrontPic_RhyperiorF[]; extern const u32 gMonFrontPic_Tangrowth[]; extern const u32 gMonFrontPic_Electivire[]; extern const u32 gMonFrontPic_Magmortar[]; @@ -1300,6 +1316,7 @@ extern const u32 gMonBackPic_DoubleQuestionMark[]; extern const u32 gMonBackPic_Bulbasaur[]; extern const u32 gMonBackPic_Ivysaur[]; extern const u32 gMonBackPic_Venusaur[]; +extern const u32 gMonBackPic_VenusaurF[]; extern const u32 gMonBackPic_Charmander[]; extern const u32 gMonBackPic_Charmeleon[]; extern const u32 gMonBackPic_Charizard[]; @@ -1309,6 +1326,7 @@ extern const u32 gMonBackPic_Blastoise[]; extern const u32 gMonBackPic_Caterpie[]; extern const u32 gMonBackPic_Metapod[]; extern const u32 gMonBackPic_Butterfree[]; +extern const u32 gMonBackPic_ButterfreeF[]; extern const u32 gMonBackPic_Weedle[]; extern const u32 gMonBackPic_Kakuna[]; extern const u32 gMonBackPic_Beedrill[]; @@ -1316,7 +1334,9 @@ extern const u32 gMonBackPic_Pidgey[]; extern const u32 gMonBackPic_Pidgeotto[]; extern const u32 gMonBackPic_Pidgeot[]; extern const u32 gMonBackPic_Rattata[]; +extern const u32 gMonBackPic_RattataF[]; extern const u32 gMonBackPic_Raticate[]; +extern const u32 gMonBackPic_RaticateF[]; extern const u32 gMonBackPic_Spearow[]; extern const u32 gMonBackPic_Fearow[]; extern const u32 gMonBackPic_Ekans[]; @@ -1339,7 +1359,9 @@ extern const u32 gMonBackPic_Ninetales[]; extern const u32 gMonBackPic_Jigglypuff[]; extern const u32 gMonBackPic_Wigglytuff[]; extern const u32 gMonBackPic_Zubat[]; +extern const u32 gMonBackPic_ZubatF[]; extern const u32 gMonBackPic_Golbat[]; +extern const u32 gMonBackPic_GolbatF[]; extern const u32 gMonBackPic_Oddish[]; extern const u32 gMonBackPic_Gloom[]; extern const u32 gMonBackPic_GloomF[]; @@ -1364,7 +1386,9 @@ extern const u32 gMonBackPic_Poliwhirl[]; extern const u32 gMonBackPic_Poliwrath[]; extern const u32 gMonBackPic_Abra[]; extern const u32 gMonBackPic_Kadabra[]; +extern const u32 gMonBackPic_KadabraF[]; extern const u32 gMonBackPic_Alakazam[]; +extern const u32 gMonBackPic_AlakazamF[]; extern const u32 gMonBackPic_Machop[]; extern const u32 gMonBackPic_Machoke[]; extern const u32 gMonBackPic_Machamp[]; @@ -1399,6 +1423,7 @@ extern const u32 gMonBackPic_Gengar[]; extern const u32 gMonBackPic_Onix[]; extern const u32 gMonBackPic_Drowzee[]; extern const u32 gMonBackPic_Hypno[]; +extern const u32 gMonBackPic_HypnoF[]; extern const u32 gMonBackPic_Krabby[]; extern const u32 gMonBackPic_Kingler[]; extern const u32 gMonBackPic_Voltorb[]; @@ -1413,7 +1438,9 @@ extern const u32 gMonBackPic_Lickitung[]; extern const u32 gMonBackPic_Koffing[]; extern const u32 gMonBackPic_Weezing[]; extern const u32 gMonBackPic_Rhyhorn[]; +extern const u32 gMonBackPic_RhyhornF[]; extern const u32 gMonBackPic_Rhydon[]; +extern const u32 gMonBackPic_RhydonF[]; extern const u32 gMonBackPic_Chansey[]; extern const u32 gMonBackPic_Tangela[]; extern const u32 gMonBackPic_Kangaskhan[]; @@ -1433,7 +1460,9 @@ extern const u32 gMonBackPic_Magmar[]; extern const u32 gMonBackPic_Pinsir[]; extern const u32 gMonBackPic_Tauros[]; extern const u32 gMonBackPic_Magikarp[]; +extern const u32 gMonBackPic_MagikarpF[]; extern const u32 gMonBackPic_Gyarados[]; +extern const u32 gMonBackPic_GyaradosF[]; extern const u32 gMonBackPic_Lapras[]; extern const u32 gMonBackPic_Ditto[]; extern const u32 gMonBackPic_Eevee[]; @@ -1781,6 +1810,7 @@ extern const u32 gMonBackPic_Weavile[]; extern const u32 gMonBackPic_Magnezone[]; extern const u32 gMonBackPic_Lickilicky[]; extern const u32 gMonBackPic_Rhyperior[]; +extern const u32 gMonBackPic_RhyperiorF[]; extern const u32 gMonBackPic_Tangrowth[]; extern const u32 gMonBackPic_Electivire[]; extern const u32 gMonBackPic_Magmortar[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 6b5ee4093a..ae93b05bcc 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -3,6 +3,7 @@ const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/quest const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/anim_front.4bpp.lz"); const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/anim_front.4bpp.lz"); +const u32 gMonFrontPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/anim_front.4bpp.lz"); const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/anim_front.4bpp.lz"); @@ -12,6 +13,7 @@ const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/anim const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/anim_front.4bpp.lz"); const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/anim_front.4bpp.lz"); const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/anim_front.4bpp.lz"); const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/anim_front.4bpp.lz"); @@ -19,7 +21,9 @@ const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/anim_front const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/anim_front.4bpp.lz"); const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/anim_front.4bpp.lz"); const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/anim_front.4bpp.lz"); @@ -43,7 +47,9 @@ const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/anim const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/anim_front.4bpp.lz"); const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/anim_frontf.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"); @@ -68,7 +74,9 @@ const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/anim const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/anim_front.4bpp.lz"); const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/anim_front.4bpp.lz"); +const u32 gMonFrontPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/anim_front.4bpp.lz"); +const u32 gMonFrontPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/anim_front.4bpp.lz"); const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/anim_front.4bpp.lz"); const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/anim_front.4bpp.lz"); @@ -103,6 +111,7 @@ const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/anim_front const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/anim_front.4bpp.lz"); const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/anim_front.4bpp.lz"); const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/anim_front.4bpp.lz"); +const u32 gMonFrontPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/anim_front.4bpp.lz"); const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/anim_front.4bpp.lz"); @@ -117,7 +126,9 @@ const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/anim const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/anim_front.4bpp.lz"); const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/anim_front.4bpp.lz"); const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/anim_front.4bpp.lz"); const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/anim_front.4bpp.lz"); const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/anim_front.4bpp.lz"); @@ -131,13 +142,16 @@ const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front 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"); const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ScytherF[] = INCBIN_U32("graphics/pokemon/scyther/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz"); const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz"); const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/anim_front.4bpp.lz"); const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/anim_front.4bpp.lz"); const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/anim_front.4bpp.lz"); const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/anim_front.4bpp.lz"); @@ -223,6 +237,7 @@ const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/anim_f const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/anim_front.4bpp.lz"); const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/anim_front.4bpp.lz"); const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ScizorF[] = INCBIN_U32("graphics/pokemon/scizor/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/anim_front.4bpp.lz"); const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/anim_front.4bpp.lz"); @@ -488,6 +503,7 @@ const u32 gMonFrontPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/anim_fro const u32 gMonFrontPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/anim_front.4bpp.lz"); const u32 gMonFrontPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_front.4bpp.lz"); +const u32 gMonFrontPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_front.4bpp.lz"); const u32 gMonFrontPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/anim_front.4bpp.lz"); const u32 gMonFrontPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/anim_front.4bpp.lz"); @@ -1231,6 +1247,7 @@ const u32 gMonBackPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/questi const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/back.4bpp.lz"); const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/back.4bpp.lz"); const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/back.4bpp.lz"); +const u32 gMonBackPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/backf.4bpp.lz"); const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/back.4bpp.lz"); const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/back.4bpp.lz"); const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/back.4bpp.lz"); @@ -1240,6 +1257,7 @@ const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/back. const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/back.4bpp.lz"); const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/back.4bpp.lz"); const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/back.4bpp.lz"); +const u32 gMonBackPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/backf.4bpp.lz"); const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/back.4bpp.lz"); const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/back.4bpp.lz"); const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/back.4bpp.lz"); @@ -1247,7 +1265,9 @@ const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/back.4bpp.l const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/back.4bpp.lz"); const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/back.4bpp.lz"); const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/back.4bpp.lz"); +const u32 gMonBackPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/backf.4bpp.lz"); const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/back.4bpp.lz"); +const u32 gMonBackPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/backf.4bpp.lz"); const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/back.4bpp.lz"); const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/back.4bpp.lz"); const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/back.4bpp.lz"); @@ -1270,7 +1290,9 @@ const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/back. const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/back.4bpp.lz"); const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/back.4bpp.lz"); const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/back.4bpp.lz"); +const u32 gMonBackPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/backf.4bpp.lz"); const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/back.4bpp.lz"); +const u32 gMonBackPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/backf.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"); @@ -1295,7 +1317,9 @@ const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/back. const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/back.4bpp.lz"); const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/back.4bpp.lz"); const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/back.4bpp.lz"); +const u32 gMonBackPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/backf.4bpp.lz"); const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/back.4bpp.lz"); +const u32 gMonBackPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/backf.4bpp.lz"); const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/back.4bpp.lz"); const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/back.4bpp.lz"); const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/back.4bpp.lz"); @@ -1330,6 +1354,7 @@ const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/back.4bpp.l const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/back.4bpp.lz"); const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/back.4bpp.lz"); const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/back.4bpp.lz"); +const u32 gMonBackPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/backf.4bpp.lz"); const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/back.4bpp.lz"); const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/back.4bpp.lz"); const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/back.4bpp.lz"); @@ -1344,7 +1369,9 @@ const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/back. const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/back.4bpp.lz"); const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/back.4bpp.lz"); const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/back.4bpp.lz"); +const u32 gMonBackPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/backf.4bpp.lz"); const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/back.4bpp.lz"); +const u32 gMonBackPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/backf.4bpp.lz"); const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/back.4bpp.lz"); const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/back.4bpp.lz"); const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/back.4bpp.lz"); @@ -1364,7 +1391,9 @@ const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/back.4bpp.l const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/back.4bpp.lz"); const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/back.4bpp.lz"); const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/back.4bpp.lz"); +const u32 gMonBackPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/backf.4bpp.lz"); const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/back.4bpp.lz"); +const u32 gMonBackPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/backf.4bpp.lz"); const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/back.4bpp.lz"); const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/back.4bpp.lz"); const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/back.4bpp.lz"); @@ -1712,6 +1741,7 @@ const u32 gMonBackPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/back.4bpp const u32 gMonBackPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/back.4bpp.lz"); const u32 gMonBackPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/back.4bpp.lz"); const u32 gMonBackPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/back.4bpp.lz"); +const u32 gMonBackPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/backf.4bpp.lz"); const u32 gMonBackPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/back.4bpp.lz"); const u32 gMonBackPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/back.4bpp.lz"); const u32 gMonBackPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/back.4bpp.lz"); diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index cbe0955b61..9b44aaea5e 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -905,6 +905,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL}, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_CHARMANDER] = @@ -1111,6 +1112,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_COMPOUND_EYES, ABILITY_NONE, ABILITY_TINTED_LENS}, .bodyColor = BODY_COLOR_WHITE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_WEEDLE] = @@ -1275,6 +1277,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_RUN_AWAY, ABILITY_GUTS, ABILITY_HUSTLE}, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_RATICATE] = @@ -1297,6 +1300,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_RUN_AWAY, ABILITY_GUTS, ABILITY_HUSTLE}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SPEAROW] = @@ -1795,6 +1799,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_INNER_FOCUS, ABILITY_NONE, ABILITY_INFILTRATOR}, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_GOLBAT] = @@ -1817,6 +1822,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_INNER_FOCUS, ABILITY_NONE, ABILITY_INFILTRATOR}, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_ODDISH] = @@ -2333,6 +2339,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SYNCHRONIZE, ABILITY_INNER_FOCUS, ABILITY_MAGIC_GUARD}, .bodyColor = BODY_COLOR_BROWN, .noFlip = TRUE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_ALAKAZAM] = @@ -2360,6 +2367,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SYNCHRONIZE, ABILITY_INNER_FOCUS, ABILITY_MAGIC_GUARD}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_MACHOP] = @@ -3108,6 +3116,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_INSOMNIA, ABILITY_FOREWARN, ABILITY_INNER_FOCUS}, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_KRABBY] = @@ -3430,6 +3439,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_LIGHTNING_ROD, ABILITY_ROCK_HEAD, ABILITY_RECKLESS}, .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_RHYDON] = @@ -3452,6 +3462,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_LIGHTNING_ROD, ABILITY_ROCK_HEAD, ABILITY_RECKLESS}, .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_CHANSEY] = @@ -3710,6 +3721,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWARM, ABILITY_TECHNICIAN, ABILITY_STEADFAST}, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_JYNX] = @@ -3845,6 +3857,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWIFT_SWIM, ABILITY_NONE, ABILITY_RATTLED}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_GYARADOS] = @@ -3867,6 +3880,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_INTIMIDATE, ABILITY_NONE, ABILITY_MOXIE}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_LAPRAS] = @@ -5729,6 +5743,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWARM, ABILITY_TECHNICIAN, ABILITY_LIGHT_METAL}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SHUCKLE] = @@ -11493,6 +11508,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_LIGHTNING_ROD, ABILITY_SOLID_ROCK, ABILITY_RECKLESS}, .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_TANGROWTH] = diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 563eb436e9..0d95a5d954 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1340,17 +1340,32 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = const struct CompressedSpriteSheet gMonBackPicTableFemale[] = { + SPECIES_SPRITE(VENUSAUR, gMonBackPic_VenusaurF), + SPECIES_SPRITE(BUTTERFREE, gMonBackPic_ButterfreeF), + 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), SPECIES_SPRITE(VILEPLUME, gMonBackPic_VileplumeF), + SPECIES_SPRITE(KADABRA, gMonBackPic_KadabraF), + SPECIES_SPRITE(ALAKAZAM, gMonBackPic_AlakazamF), SPECIES_SPRITE(DODUO, gMonBackPic_DoduoF), SPECIES_SPRITE(DODRIO, gMonBackPic_DodrioF), + SPECIES_SPRITE(HYPNO, gMonBackPic_HypnoF), + SPECIES_SPRITE(RHYHORN, gMonBackPic_RhyhornF), + 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(XATU, gMonBackPic_Xatu), SPECIES_SPRITE(POLITOED, gMonBackPic_PolitoedF), + SPECIES_SPRITE(SCIZOR, gMonBackPic_Scizor), SPECIES_SPRITE(MEDITITE, gMonBackPic_MedititeF), SPECIES_SPRITE(MEDICHAM, gMonBackPic_MedichamF), @@ -1368,6 +1383,7 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = SPECIES_SPRITE(GARCHOMP, gMonBackPic_Garchomp), SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_Hippopotas), SPECIES_SPRITE(HIPPOWDON, gMonBackPic_Hippowdon), + SPECIES_SPRITE(RHYPERIOR, gMonBackPic_RhyperiorF), #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 f416433aff..df7562c94d 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1339,17 +1339,32 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = { + SPECIES_SPRITE(VENUSAUR, gMonFrontPic_VenusaurF), + SPECIES_SPRITE(BUTTERFREE, gMonFrontPic_ButterfreeF), + SPECIES_SPRITE(RATTATA, gMonFrontPic_RattataF), + SPECIES_SPRITE(RATICATE, gMonFrontPic_RaticateF), SPECIES_SPRITE(PIKACHU, gMonFrontPic_PikachuF), SPECIES_SPRITE(RAICHU, gMonFrontPic_RaichuF), + SPECIES_SPRITE(ZUBAT, gMonFrontPic_ZubatF), + SPECIES_SPRITE(GOLBAT, gMonFrontPic_GolbatF), SPECIES_SPRITE(GLOOM, gMonFrontPic_GloomF), SPECIES_SPRITE(VILEPLUME, gMonFrontPic_VileplumeF), + SPECIES_SPRITE(KADABRA, gMonFrontPic_KadabraF), + SPECIES_SPRITE(ALAKAZAM, gMonFrontPic_AlakazamF), SPECIES_SPRITE(DODUO, gMonFrontPic_DoduoF), SPECIES_SPRITE(DODRIO, gMonFrontPic_DodrioF), + SPECIES_SPRITE(HYPNO, gMonFrontPic_HypnoF), + SPECIES_SPRITE(RHYHORN, gMonFrontPic_RhyhornF), + SPECIES_SPRITE(RHYDON, gMonFrontPic_RhydonF), SPECIES_SPRITE(GOLDEEN, gMonFrontPic_GoldeenF), SPECIES_SPRITE(SEAKING, gMonFrontPic_SeakingF), + SPECIES_SPRITE(SCYTHER, gMonFrontPic_ScytherF), + SPECIES_SPRITE(MAGIKARP, gMonFrontPic_MagikarpF), + SPECIES_SPRITE(GYARADOS, gMonFrontPic_GyaradosF), SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), SPECIES_SPRITE(XATU, gMonFrontPic_XatuF), SPECIES_SPRITE(POLITOED, gMonFrontPic_PolitoedF), + SPECIES_SPRITE(SCIZOR, gMonFrontPic_ScizorF), SPECIES_SPRITE(MEDITITE, gMonFrontPic_MedititeF), SPECIES_SPRITE(MEDICHAM, gMonFrontPic_MedichamF), @@ -1367,6 +1382,7 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(GARCHOMP, gMonFrontPic_GarchompF), SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_Hippopotas), SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon), + SPECIES_SPRITE(RHYPERIOR, gMonFrontPic_RhyperiorF), #endif #if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 9a02a643c8..dea22fc54e 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1338,17 +1338,32 @@ const struct CompressedSpritePalette gMonPaletteTable[] = const struct CompressedSpritePalette gMonPaletteTableFemale[] = { + SPECIES_PAL(VENUSAUR, gMonPalette_Venusaur), + SPECIES_PAL(BUTTERFREE, gMonPalette_Butterfree), + SPECIES_PAL(RATTATA, gMonPalette_Rattata), + SPECIES_PAL(RATICATE, gMonPalette_Raticate), SPECIES_PAL(PIKACHU, gMonPalette_Pikachu), SPECIES_PAL(RAICHU, gMonPalette_Raichu), + SPECIES_PAL(ZUBAT, gMonPalette_Zubat), + SPECIES_PAL(GOLBAT, gMonPalette_Golbat), SPECIES_PAL(GLOOM, gMonPalette_Gloom), SPECIES_PAL(VILEPLUME, gMonPalette_Vileplume), + SPECIES_PAL(KADABRA, gMonPalette_Kadabra), + SPECIES_PAL(ALAKAZAM, gMonPalette_Alakazam), SPECIES_PAL(DODUO, gMonPalette_Doduo), SPECIES_PAL(DODRIO, gMonPalette_Dodrio), + SPECIES_PAL(HYPNO, gMonPalette_Hypno), + SPECIES_PAL(RHYHORN, gMonPalette_Rhyhorn), + SPECIES_PAL(RHYDON, gMonPalette_Rhydon), SPECIES_PAL(GOLDEEN, gMonPalette_Goldeen), SPECIES_PAL(SEAKING, gMonPalette_Seaking), + SPECIES_PAL(SCYTHER, gMonPalette_Scyther), + SPECIES_PAL(MAGIKARP, gMonPalette_Magikarp), + SPECIES_PAL(GYARADOS, gMonPalette_Gyarados), SPECIES_PAL(EEVEE, gMonPalette_Eevee), SPECIES_PAL(XATU, gMonPalette_Xatu), SPECIES_PAL(POLITOED, gMonPalette_Politoed), + SPECIES_PAL(SCIZOR, gMonPalette_Scizor), SPECIES_PAL(MEDITITE, gMonPalette_Meditite), SPECIES_PAL(MEDICHAM, gMonPalette_Medicham), @@ -1366,6 +1381,7 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(GARCHOMP, gMonPalette_Garchomp), SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF), SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF), + SPECIES_PAL(RHYPERIOR, gMonPalette_Rhyperior), #endif #if P_GEN_5_POKEMON == TRUE SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index be917da7d4..71fa8f0fb7 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1337,17 +1337,32 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = { + SPECIES_SHINY_PAL(VENUSAUR, gMonShinyPalette_Venusaur), + SPECIES_SHINY_PAL(BUTTERFREE, gMonShinyPalette_Butterfree), + SPECIES_SHINY_PAL(RATTATA, gMonShinyPalette_Rattata), + SPECIES_SHINY_PAL(RATICATE, gMonShinyPalette_Raticate), SPECIES_SHINY_PAL(PIKACHU, gMonShinyPalette_Pikachu), SPECIES_SHINY_PAL(RAICHU, gMonShinyPalette_Raichu), + SPECIES_SHINY_PAL(ZUBAT, gMonShinyPalette_Zubat), + SPECIES_SHINY_PAL(GOLBAT, gMonShinyPalette_Golbat), SPECIES_SHINY_PAL(GLOOM, gMonShinyPalette_Gloom), SPECIES_SHINY_PAL(VILEPLUME, gMonShinyPalette_Vileplume), + SPECIES_SHINY_PAL(KADABRA, gMonShinyPalette_Kadabra), + SPECIES_SHINY_PAL(ALAKAZAM, gMonShinyPalette_Alakazam), SPECIES_SHINY_PAL(DODUO, gMonShinyPalette_Doduo), SPECIES_SHINY_PAL(DODRIO, gMonShinyPalette_Dodrio), + SPECIES_SHINY_PAL(HYPNO, gMonShinyPalette_Hypno), + SPECIES_SHINY_PAL(RHYHORN, gMonShinyPalette_Rhyhorn), + SPECIES_SHINY_PAL(RHYDON, gMonShinyPalette_Rhydon), SPECIES_SHINY_PAL(GOLDEEN, gMonShinyPalette_Goldeen), SPECIES_SHINY_PAL(SEAKING, gMonShinyPalette_Seaking), + SPECIES_SHINY_PAL(SCYTHER, gMonShinyPalette_Scyther), + SPECIES_SHINY_PAL(MAGIKARP, gMonShinyPalette_Magikarp), + SPECIES_SHINY_PAL(GYARADOS, gMonShinyPalette_Gyarados), SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), SPECIES_SHINY_PAL(XATU, gMonShinyPalette_Xatu), SPECIES_SHINY_PAL(POLITOED, gMonShinyPalette_Politoed), + SPECIES_SHINY_PAL(SCIZOR, gMonShinyPalette_Scizor), SPECIES_SHINY_PAL(MEDITITE, gMonShinyPalette_Meditite), SPECIES_SHINY_PAL(MEDICHAM, gMonShinyPalette_Medicham), @@ -1365,6 +1380,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(GARCHOMP, gMonShinyPalette_Garchomp), SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF), SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF), + SPECIES_SHINY_PAL(RHYPERIOR, gMonShinyPalette_Rhyperior), #endif #if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(UNFEZANT, gMonShinyPalette_UnfezantF), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 620c4fade3..837f8f3e85 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1300,17 +1300,32 @@ const u8 *const gMonIconTable[] = const u8 *const gMonIconTableFemale[] = { + [SPECIES_VENUSAUR] = gMonIcon_Venusaur, + [SPECIES_BUTTERFREE] = gMonIcon_Butterfree, + [SPECIES_RATTATA] = gMonIcon_Rattata, + [SPECIES_RATICATE] = gMonIcon_Raticate, [SPECIES_PIKACHU] = gMonIcon_Pikachu, [SPECIES_RAICHU] = gMonIcon_Raichu, + [SPECIES_ZUBAT] = gMonIcon_Zubat, + [SPECIES_GOLBAT] = gMonIcon_Golbat, [SPECIES_GLOOM] = gMonIcon_Gloom, [SPECIES_VILEPLUME] = gMonIcon_Vileplume, + [SPECIES_KADABRA] = gMonIcon_Kadabra, + [SPECIES_ALAKAZAM] = gMonIcon_Alakazam, [SPECIES_DODUO] = gMonIcon_Doduo, [SPECIES_DODRIO] = gMonIcon_Dodrio, + [SPECIES_HYPNO] = gMonIcon_Hypno, + [SPECIES_RHYHORN] = gMonIcon_Rhyhorn, + [SPECIES_RHYDON] = gMonIcon_Rhydon, [SPECIES_GOLDEEN] = gMonIcon_Goldeen, [SPECIES_SEAKING] = gMonIcon_Seaking, + [SPECIES_SCYTHER] = gMonIcon_Scyther, + [SPECIES_MAGIKARP] = gMonIcon_Magikarp, + [SPECIES_GYARADOS] = gMonIcon_Gyarados, [SPECIES_EEVEE] = gMonIcon_Eevee, [SPECIES_XATU] = gMonIcon_Xatu, [SPECIES_POLITOED] = gMonIcon_Politoed, + [SPECIES_SCIZOR] = gMonIcon_Scizor, [SPECIES_MEDITITE] = gMonIcon_Meditite, [SPECIES_MEDICHAM] = gMonIcon_Medicham, #if P_GEN_4_POKEMON == TRUE @@ -1332,6 +1347,7 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, #endif + [SPECIES_RHYPERIOR] = gMonIcon_Rhyperior, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_UNFEZANT] = gMonIcon_UnfezantF, @@ -2562,17 +2578,32 @@ const u8 gMonIconPaletteIndices[] = const u8 gMonIconPaletteIndicesFemale[] = { + [SPECIES_VENUSAUR] = 4, + [SPECIES_BUTTERFREE] = 0, + [SPECIES_RATTATA] = 2, + [SPECIES_RATICATE] = 2, [SPECIES_PIKACHU] = 2, [SPECIES_RAICHU] = 0, + [SPECIES_ZUBAT] = 2, + [SPECIES_GOLBAT] = 2, [SPECIES_GLOOM] = 0, [SPECIES_VILEPLUME] = 0, + [SPECIES_KADABRA] = 2, + [SPECIES_ALAKAZAM] = 2, [SPECIES_DODUO] = 2, [SPECIES_DODRIO] = 2, + [SPECIES_HYPNO] = 2, + [SPECIES_RHYHORN] = 1, + [SPECIES_RHYDON] = 1, [SPECIES_GOLDEEN] = 0, [SPECIES_SEAKING] = 0, + [SPECIES_SCYTHER] = 1, + [SPECIES_MAGIKARP] = 0, + [SPECIES_GYARADOS] = 0, [SPECIES_EEVEE] = 2, [SPECIES_XATU] = 1, [SPECIES_POLITOED] = 1, + [SPECIES_SCIZOR] = 0, [SPECIES_MEDITITE] = 0, [SPECIES_MEDICHAM] = 0, #if P_GEN_4_POKEMON == TRUE @@ -2588,6 +2619,7 @@ const u8 gMonIconPaletteIndicesFemale[] = [SPECIES_GARCHOMP] = 0, [SPECIES_HIPPOPOTAS] = 1, [SPECIES_HIPPOWDON] = 1, + [SPECIES_RHYPERIOR] = 0, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_UNFEZANT] = 1,