diff --git a/graphics/pokemon/aipom/anim_front.png b/graphics/pokemon/aipom/anim_front.png index a6aebde28..d015b19b5 100644 Binary files a/graphics/pokemon/aipom/anim_front.png and b/graphics/pokemon/aipom/anim_front.png differ diff --git a/graphics/pokemon/aipom/anim_frontf.png b/graphics/pokemon/aipom/anim_frontf.png new file mode 100644 index 000000000..c4be36d24 Binary files /dev/null and b/graphics/pokemon/aipom/anim_frontf.png differ diff --git a/graphics/pokemon/aipom/backf.png b/graphics/pokemon/aipom/backf.png new file mode 100644 index 000000000..66e192be9 Binary files /dev/null and b/graphics/pokemon/aipom/backf.png differ diff --git a/graphics/pokemon/ambipom/anim_front.png b/graphics/pokemon/ambipom/anim_front.png index 4ac4f8a17..56ca2b37e 100644 Binary files a/graphics/pokemon/ambipom/anim_front.png and b/graphics/pokemon/ambipom/anim_front.png differ diff --git a/graphics/pokemon/ambipom/anim_frontf.png b/graphics/pokemon/ambipom/anim_frontf.png new file mode 100644 index 000000000..6754bcb23 Binary files /dev/null and b/graphics/pokemon/ambipom/anim_frontf.png differ diff --git a/graphics/pokemon/ambipom/back.png b/graphics/pokemon/ambipom/back.png index 6d8fc1cc9..3c628dace 100644 Binary files a/graphics/pokemon/ambipom/back.png and b/graphics/pokemon/ambipom/back.png differ diff --git a/graphics/pokemon/ambipom/backf.png b/graphics/pokemon/ambipom/backf.png new file mode 100644 index 000000000..357c4c40d Binary files /dev/null and b/graphics/pokemon/ambipom/backf.png differ diff --git a/graphics/pokemon/beautifly/anim_front.png b/graphics/pokemon/beautifly/anim_front.png index 63ee78df8..0b7789662 100644 Binary files a/graphics/pokemon/beautifly/anim_front.png and b/graphics/pokemon/beautifly/anim_front.png differ diff --git a/graphics/pokemon/beautifly/anim_frontf.png b/graphics/pokemon/beautifly/anim_frontf.png new file mode 100644 index 000000000..ad466f6ce Binary files /dev/null and b/graphics/pokemon/beautifly/anim_frontf.png differ diff --git a/graphics/pokemon/beautifly/back.png b/graphics/pokemon/beautifly/back.png index f52187c9f..4755a86ab 100644 Binary files a/graphics/pokemon/beautifly/back.png and b/graphics/pokemon/beautifly/back.png differ diff --git a/graphics/pokemon/beautifly/backf.png b/graphics/pokemon/beautifly/backf.png new file mode 100644 index 000000000..f52187c9f Binary files /dev/null and b/graphics/pokemon/beautifly/backf.png differ diff --git a/graphics/pokemon/blaziken/anim_frontf.png b/graphics/pokemon/blaziken/anim_frontf.png new file mode 100644 index 000000000..bc4905597 Binary files /dev/null and b/graphics/pokemon/blaziken/anim_frontf.png differ diff --git a/graphics/pokemon/blaziken/backf.png b/graphics/pokemon/blaziken/backf.png new file mode 100644 index 000000000..33651ce38 Binary files /dev/null and b/graphics/pokemon/blaziken/backf.png differ diff --git a/graphics/pokemon/combusken/anim_frontf.png b/graphics/pokemon/combusken/anim_frontf.png new file mode 100644 index 000000000..2620c50e5 Binary files /dev/null and b/graphics/pokemon/combusken/anim_frontf.png differ diff --git a/graphics/pokemon/combusken/backf.png b/graphics/pokemon/combusken/backf.png new file mode 100644 index 000000000..06330c530 Binary files /dev/null and b/graphics/pokemon/combusken/backf.png differ diff --git a/graphics/pokemon/donphan/anim_frontf.png b/graphics/pokemon/donphan/anim_frontf.png new file mode 100644 index 000000000..f4be5dc01 Binary files /dev/null and b/graphics/pokemon/donphan/anim_frontf.png differ diff --git a/graphics/pokemon/donphan/backf.png b/graphics/pokemon/donphan/backf.png new file mode 100644 index 000000000..3e2368563 Binary files /dev/null and b/graphics/pokemon/donphan/backf.png differ diff --git a/graphics/pokemon/dustox/anim_frontf.png b/graphics/pokemon/dustox/anim_frontf.png new file mode 100644 index 000000000..59abf6ddb Binary files /dev/null and b/graphics/pokemon/dustox/anim_frontf.png differ diff --git a/graphics/pokemon/dustox/backf.png b/graphics/pokemon/dustox/backf.png new file mode 100644 index 000000000..87be14e30 Binary files /dev/null and b/graphics/pokemon/dustox/backf.png differ diff --git a/graphics/pokemon/girafarig/anim_frontf.png b/graphics/pokemon/girafarig/anim_frontf.png new file mode 100644 index 000000000..82d972b21 Binary files /dev/null and b/graphics/pokemon/girafarig/anim_frontf.png differ diff --git a/graphics/pokemon/girafarig/back.png b/graphics/pokemon/girafarig/back.png index b724b50da..333ed70df 100644 Binary files a/graphics/pokemon/girafarig/back.png and b/graphics/pokemon/girafarig/back.png differ diff --git a/graphics/pokemon/girafarig/backf.png b/graphics/pokemon/girafarig/backf.png new file mode 100644 index 000000000..6645ff99b Binary files /dev/null and b/graphics/pokemon/girafarig/backf.png differ diff --git a/graphics/pokemon/gligar/anim_frontf.png b/graphics/pokemon/gligar/anim_frontf.png new file mode 100644 index 000000000..945e90948 Binary files /dev/null and b/graphics/pokemon/gligar/anim_frontf.png differ diff --git a/graphics/pokemon/gligar/backf.png b/graphics/pokemon/gligar/backf.png new file mode 100644 index 000000000..31e8fcf40 Binary files /dev/null and b/graphics/pokemon/gligar/backf.png differ diff --git a/graphics/pokemon/heracross/anim_frontf.png b/graphics/pokemon/heracross/anim_frontf.png new file mode 100644 index 000000000..955bc628b Binary files /dev/null and b/graphics/pokemon/heracross/anim_frontf.png differ diff --git a/graphics/pokemon/heracross/backf.png b/graphics/pokemon/heracross/backf.png new file mode 100644 index 000000000..2efbc549d Binary files /dev/null and b/graphics/pokemon/heracross/backf.png differ diff --git a/graphics/pokemon/houndoom/anim_front.png b/graphics/pokemon/houndoom/anim_front.png index 84941c21e..3f2c75a39 100644 Binary files a/graphics/pokemon/houndoom/anim_front.png and b/graphics/pokemon/houndoom/anim_front.png differ diff --git a/graphics/pokemon/houndoom/anim_frontf.png b/graphics/pokemon/houndoom/anim_frontf.png new file mode 100644 index 000000000..f5f3b6b9e Binary files /dev/null and b/graphics/pokemon/houndoom/anim_frontf.png differ diff --git a/graphics/pokemon/houndoom/backf.png b/graphics/pokemon/houndoom/backf.png new file mode 100644 index 000000000..dfbf43c95 Binary files /dev/null and b/graphics/pokemon/houndoom/backf.png differ diff --git a/graphics/pokemon/ledian/anim_frontf.png b/graphics/pokemon/ledian/anim_frontf.png new file mode 100644 index 000000000..7379d49fa Binary files /dev/null and b/graphics/pokemon/ledian/anim_frontf.png differ diff --git a/graphics/pokemon/ledian/backf.png b/graphics/pokemon/ledian/backf.png new file mode 100644 index 000000000..269c5739c Binary files /dev/null and b/graphics/pokemon/ledian/backf.png differ diff --git a/graphics/pokemon/ledyba/anim_frontf.png b/graphics/pokemon/ledyba/anim_frontf.png new file mode 100644 index 000000000..1fd7a521e Binary files /dev/null and b/graphics/pokemon/ledyba/anim_frontf.png differ diff --git a/graphics/pokemon/ledyba/backf.png b/graphics/pokemon/ledyba/backf.png new file mode 100644 index 000000000..5c157420a Binary files /dev/null and b/graphics/pokemon/ledyba/backf.png differ diff --git a/graphics/pokemon/ludicolo/anim_frontf.png b/graphics/pokemon/ludicolo/anim_frontf.png new file mode 100644 index 000000000..5dcb282b0 Binary files /dev/null and b/graphics/pokemon/ludicolo/anim_frontf.png differ diff --git a/graphics/pokemon/ludicolo/backf.png b/graphics/pokemon/ludicolo/backf.png new file mode 100644 index 000000000..00b79eb47 Binary files /dev/null and b/graphics/pokemon/ludicolo/backf.png differ diff --git a/graphics/pokemon/mamoswine/anim_frontf.png b/graphics/pokemon/mamoswine/anim_frontf.png new file mode 100644 index 000000000..b3f9010c7 Binary files /dev/null and b/graphics/pokemon/mamoswine/anim_frontf.png differ diff --git a/graphics/pokemon/meganium/anim_front.png b/graphics/pokemon/meganium/anim_front.png index e2a437d85..e9868059f 100644 Binary files a/graphics/pokemon/meganium/anim_front.png and b/graphics/pokemon/meganium/anim_front.png differ diff --git a/graphics/pokemon/meganium/anim_frontf.png b/graphics/pokemon/meganium/anim_frontf.png new file mode 100644 index 000000000..7faedcabe Binary files /dev/null and b/graphics/pokemon/meganium/anim_frontf.png differ diff --git a/graphics/pokemon/meganium/backf.png b/graphics/pokemon/meganium/backf.png new file mode 100644 index 000000000..062ce4840 Binary files /dev/null and b/graphics/pokemon/meganium/backf.png differ diff --git a/graphics/pokemon/meganium/normal.pal b/graphics/pokemon/meganium/normal.pal index 75da9204b..c668ecdaa 100644 --- a/graphics/pokemon/meganium/normal.pal +++ b/graphics/pokemon/meganium/normal.pal @@ -11,9 +11,9 @@ JASC-PAL 139 222 49 16 16 16 255 255 255 -255 57 90 +205 32 57 123 16 57 246 164 156 -205 32 57 +255 57 90 205 205 205 106 106 106 diff --git a/graphics/pokemon/murkrow/anim_frontf.png b/graphics/pokemon/murkrow/anim_frontf.png new file mode 100644 index 000000000..8981a2677 Binary files /dev/null and b/graphics/pokemon/murkrow/anim_frontf.png differ diff --git a/graphics/pokemon/murkrow/backf.png b/graphics/pokemon/murkrow/backf.png new file mode 100644 index 000000000..fe946114d Binary files /dev/null and b/graphics/pokemon/murkrow/backf.png differ diff --git a/graphics/pokemon/nuzleaf/anim_front.png b/graphics/pokemon/nuzleaf/anim_front.png index 974079acc..c1327b435 100644 Binary files a/graphics/pokemon/nuzleaf/anim_front.png and b/graphics/pokemon/nuzleaf/anim_front.png differ diff --git a/graphics/pokemon/nuzleaf/anim_frontf.png b/graphics/pokemon/nuzleaf/anim_frontf.png new file mode 100644 index 000000000..73cd1bbe3 Binary files /dev/null and b/graphics/pokemon/nuzleaf/anim_frontf.png differ diff --git a/graphics/pokemon/nuzleaf/backf.png b/graphics/pokemon/nuzleaf/backf.png new file mode 100644 index 000000000..2fa63c61c Binary files /dev/null and b/graphics/pokemon/nuzleaf/backf.png differ diff --git a/graphics/pokemon/octillery/anim_frontf.png b/graphics/pokemon/octillery/anim_frontf.png new file mode 100644 index 000000000..ab94a95cc Binary files /dev/null and b/graphics/pokemon/octillery/anim_frontf.png differ diff --git a/graphics/pokemon/octillery/backf.png b/graphics/pokemon/octillery/backf.png new file mode 100644 index 000000000..9bc3b3788 Binary files /dev/null and b/graphics/pokemon/octillery/backf.png differ diff --git a/graphics/pokemon/piloswine/anim_frontf.png b/graphics/pokemon/piloswine/anim_frontf.png new file mode 100644 index 000000000..4be264c83 Binary files /dev/null and b/graphics/pokemon/piloswine/anim_frontf.png differ diff --git a/graphics/pokemon/piloswine/backf.png b/graphics/pokemon/piloswine/backf.png new file mode 100644 index 000000000..952d0bf99 Binary files /dev/null and b/graphics/pokemon/piloswine/backf.png differ diff --git a/graphics/pokemon/quagsire/anim_front.png b/graphics/pokemon/quagsire/anim_front.png index 26fd56317..3a2c50113 100644 Binary files a/graphics/pokemon/quagsire/anim_front.png and b/graphics/pokemon/quagsire/anim_front.png differ diff --git a/graphics/pokemon/quagsire/anim_frontf.png b/graphics/pokemon/quagsire/anim_frontf.png new file mode 100644 index 000000000..26fd56317 Binary files /dev/null and b/graphics/pokemon/quagsire/anim_frontf.png differ diff --git a/graphics/pokemon/quagsire/back.png b/graphics/pokemon/quagsire/back.png index a0caa3a26..0673d4b1d 100644 Binary files a/graphics/pokemon/quagsire/back.png and b/graphics/pokemon/quagsire/back.png differ diff --git a/graphics/pokemon/quagsire/backf.png b/graphics/pokemon/quagsire/backf.png new file mode 100644 index 000000000..f2f4406ea Binary files /dev/null and b/graphics/pokemon/quagsire/backf.png differ diff --git a/graphics/pokemon/shiftry/anim_frontf.png b/graphics/pokemon/shiftry/anim_frontf.png new file mode 100644 index 000000000..2559dff82 Binary files /dev/null and b/graphics/pokemon/shiftry/anim_frontf.png differ diff --git a/graphics/pokemon/shiftry/backf.png b/graphics/pokemon/shiftry/backf.png new file mode 100644 index 000000000..226d98cfd Binary files /dev/null and b/graphics/pokemon/shiftry/backf.png differ diff --git a/graphics/pokemon/sneasel/anim_frontf.png b/graphics/pokemon/sneasel/anim_frontf.png new file mode 100644 index 000000000..8b9a6a3e4 Binary files /dev/null and b/graphics/pokemon/sneasel/anim_frontf.png differ diff --git a/graphics/pokemon/sneasel/backf.png b/graphics/pokemon/sneasel/backf.png new file mode 100644 index 000000000..29a6650ec Binary files /dev/null and b/graphics/pokemon/sneasel/backf.png differ diff --git a/graphics/pokemon/sneasel/hisuian/backf.png b/graphics/pokemon/sneasel/hisuian/backf.png new file mode 100644 index 000000000..7b6cc3a3f Binary files /dev/null and b/graphics/pokemon/sneasel/hisuian/backf.png differ diff --git a/graphics/pokemon/sneasel/hisuian/frontf.png b/graphics/pokemon/sneasel/hisuian/frontf.png new file mode 100644 index 000000000..3bf48c156 Binary files /dev/null and b/graphics/pokemon/sneasel/hisuian/frontf.png differ diff --git a/graphics/pokemon/steelix/anim_frontf.png b/graphics/pokemon/steelix/anim_frontf.png new file mode 100644 index 000000000..7f4dc508a Binary files /dev/null and b/graphics/pokemon/steelix/anim_frontf.png differ diff --git a/graphics/pokemon/steelix/backf.png b/graphics/pokemon/steelix/backf.png new file mode 100644 index 000000000..5d1469b11 Binary files /dev/null and b/graphics/pokemon/steelix/backf.png differ diff --git a/graphics/pokemon/sudowoodo/anim_frontf.png b/graphics/pokemon/sudowoodo/anim_frontf.png new file mode 100644 index 000000000..a88c9cc97 Binary files /dev/null and b/graphics/pokemon/sudowoodo/anim_frontf.png differ diff --git a/graphics/pokemon/sudowoodo/backf.png b/graphics/pokemon/sudowoodo/backf.png new file mode 100644 index 000000000..2dc2b3993 Binary files /dev/null and b/graphics/pokemon/sudowoodo/backf.png differ diff --git a/graphics/pokemon/tangrowth/anim_frontf.png b/graphics/pokemon/tangrowth/anim_frontf.png new file mode 100644 index 000000000..59c3e1046 Binary files /dev/null and b/graphics/pokemon/tangrowth/anim_frontf.png differ diff --git a/graphics/pokemon/torchic/back.png b/graphics/pokemon/torchic/back.png index 54770135e..6b10fc5e9 100644 Binary files a/graphics/pokemon/torchic/back.png and b/graphics/pokemon/torchic/back.png differ diff --git a/graphics/pokemon/torchic/backf.png b/graphics/pokemon/torchic/backf.png new file mode 100644 index 000000000..15a3990a0 Binary files /dev/null and b/graphics/pokemon/torchic/backf.png differ diff --git a/graphics/pokemon/ursaring/anim_frontf.png b/graphics/pokemon/ursaring/anim_frontf.png new file mode 100644 index 000000000..55f350609 Binary files /dev/null and b/graphics/pokemon/ursaring/anim_frontf.png differ diff --git a/graphics/pokemon/ursaring/backf.png b/graphics/pokemon/ursaring/backf.png new file mode 100644 index 000000000..27c4ba931 Binary files /dev/null and b/graphics/pokemon/ursaring/backf.png differ diff --git a/graphics/pokemon/weavile/anim_frontf.png b/graphics/pokemon/weavile/anim_frontf.png new file mode 100644 index 000000000..0a072200f Binary files /dev/null and b/graphics/pokemon/weavile/anim_frontf.png differ diff --git a/graphics/pokemon/weavile/backf.png b/graphics/pokemon/weavile/backf.png new file mode 100644 index 000000000..632fbfc25 Binary files /dev/null and b/graphics/pokemon/weavile/backf.png differ diff --git a/graphics/pokemon/wobbuffet/anim_frontf.png b/graphics/pokemon/wobbuffet/anim_frontf.png new file mode 100644 index 000000000..571e354cf Binary files /dev/null and b/graphics/pokemon/wobbuffet/anim_frontf.png differ diff --git a/graphics/pokemon/wobbuffet/backf.png b/graphics/pokemon/wobbuffet/backf.png new file mode 100644 index 000000000..db6b3f9b0 Binary files /dev/null and b/graphics/pokemon/wobbuffet/backf.png differ diff --git a/graphics/pokemon/wooper/anim_frontf.png b/graphics/pokemon/wooper/anim_frontf.png new file mode 100644 index 000000000..5c3c46d7b Binary files /dev/null and b/graphics/pokemon/wooper/anim_frontf.png differ diff --git a/graphics/pokemon/wooper/backf.png b/graphics/pokemon/wooper/backf.png new file mode 100644 index 000000000..79b566a4b Binary files /dev/null and b/graphics/pokemon/wooper/backf.png differ diff --git a/include/graphics.h b/include/graphics.h index a42b14fe6..14c2e4c6a 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -244,6 +244,7 @@ extern const u32 gMonFrontPic_Mew[]; extern const u32 gMonFrontPic_Chikorita[]; extern const u32 gMonFrontPic_Bayleef[]; extern const u32 gMonFrontPic_Meganium[]; +extern const u32 gMonFrontPic_MeganiumF[]; extern const u32 gMonFrontPic_Cyndaquil[]; extern const u32 gMonFrontPic_Quilava[]; extern const u32 gMonFrontPic_Typhlosion[]; @@ -255,7 +256,9 @@ extern const u32 gMonFrontPic_Furret[]; extern const u32 gMonFrontPic_Hoothoot[]; extern const u32 gMonFrontPic_Noctowl[]; extern const u32 gMonFrontPic_Ledyba[]; +extern const u32 gMonFrontPic_LedybaF[]; extern const u32 gMonFrontPic_Ledian[]; +extern const u32 gMonFrontPic_LedianF[]; extern const u32 gMonFrontPic_Spinarak[]; extern const u32 gMonFrontPic_Ariados[]; extern const u32 gMonFrontPic_Crobat[]; @@ -276,30 +279,39 @@ extern const u32 gMonFrontPic_Bellossom[]; extern const u32 gMonFrontPic_Marill[]; extern const u32 gMonFrontPic_Azumarill[]; extern const u32 gMonFrontPic_Sudowoodo[]; +extern const u32 gMonFrontPic_SudowoodoF[]; 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[]; extern const u32 gMonFrontPic_Aipom[]; +extern const u32 gMonFrontPic_AipomF[]; extern const u32 gMonFrontPic_Sunkern[]; extern const u32 gMonFrontPic_Sunflora[]; extern const u32 gMonFrontPic_Yanma[]; extern const u32 gMonFrontPic_Wooper[]; +extern const u32 gMonFrontPic_WooperF[]; extern const u32 gMonFrontPic_Quagsire[]; +extern const u32 gMonFrontPic_QuagsireF[]; extern const u32 gMonFrontPic_Espeon[]; extern const u32 gMonFrontPic_Umbreon[]; extern const u32 gMonFrontPic_Murkrow[]; +extern const u32 gMonFrontPic_MurkrowF[]; extern const u32 gMonFrontPic_Slowking[]; extern const u32 gMonFrontPic_Misdreavus[]; extern const u32 gMonFrontPic_Unown[]; extern const u32 gMonFrontPic_Wobbuffet[]; +extern const u32 gMonFrontPic_WobbuffetF[]; extern const u32 gMonFrontPic_Girafarig[]; +extern const u32 gMonFrontPic_GirafarigF[]; extern const u32 gMonFrontPic_Pineco[]; extern const u32 gMonFrontPic_Forretress[]; extern const u32 gMonFrontPic_Dunsparce[]; extern const u32 gMonFrontPic_Gligar[]; +extern const u32 gMonFrontPic_GligarF[]; extern const u32 gMonFrontPic_Steelix[]; +extern const u32 gMonFrontPic_SteelixF[]; extern const u32 gMonFrontPic_Snubbull[]; extern const u32 gMonFrontPic_Granbull[]; extern const u32 gMonFrontPic_Qwilfish[]; @@ -307,24 +319,31 @@ extern const u32 gMonFrontPic_Scizor[]; extern const u32 gMonFrontPic_ScizorF[]; extern const u32 gMonFrontPic_Shuckle[]; extern const u32 gMonFrontPic_Heracross[]; +extern const u32 gMonFrontPic_HeracrossF[]; extern const u32 gMonFrontPic_Sneasel[]; +extern const u32 gMonFrontPic_SneaselF[]; extern const u32 gMonFrontPic_Teddiursa[]; extern const u32 gMonFrontPic_Ursaring[]; +extern const u32 gMonFrontPic_UrsaringF[]; extern const u32 gMonFrontPic_Slugma[]; extern const u32 gMonFrontPic_Magcargo[]; extern const u32 gMonFrontPic_Swinub[]; extern const u32 gMonFrontPic_Piloswine[]; +extern const u32 gMonFrontPic_PiloswineF[]; extern const u32 gMonFrontPic_Corsola[]; extern const u32 gMonFrontPic_Remoraid[]; extern const u32 gMonFrontPic_Octillery[]; +extern const u32 gMonFrontPic_OctilleryF[]; extern const u32 gMonFrontPic_Delibird[]; extern const u32 gMonFrontPic_Mantine[]; extern const u32 gMonFrontPic_Skarmory[]; extern const u32 gMonFrontPic_Houndour[]; extern const u32 gMonFrontPic_Houndoom[]; +extern const u32 gMonFrontPic_HoundoomF[]; extern const u32 gMonFrontPic_Kingdra[]; extern const u32 gMonFrontPic_Phanpy[]; extern const u32 gMonFrontPic_Donphan[]; +extern const u32 gMonFrontPic_DonphanF[]; extern const u32 gMonFrontPic_Porygon2[]; extern const u32 gMonFrontPic_Stantler[]; extern const u32 gMonFrontPic_Smeargle[]; @@ -349,7 +368,9 @@ extern const u32 gMonFrontPic_Grovyle[]; extern const u32 gMonFrontPic_Sceptile[]; extern const u32 gMonFrontPic_Torchic[]; extern const u32 gMonFrontPic_Combusken[]; +extern const u32 gMonFrontPic_CombuskenF[]; extern const u32 gMonFrontPic_Blaziken[]; +extern const u32 gMonFrontPic_BlazikenF[]; extern const u32 gMonFrontPic_Mudkip[]; extern const u32 gMonFrontPic_Marshtomp[]; extern const u32 gMonFrontPic_Swampert[]; @@ -360,14 +381,19 @@ extern const u32 gMonFrontPic_Linoone[]; extern const u32 gMonFrontPic_Wurmple[]; extern const u32 gMonFrontPic_Silcoon[]; extern const u32 gMonFrontPic_Beautifly[]; +extern const u32 gMonFrontPic_BeautiflyF[]; extern const u32 gMonFrontPic_Cascoon[]; extern const u32 gMonFrontPic_Dustox[]; +extern const u32 gMonFrontPic_DustoxF[]; extern const u32 gMonFrontPic_Lotad[]; extern const u32 gMonFrontPic_Lombre[]; extern const u32 gMonFrontPic_Ludicolo[]; +extern const u32 gMonFrontPic_LudicoloF[]; extern const u32 gMonFrontPic_Seedot[]; extern const u32 gMonFrontPic_Nuzleaf[]; +extern const u32 gMonFrontPic_NuzleafF[]; extern const u32 gMonFrontPic_Shiftry[]; +extern const u32 gMonFrontPic_ShiftryF[]; extern const u32 gMonFrontPic_Taillow[]; extern const u32 gMonFrontPic_Swellow[]; extern const u32 gMonFrontPic_Wingull[]; @@ -527,6 +553,7 @@ extern const u32 gMonFrontPic_Cherrim[]; extern const u32 gMonFrontPic_Shellos[]; extern const u32 gMonFrontPic_Gastrodon[]; extern const u32 gMonFrontPic_Ambipom[]; +extern const u32 gMonFrontPic_AmbipomF[]; extern const u32 gMonFrontPic_Drifloon[]; extern const u32 gMonFrontPic_Drifblim[]; extern const u32 gMonFrontPic_Buneary[]; @@ -567,11 +594,13 @@ extern const u32 gMonFrontPic_Mantyke[]; extern const u32 gMonFrontPic_Snover[]; extern const u32 gMonFrontPic_Abomasnow[]; extern const u32 gMonFrontPic_Weavile[]; +extern const u32 gMonFrontPic_WeavileF[]; 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_TangrowthF[]; extern const u32 gMonFrontPic_Electivire[]; extern const u32 gMonFrontPic_Magmortar[]; extern const u32 gMonFrontPic_Togekiss[]; @@ -580,6 +609,7 @@ extern const u32 gMonFrontPic_Leafeon[]; extern const u32 gMonFrontPic_Glaceon[]; extern const u32 gMonFrontPic_Gliscor[]; extern const u32 gMonFrontPic_Mamoswine[]; +extern const u32 gMonFrontPic_MamoswineF[]; extern const u32 gMonFrontPic_PorygonZ[]; extern const u32 gMonFrontPic_Gallade[]; extern const u32 gMonFrontPic_Probopass[]; @@ -1127,6 +1157,7 @@ extern const u32 gMonFrontPic_ElectrodeHisuian[]; extern const u32 gMonFrontPic_TyphlosionHisuian[]; extern const u32 gMonFrontPic_QwilfishHisuian[]; extern const u32 gMonFrontPic_SneaselHisuian[]; +extern const u32 gMonFrontPic_SneaselHisuianF[]; #if P_GEN_5_POKEMON == TRUE extern const u32 gMonFrontPic_SamurottHisuian[]; extern const u32 gMonFrontPic_LilligantHisuian[]; @@ -1488,6 +1519,7 @@ extern const u32 gMonBackPic_Mew[]; extern const u32 gMonBackPic_Chikorita[]; extern const u32 gMonBackPic_Bayleef[]; extern const u32 gMonBackPic_Meganium[]; +extern const u32 gMonBackPic_MeganiumF[]; extern const u32 gMonBackPic_Cyndaquil[]; extern const u32 gMonBackPic_Quilava[]; extern const u32 gMonBackPic_Typhlosion[]; @@ -1499,7 +1531,9 @@ extern const u32 gMonBackPic_Furret[]; extern const u32 gMonBackPic_Hoothoot[]; extern const u32 gMonBackPic_Noctowl[]; extern const u32 gMonBackPic_Ledyba[]; +extern const u32 gMonBackPic_LedybaF[]; extern const u32 gMonBackPic_Ledian[]; +extern const u32 gMonBackPic_LedianF[]; extern const u32 gMonBackPic_Spinarak[]; extern const u32 gMonBackPic_Ariados[]; extern const u32 gMonBackPic_Crobat[]; @@ -1519,54 +1553,70 @@ extern const u32 gMonBackPic_Bellossom[]; extern const u32 gMonBackPic_Marill[]; extern const u32 gMonBackPic_Azumarill[]; extern const u32 gMonBackPic_Sudowoodo[]; +extern const u32 gMonBackPic_SudowoodoF[]; 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[]; extern const u32 gMonBackPic_Aipom[]; +extern const u32 gMonBackPic_AipomF[]; extern const u32 gMonBackPic_Sunkern[]; extern const u32 gMonBackPic_Sunflora[]; extern const u32 gMonBackPic_Yanma[]; extern const u32 gMonBackPic_Wooper[]; +extern const u32 gMonBackPic_WooperF[]; extern const u32 gMonBackPic_Quagsire[]; +extern const u32 gMonBackPic_QuagsireF[]; extern const u32 gMonBackPic_Espeon[]; extern const u32 gMonBackPic_Umbreon[]; extern const u32 gMonBackPic_Murkrow[]; +extern const u32 gMonBackPic_MurkrowF[]; extern const u32 gMonBackPic_Slowking[]; extern const u32 gMonBackPic_Misdreavus[]; extern const u32 gMonBackPic_Unown[]; extern const u32 gMonBackPic_Wobbuffet[]; +extern const u32 gMonBackPic_WobbuffetF[]; extern const u32 gMonBackPic_Girafarig[]; +extern const u32 gMonBackPic_GirafarigF[]; extern const u32 gMonBackPic_Pineco[]; extern const u32 gMonBackPic_Forretress[]; extern const u32 gMonBackPic_Dunsparce[]; extern const u32 gMonBackPic_Gligar[]; +extern const u32 gMonBackPic_GligarF[]; extern const u32 gMonBackPic_Steelix[]; +extern const u32 gMonBackPic_SteelixF[]; extern const u32 gMonBackPic_Snubbull[]; extern const u32 gMonBackPic_Granbull[]; extern const u32 gMonBackPic_Qwilfish[]; extern const u32 gMonBackPic_Scizor[]; extern const u32 gMonBackPic_Shuckle[]; extern const u32 gMonBackPic_Heracross[]; +extern const u32 gMonBackPic_HeracrossF[]; extern const u32 gMonBackPic_Sneasel[]; +extern const u32 gMonBackPic_SneaselF[]; extern const u32 gMonBackPic_Teddiursa[]; extern const u32 gMonBackPic_Ursaring[]; +extern const u32 gMonBackPic_UrsaringF[]; extern const u32 gMonBackPic_Slugma[]; extern const u32 gMonBackPic_Magcargo[]; extern const u32 gMonBackPic_Swinub[]; extern const u32 gMonBackPic_Piloswine[]; +extern const u32 gMonBackPic_PiloswineF[]; extern const u32 gMonBackPic_Corsola[]; extern const u32 gMonBackPic_Remoraid[]; extern const u32 gMonBackPic_Octillery[]; +extern const u32 gMonBackPic_OctilleryF[]; extern const u32 gMonBackPic_Delibird[]; extern const u32 gMonBackPic_Mantine[]; extern const u32 gMonBackPic_Skarmory[]; extern const u32 gMonBackPic_Houndour[]; extern const u32 gMonBackPic_Houndoom[]; +extern const u32 gMonBackPic_HoundoomF[]; extern const u32 gMonBackPic_Kingdra[]; extern const u32 gMonBackPic_Phanpy[]; extern const u32 gMonBackPic_Donphan[]; +extern const u32 gMonBackPic_DonphanF[]; extern const u32 gMonBackPic_Porygon2[]; extern const u32 gMonBackPic_Stantler[]; extern const u32 gMonBackPic_Smeargle[]; @@ -1590,8 +1640,11 @@ extern const u32 gMonBackPic_Treecko[]; extern const u32 gMonBackPic_Grovyle[]; extern const u32 gMonBackPic_Sceptile[]; extern const u32 gMonBackPic_Torchic[]; +extern const u32 gMonBackPic_TorchicF[]; extern const u32 gMonBackPic_Combusken[]; +extern const u32 gMonBackPic_CombuskenF[]; extern const u32 gMonBackPic_Blaziken[]; +extern const u32 gMonBackPic_BlazikenF[]; extern const u32 gMonBackPic_Mudkip[]; extern const u32 gMonBackPic_Marshtomp[]; extern const u32 gMonBackPic_Swampert[]; @@ -1602,14 +1655,19 @@ extern const u32 gMonBackPic_Linoone[]; extern const u32 gMonBackPic_Wurmple[]; extern const u32 gMonBackPic_Silcoon[]; extern const u32 gMonBackPic_Beautifly[]; +extern const u32 gMonBackPic_BeautiflyF[]; extern const u32 gMonBackPic_Cascoon[]; extern const u32 gMonBackPic_Dustox[]; +extern const u32 gMonBackPic_DustoxF[]; extern const u32 gMonBackPic_Lotad[]; extern const u32 gMonBackPic_Lombre[]; extern const u32 gMonBackPic_Ludicolo[]; +extern const u32 gMonBackPic_LudicoloF[]; extern const u32 gMonBackPic_Seedot[]; extern const u32 gMonBackPic_Nuzleaf[]; +extern const u32 gMonBackPic_NuzleafF[]; extern const u32 gMonBackPic_Shiftry[]; +extern const u32 gMonBackPic_ShiftryF[]; extern const u32 gMonBackPic_Taillow[]; extern const u32 gMonBackPic_Swellow[]; extern const u32 gMonBackPic_Wingull[]; @@ -1768,6 +1826,7 @@ extern const u32 gMonBackPic_Cherrim[]; extern const u32 gMonBackPic_Shellos[]; extern const u32 gMonBackPic_Gastrodon[]; extern const u32 gMonBackPic_Ambipom[]; +extern const u32 gMonBackPic_AmbipomF[]; extern const u32 gMonBackPic_Drifloon[]; extern const u32 gMonBackPic_Drifblim[]; extern const u32 gMonBackPic_Buneary[]; @@ -1807,6 +1866,7 @@ extern const u32 gMonBackPic_Mantyke[]; extern const u32 gMonBackPic_Snover[]; extern const u32 gMonBackPic_Abomasnow[]; extern const u32 gMonBackPic_Weavile[]; +extern const u32 gMonBackPic_WeavileF[]; extern const u32 gMonBackPic_Magnezone[]; extern const u32 gMonBackPic_Lickilicky[]; extern const u32 gMonBackPic_Rhyperior[]; @@ -2367,6 +2427,7 @@ extern const u32 gMonBackPic_ElectrodeHisuian[]; extern const u32 gMonBackPic_TyphlosionHisuian[]; extern const u32 gMonBackPic_QwilfishHisuian[]; extern const u32 gMonBackPic_SneaselHisuian[]; +extern const u32 gMonBackPic_SneaselHisuianF[]; #if P_GEN_5_POKEMON == TRUE extern const u32 gMonBackPic_SamurottHisuian[]; extern const u32 gMonBackPic_LilligantHisuian[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 74a0c579e..aaf9c91af 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -177,6 +177,7 @@ const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/anim_front.4bpp. const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/anim_front.4bpp.lz"); const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/anim_front.4bpp.lz"); const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/anim_front.4bpp.lz"); const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/anim_front.4bpp.lz"); @@ -188,7 +189,9 @@ const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/anim_front const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/anim_front.4bpp.lz"); const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/anim_front.4bpp.lz"); const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/anim_front.4bpp.lz"); @@ -209,30 +212,39 @@ const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/anim const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front.4bpp.lz"); 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_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_frontf.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"); const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/anim_front.4bpp.lz"); const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/anim_front.4bpp.lz"); const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/anim_front.4bpp.lz"); +const u32 gMonFrontPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/anim_front.4bpp.lz"); +const u32 gMonFrontPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz"); const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/anim_front.4bpp.lz"); const u32 gMonFrontPic_Unown[] = INCBIN_U32("graphics/pokemon/unown/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz"); +const u32 gMonFrontPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/anim_front.4bpp.lz"); const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/anim_front.4bpp.lz"); const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/anim_front.4bpp.lz"); const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/anim_front.4bpp.lz"); +const u32 gMonFrontPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/anim_front.4bpp.lz"); 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"); @@ -240,24 +252,31 @@ const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/anim_front 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_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/anim_front.4bpp.lz"); +const u32 gMonFrontPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/anim_front.4bpp.lz"); const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/anim_front.4bpp.lz"); const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/anim_front.4bpp.lz"); const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/anim_front.4bpp.lz"); +const u32 gMonFrontPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/anim_front.4bpp.lz"); const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/anim_front.4bpp.lz"); const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/anim_front.4bpp.lz"); +const u32 gMonFrontPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/anim_front.4bpp.lz"); const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/anim_front.4bpp.lz"); const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/anim_front.4bpp.lz"); const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz"); const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/anim_front.4bpp.lz"); const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz"); +const u32 gMonFrontPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz"); const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/anim_front.4bpp.lz"); const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/anim_front.4bpp.lz"); @@ -282,7 +301,9 @@ const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/anim_fro const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/anim_front.4bpp.lz"); const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/anim_front.4bpp.lz"); const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/anim_front.4bpp.lz"); +const u32 gMonFrontPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/anim_front.4bpp.lz"); +const u32 gMonFrontPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/anim_front.4bpp.lz"); const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/anim_front.4bpp.lz"); const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/anim_front.4bpp.lz"); @@ -293,14 +314,19 @@ const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/anim_fro const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/anim_front.4bpp.lz"); const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/anim_front.4bpp.lz"); +const u32 gMonFrontPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/anim_front.4bpp.lz"); +const u32 gMonFrontPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/anim_front.4bpp.lz"); const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_front.4bpp.lz"); +const u32 gMonFrontPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/anim_front.4bpp.lz"); +const u32 gMonFrontPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/anim_front.4bpp.lz"); const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/anim_front.4bpp.lz"); const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/anim_front.4bpp.lz"); @@ -460,6 +486,7 @@ const u32 gMonFrontPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/normal/a const u32 gMonFrontPic_Shellos[] = INCBIN_U32("graphics/pokemon/shellos/anim_front.4bpp.lz"); const u32 gMonFrontPic_Gastrodon[] = INCBIN_U32("graphics/pokemon/gastrodon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/anim_front.4bpp.lz"); const u32 gMonFrontPic_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/anim_front.4bpp.lz"); @@ -500,11 +527,13 @@ const u32 gMonFrontPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/anim_fro const u32 gMonFrontPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/anim_front.4bpp.lz"); const u32 gMonFrontPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_front.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"); 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_TangrowthF[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_frontf.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"); const u32 gMonFrontPic_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/anim_front.4bpp.lz"); @@ -513,6 +542,7 @@ const u32 gMonFrontPic_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/anim_fro const u32 gMonFrontPic_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MamoswineF[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/anim_front.4bpp.lz"); const u32 gMonFrontPic_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/anim_front.4bpp.lz"); const u32 gMonFrontPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/anim_front.4bpp.lz"); @@ -1060,6 +1090,7 @@ const u32 gMonFrontPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electro const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz"); +const u32 gMonFrontPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/frontf.4bpp.lz"); #if P_GEN_5_POKEMON == TRUE const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz"); @@ -1419,6 +1450,7 @@ const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/back.4bpp.lz"); const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/back.4bpp.lz"); const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/back.4bpp.lz"); const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/back.4bpp.lz"); +const u32 gMonBackPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/backf.4bpp.lz"); const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/back.4bpp.lz"); const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/back.4bpp.lz"); const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/back.4bpp.lz"); @@ -1430,7 +1462,9 @@ const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/back.4bpp.l const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/back.4bpp.lz"); const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/back.4bpp.lz"); const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/back.4bpp.lz"); +const u32 gMonBackPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/backf.4bpp.lz"); const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/back.4bpp.lz"); +const u32 gMonBackPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/backf.4bpp.lz"); const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/back.4bpp.lz"); const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/back.4bpp.lz"); const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/back.4bpp.lz"); @@ -1450,54 +1484,70 @@ const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/back. const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/back.4bpp.lz"); 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_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/backf.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"); const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/back.4bpp.lz"); +const u32 gMonBackPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/backf.4bpp.lz"); const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/back.4bpp.lz"); const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/back.4bpp.lz"); const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/back.4bpp.lz"); const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/back.4bpp.lz"); +const u32 gMonBackPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/backf.4bpp.lz"); const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/back.4bpp.lz"); +const u32 gMonBackPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/backf.4bpp.lz"); const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/back.4bpp.lz"); const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/back.4bpp.lz"); const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/back.4bpp.lz"); +const u32 gMonBackPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/backf.4bpp.lz"); const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/back.4bpp.lz"); const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/back.4bpp.lz"); const u32 gMonBackPic_Unown[] = INCBIN_U32("graphics/pokemon/unown/back.4bpp.lz"); const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/back.4bpp.lz"); +const u32 gMonBackPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/backf.4bpp.lz"); const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/back.4bpp.lz"); +const u32 gMonBackPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/backf.4bpp.lz"); const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/back.4bpp.lz"); const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/back.4bpp.lz"); const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/back.4bpp.lz"); const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/back.4bpp.lz"); +const u32 gMonBackPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/backf.4bpp.lz"); const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/back.4bpp.lz"); +const u32 gMonBackPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/backf.4bpp.lz"); const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/back.4bpp.lz"); const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/back.4bpp.lz"); const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/back.4bpp.lz"); const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/back.4bpp.lz"); const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/back.4bpp.lz"); const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/back.4bpp.lz"); +const u32 gMonBackPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/backf.4bpp.lz"); const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/back.4bpp.lz"); +const u32 gMonBackPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/backf.4bpp.lz"); const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/back.4bpp.lz"); const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/back.4bpp.lz"); +const u32 gMonBackPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/backf.4bpp.lz"); const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/back.4bpp.lz"); const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/back.4bpp.lz"); const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/back.4bpp.lz"); const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/back.4bpp.lz"); +const u32 gMonBackPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/backf.4bpp.lz"); const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/back.4bpp.lz"); const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/back.4bpp.lz"); const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/back.4bpp.lz"); +const u32 gMonBackPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/backf.4bpp.lz"); const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/back.4bpp.lz"); const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/back.4bpp.lz"); const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/back.4bpp.lz"); const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/back.4bpp.lz"); const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/back.4bpp.lz"); +const u32 gMonBackPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/backf.4bpp.lz"); const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/back.4bpp.lz"); const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/back.4bpp.lz"); const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/back.4bpp.lz"); +const u32 gMonBackPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/backf.4bpp.lz"); const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/back.4bpp.lz"); const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/back.4bpp.lz"); const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/back.4bpp.lz"); @@ -1521,8 +1571,11 @@ const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/back.4bpp const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/back.4bpp.lz"); const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/back.4bpp.lz"); const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/back.4bpp.lz"); +const u32 gMonBackPic_TorchicF[] = INCBIN_U32("graphics/pokemon/torchic/backf.4bpp.lz"); const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/back.4bpp.lz"); +const u32 gMonBackPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/backf.4bpp.lz"); const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/back.4bpp.lz"); +const u32 gMonBackPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/backf.4bpp.lz"); const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/back.4bpp.lz"); const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/back.4bpp.lz"); const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/back.4bpp.lz"); @@ -1533,14 +1586,19 @@ const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/back.4bpp const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/back.4bpp.lz"); const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/back.4bpp.lz"); const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/back.4bpp.lz"); +const u32 gMonBackPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/backf.4bpp.lz"); const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/back.4bpp.lz"); const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/back.4bpp.lz"); +const u32 gMonBackPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/backf.4bpp.lz"); const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/back.4bpp.lz"); const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/back.4bpp.lz"); const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/back.4bpp.lz"); +const u32 gMonBackPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/backf.4bpp.lz"); const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/back.4bpp.lz"); const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/back.4bpp.lz"); +const u32 gMonBackPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/backf.4bpp.lz"); const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/back.4bpp.lz"); +const u32 gMonBackPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/backf.4bpp.lz"); const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/back.4bpp.lz"); const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/back.4bpp.lz"); const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/back.4bpp.lz"); @@ -1699,6 +1757,7 @@ const u32 gMonBackPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/normal/ba const u32 gMonBackPic_Shellos[] = INCBIN_U32("graphics/pokemon/shellos/back.4bpp.lz"); const u32 gMonBackPic_Gastrodon[] = INCBIN_U32("graphics/pokemon/gastrodon/back.4bpp.lz"); const u32 gMonBackPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/back.4bpp.lz"); +const u32 gMonBackPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/backf.4bpp.lz"); const u32 gMonBackPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/back.4bpp.lz"); const u32 gMonBackPic_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/back.4bpp.lz"); const u32 gMonBackPic_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/back.4bpp.lz"); @@ -1738,6 +1797,7 @@ const u32 gMonBackPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/back.4bpp const u32 gMonBackPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/back.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"); 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"); @@ -2298,6 +2358,7 @@ const u32 gMonBackPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrod const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/back.4bpp.lz"); const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz"); const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz"); +const u32 gMonBackPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/backf.4bpp.lz"); #if P_GEN_5_POKEMON == TRUE const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz"); const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz"); diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 9b44aaea5..f2b9eb9cc 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -4432,6 +4432,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_LEAF_GUARD}, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_CYNDAQUIL] = @@ -4681,6 +4682,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWARM, ABILITY_EARLY_BIRD, ABILITY_RATTLED}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_LEDIAN] = @@ -4703,6 +4705,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWARM, ABILITY_EARLY_BIRD, ABILITY_IRON_FIST}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SPINARAK] = @@ -5147,6 +5150,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_STURDY, ABILITY_ROCK_HEAD, ABILITY_RATTLED}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_POLITOED] = @@ -5263,6 +5267,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_RUN_AWAY, ABILITY_PICKUP, ABILITY_SKILL_LINK}, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SUNKERN] = @@ -5352,6 +5357,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_DAMP, ABILITY_WATER_ABSORB, ABILITY_UNAWARE}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_QUAGSIRE] = @@ -5374,6 +5380,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_DAMP, ABILITY_WATER_ABSORB, ABILITY_UNAWARE}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_ESPEON] = @@ -5440,6 +5447,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_INSOMNIA, ABILITY_SUPER_LUCK, ABILITY_PRANKSTER}, .bodyColor = BODY_COLOR_BLACK, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SLOWKING] = @@ -5509,6 +5517,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SHADOW_TAG, ABILITY_NONE, ABILITY_TELEPATHY}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_GIRAFARIG] = @@ -5531,6 +5540,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_INNER_FOCUS, ABILITY_EARLY_BIRD, ABILITY_SAP_SIPPER}, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_PINECO] = @@ -5619,6 +5629,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_HYPER_CUTTER, ABILITY_SAND_VEIL, ABILITY_IMMUNITY}, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_STEELIX] = @@ -5642,6 +5653,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SHEER_FORCE}, .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SNUBBULL] = @@ -5791,6 +5803,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWARM, ABILITY_GUTS, ABILITY_MOXIE}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SNEASEL] = @@ -5814,6 +5827,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET}, .bodyColor = BODY_COLOR_BLACK, .noFlip = TRUE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_TEDDIURSA] = @@ -5858,6 +5872,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_GUTS, ABILITY_QUICK_FEET, ABILITY_UNNERVE}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SLUGMA] = @@ -5952,6 +5967,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_OBLIVIOUS, ABILITY_SNOW_CLOAK, ABILITY_THICK_FAT}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_CORSOLA] = @@ -6027,6 +6043,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SUCTION_CUPS, ABILITY_SNIPER, ABILITY_MOODY}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_DELIBIRD] = @@ -6142,6 +6159,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_EARLY_BIRD, ABILITY_FLASH_FIRE, ABILITY_UNNERVE}, .bodyColor = BODY_COLOR_BLACK, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_KINGDRA] = @@ -6212,6 +6230,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_STURDY, ABILITY_NONE, ABILITY_SAND_VEIL}, .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_PORYGON2] = @@ -6748,6 +6767,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SPEED_BOOST}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_COMBUSKEN] = @@ -6771,6 +6791,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SPEED_BOOST}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_BLAZIKEN] = @@ -6793,6 +6814,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SPEED_BOOST}, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_MUDKIP] = @@ -7024,6 +7046,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWARM, ABILITY_NONE, ABILITY_RIVALRY}, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_CASCOON] = @@ -7069,6 +7092,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SHIELD_DUST, ABILITY_NONE, ABILITY_COMPOUND_EYES}, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_LOTAD] = @@ -7138,6 +7162,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_SWIFT_SWIM, ABILITY_RAIN_DISH, ABILITY_OWN_TEMPO}, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SEEDOT] = @@ -7184,6 +7209,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_EARLY_BIRD, ABILITY_PICKPOCKET}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_SHIFTRY] = @@ -7207,6 +7233,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_EARLY_BIRD, ABILITY_PICKPOCKET}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_TAILLOW] = @@ -10597,6 +10624,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_TECHNICIAN, ABILITY_PICKUP, ABILITY_SKILL_LINK}, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_DRIFLOON] = @@ -11440,6 +11468,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_PICKPOCKET}, .bodyColor = BODY_COLOR_BLACK, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_MAGNEZONE] = @@ -11531,6 +11560,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_CHLOROPHYLL, ABILITY_LEAF_GUARD, ABILITY_REGENERATOR}, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_ELECTIVIRE] = @@ -11715,6 +11745,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_OBLIVIOUS, ABILITY_SNOW_CLOAK, ABILITY_THICK_FAT}, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, }, [SPECIES_PORYGON_Z] = @@ -23288,7 +23319,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .abilities = {ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_POISON_TOUCH}, .bodyColor = BODY_COLOR_BLACK, .noFlip = TRUE, - .flags = SPECIES_FLAG_HISUIAN_FORM, + .flags = SPECIES_FLAG_HISUIAN_FORM | SPECIES_FLAG_GENDER_DIFFERENCE, }, #if P_GEN_5_POKEMON == TRUE diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 0d95a5d95..b73dd70d0 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1363,9 +1363,36 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = 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), + SPECIES_SPRITE(WOOPER, gMonBackPic_WooperF), + SPECIES_SPRITE(QUAGSIRE, gMonBackPic_QuagsireF), + SPECIES_SPRITE(MURKROW, gMonBackPic_MurkrowF), + SPECIES_SPRITE(WOBBUFFET, gMonBackPic_WobbuffetF), + 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), + SPECIES_SPRITE(PILOSWINE, gMonBackPic_PiloswineF), + SPECIES_SPRITE(OCTILLERY, gMonBackPic_OctilleryF), + SPECIES_SPRITE(HOUNDOOM, gMonBackPic_HoundoomF), + SPECIES_SPRITE(DONPHAN, gMonBackPic_DonphanF), + SPECIES_SPRITE(TORCHIC, gMonBackPic_TorchicF), + SPECIES_SPRITE(COMBUSKEN, gMonBackPic_CombuskenF), + SPECIES_SPRITE(BLAZIKEN, gMonBackPic_BlazikenF), + SPECIES_SPRITE(BEAUTIFLY, gMonBackPic_BeautiflyF), + SPECIES_SPRITE(DUSTOX, gMonBackPic_DustoxF), + SPECIES_SPRITE(LUDICOLO, gMonBackPic_LudicoloF), + SPECIES_SPRITE(NUZLEAF, gMonBackPic_NuzleafF), + SPECIES_SPRITE(SHIFTRY, gMonBackPic_ShiftryF), SPECIES_SPRITE(MEDITITE, gMonBackPic_MedititeF), SPECIES_SPRITE(MEDICHAM, gMonBackPic_MedichamF), @@ -1378,12 +1405,16 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = SPECIES_SPRITE(KRICKETUNE, gMonBackPic_KricketuneF), SPECIES_SPRITE(SHINX, gMonBackPic_ShinxF), SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), + 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(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), @@ -1393,4 +1424,6 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = #if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF), #endif + + SPECIES_SPRITE(SNEASEL_HISUIAN, gMonBackPic_SneaselHisuianF), }; diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index df7562c94..adb60c0b6 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1362,9 +1362,36 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(MAGIKARP, gMonFrontPic_MagikarpF), SPECIES_SPRITE(GYARADOS, gMonFrontPic_GyaradosF), SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), + SPECIES_SPRITE(MEGANIUM, gMonFrontPic_MeganiumF), + SPECIES_SPRITE(LEDYBA, gMonFrontPic_LedybaF), + SPECIES_SPRITE(LEDIAN, gMonFrontPic_LedianF), SPECIES_SPRITE(XATU, gMonFrontPic_XatuF), + SPECIES_SPRITE(SUDOWOODO, gMonFrontPic_SudowoodoF), SPECIES_SPRITE(POLITOED, gMonFrontPic_PolitoedF), + SPECIES_SPRITE(AIPOM, gMonFrontPic_AipomF), + SPECIES_SPRITE(WOOPER, gMonFrontPic_WooperF), + SPECIES_SPRITE(QUAGSIRE, gMonFrontPic_QuagsireF), + SPECIES_SPRITE(MURKROW, gMonFrontPic_MurkrowF), + SPECIES_SPRITE(WOBBUFFET, gMonFrontPic_WobbuffetF), + SPECIES_SPRITE(GIRAFARIG, gMonFrontPic_GirafarigF), + SPECIES_SPRITE(GLIGAR, gMonFrontPic_GligarF), + SPECIES_SPRITE(STEELIX, gMonFrontPic_SteelixF), SPECIES_SPRITE(SCIZOR, gMonFrontPic_ScizorF), + SPECIES_SPRITE(HERACROSS, gMonFrontPic_HeracrossF), + SPECIES_SPRITE(SNEASEL, gMonFrontPic_SneaselF), + SPECIES_SPRITE(URSARING, gMonFrontPic_UrsaringF), + SPECIES_SPRITE(PILOSWINE, gMonFrontPic_PiloswineF), + 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), + SPECIES_SPRITE(DUSTOX, gMonFrontPic_DustoxF), + SPECIES_SPRITE(LUDICOLO, gMonFrontPic_LudicoloF), + SPECIES_SPRITE(NUZLEAF, gMonFrontPic_NuzleafF), + SPECIES_SPRITE(SHIFTRY, gMonFrontPic_ShiftryF), SPECIES_SPRITE(MEDITITE, gMonFrontPic_MedititeF), SPECIES_SPRITE(MEDICHAM, gMonFrontPic_MedichamF), @@ -1377,12 +1404,16 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(KRICKETUNE, gMonFrontPic_KricketuneF), SPECIES_SPRITE(SHINX, gMonFrontPic_ShinxF), SPECIES_SPRITE(COMBEE, gMonFrontPic_Combee), + SPECIES_SPRITE(AMBIPOM, gMonFrontPic_AmbipomF), 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), + SPECIES_SPRITE(WEAVILE, gMonFrontPic_WeavileF), SPECIES_SPRITE(RHYPERIOR, gMonFrontPic_RhyperiorF), + SPECIES_SPRITE(TANGROWTH, gMonFrontPic_TangrowthF), + SPECIES_SPRITE(MAMOSWINE, gMonFrontPic_MamoswineF), #endif #if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF), @@ -1392,4 +1423,6 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = #if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF), #endif + + SPECIES_SPRITE(SNEASEL_HISUIAN, gMonFrontPic_SneaselHisuianF), }; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index dea22fc54..fd2a05474 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1021,8 +1021,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ELECTRODE_HISUIAN, gMonPalette_ElectrodeHisuian), SPECIES_PAL(TYPHLOSION_HISUIAN, gMonPalette_TyphlosionHisuian), SPECIES_PAL(QWILFISH_HISUIAN, gMonPalette_QwilfishHisuian), -#if P_GEN_5_POKEMON == TRUE SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_SneaselHisuian), +#if P_GEN_5_POKEMON == TRUE SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_SamurottHisuian), SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_LilligantHisuian), SPECIES_PAL(ZORUA_HISUIAN, gMonPalette_ZoruaHisuian), @@ -1361,9 +1361,36 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(MAGIKARP, gMonPalette_Magikarp), SPECIES_PAL(GYARADOS, gMonPalette_Gyarados), SPECIES_PAL(EEVEE, gMonPalette_Eevee), + SPECIES_PAL(MEGANIUM, gMonPalette_Meganium), + SPECIES_PAL(LEDYBA, gMonPalette_Ledyba), + SPECIES_PAL(LEDIAN, gMonPalette_Ledian), SPECIES_PAL(XATU, gMonPalette_Xatu), + SPECIES_PAL(SUDOWOODO, gMonPalette_Sudowoodo), SPECIES_PAL(POLITOED, gMonPalette_Politoed), + SPECIES_PAL(AIPOM, gMonPalette_Aipom), + SPECIES_PAL(WOOPER, gMonPalette_Wooper), + SPECIES_PAL(QUAGSIRE, gMonPalette_Quagsire), + SPECIES_PAL(MURKROW, gMonPalette_Murkrow), + SPECIES_PAL(WOBBUFFET, gMonPalette_Wobbuffet), + SPECIES_PAL(GIRAFARIG, gMonPalette_Girafarig), + SPECIES_PAL(GLIGAR, gMonPalette_Gligar), + SPECIES_PAL(STEELIX, gMonPalette_Steelix), SPECIES_PAL(SCIZOR, gMonPalette_Scizor), + SPECIES_PAL(HERACROSS, gMonPalette_Heracross), + SPECIES_PAL(SNEASEL, gMonPalette_Sneasel), + SPECIES_PAL(URSARING, gMonPalette_Ursaring), + SPECIES_PAL(PILOSWINE, gMonPalette_Piloswine), + SPECIES_PAL(OCTILLERY, gMonPalette_Octillery), + SPECIES_PAL(HOUNDOOM, gMonPalette_Houndoom), + SPECIES_PAL(DONPHAN, gMonPalette_Donphan), + SPECIES_PAL(TORCHIC, gMonPalette_Torchic), + SPECIES_PAL(COMBUSKEN, gMonPalette_Combusken), + SPECIES_PAL(BLAZIKEN, gMonPalette_Blaziken), + SPECIES_PAL(BEAUTIFLY, gMonPalette_Beautifly), + SPECIES_PAL(DUSTOX, gMonPalette_Dustox), + SPECIES_PAL(LUDICOLO, gMonPalette_Ludicolo), + SPECIES_PAL(NUZLEAF, gMonPalette_Nuzleaf), + SPECIES_PAL(SHIFTRY, gMonPalette_Shiftry), SPECIES_PAL(MEDITITE, gMonPalette_Meditite), SPECIES_PAL(MEDICHAM, gMonPalette_Medicham), @@ -1376,12 +1403,16 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(KRICKETUNE, gMonPalette_Kricketune), SPECIES_PAL(SHINX, gMonPalette_Shinx), SPECIES_PAL(COMBEE, gMonPalette_CombeeF), + SPECIES_PAL(AMBIPOM, gMonPalette_Ambipom), 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), + SPECIES_PAL(WEAVILE, gMonPalette_Weavile), SPECIES_PAL(RHYPERIOR, gMonPalette_Rhyperior), + SPECIES_PAL(TANGROWTH, gMonPalette_Tangrowth), + SPECIES_PAL(MAMOSWINE, gMonPalette_Mamoswine), #endif #if P_GEN_5_POKEMON == TRUE SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF), @@ -1391,4 +1422,6 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = #if P_GEN_6_POKEMON == TRUE SPECIES_PAL(PYROAR, gMonPalette_Pyroar), #endif + + SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_SneaselHisuian), }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 71fa8f0fb..b890f1fb1 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1360,9 +1360,36 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(MAGIKARP, gMonShinyPalette_Magikarp), SPECIES_SHINY_PAL(GYARADOS, gMonShinyPalette_Gyarados), SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), + SPECIES_SHINY_PAL(MEGANIUM, gMonShinyPalette_Meganium), + SPECIES_SHINY_PAL(LEDYBA, gMonShinyPalette_Ledyba), + SPECIES_SHINY_PAL(LEDIAN, gMonShinyPalette_Ledian), SPECIES_SHINY_PAL(XATU, gMonShinyPalette_Xatu), + SPECIES_SHINY_PAL(SUDOWOODO, gMonShinyPalette_Sudowoodo), SPECIES_SHINY_PAL(POLITOED, gMonShinyPalette_Politoed), + SPECIES_SHINY_PAL(AIPOM, gMonShinyPalette_Aipom), + SPECIES_SHINY_PAL(WOOPER, gMonShinyPalette_Wooper), + SPECIES_SHINY_PAL(QUAGSIRE, gMonShinyPalette_Quagsire), + SPECIES_SHINY_PAL(MURKROW, gMonShinyPalette_Murkrow), + SPECIES_SHINY_PAL(WOBBUFFET, gMonShinyPalette_Wobbuffet), + SPECIES_SHINY_PAL(GIRAFARIG, gMonShinyPalette_Girafarig), + SPECIES_SHINY_PAL(GLIGAR, gMonShinyPalette_Gligar), + SPECIES_SHINY_PAL(STEELIX, gMonShinyPalette_Steelix), SPECIES_SHINY_PAL(SCIZOR, gMonShinyPalette_Scizor), + SPECIES_SHINY_PAL(HERACROSS, gMonShinyPalette_Heracross), + SPECIES_SHINY_PAL(SNEASEL, gMonShinyPalette_Sneasel), + SPECIES_SHINY_PAL(URSARING, gMonShinyPalette_Ursaring), + SPECIES_SHINY_PAL(PILOSWINE, gMonShinyPalette_Piloswine), + SPECIES_SHINY_PAL(OCTILLERY, gMonShinyPalette_Octillery), + SPECIES_SHINY_PAL(HOUNDOOM, gMonShinyPalette_Houndoom), + SPECIES_SHINY_PAL(DONPHAN, gMonShinyPalette_Donphan), + SPECIES_SHINY_PAL(TORCHIC, gMonShinyPalette_Torchic), + SPECIES_SHINY_PAL(COMBUSKEN, gMonShinyPalette_Combusken), + SPECIES_SHINY_PAL(BLAZIKEN, gMonShinyPalette_Blaziken), + SPECIES_SHINY_PAL(BEAUTIFLY, gMonShinyPalette_Beautifly), + SPECIES_SHINY_PAL(DUSTOX, gMonShinyPalette_Dustox), + SPECIES_SHINY_PAL(LUDICOLO, gMonShinyPalette_Ludicolo), + SPECIES_SHINY_PAL(NUZLEAF, gMonShinyPalette_Nuzleaf), + SPECIES_SHINY_PAL(SHIFTRY, gMonShinyPalette_Shiftry), SPECIES_SHINY_PAL(MEDITITE, gMonShinyPalette_Meditite), SPECIES_SHINY_PAL(MEDICHAM, gMonShinyPalette_Medicham), @@ -1375,12 +1402,16 @@ 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(AMBIPOM, gMonShinyPalette_Ambipom), 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), + SPECIES_SHINY_PAL(WEAVILE, gMonShinyPalette_Weavile), SPECIES_SHINY_PAL(RHYPERIOR, gMonShinyPalette_Rhyperior), + SPECIES_SHINY_PAL(TANGROWTH, gMonShinyPalette_Tangrowth), + SPECIES_SHINY_PAL(MAMOSWINE, gMonShinyPalette_Mamoswine), #endif #if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(UNFEZANT, gMonShinyPalette_UnfezantF), @@ -1390,4 +1421,6 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = #if P_GEN_6_POKEMON == TRUE SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_Pyroar), #endif + + SPECIES_SHINY_PAL(SNEASEL_HISUIAN, gMonShinyPalette_SneaselHisuian), }; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 837f8f3e8..c1a469485 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1323,9 +1323,36 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_MAGIKARP] = gMonIcon_Magikarp, [SPECIES_GYARADOS] = gMonIcon_Gyarados, [SPECIES_EEVEE] = gMonIcon_Eevee, + [SPECIES_MEGANIUM] = gMonIcon_Meganium, + [SPECIES_LEDYBA] = gMonIcon_Ledyba, + [SPECIES_LEDIAN] = gMonIcon_Ledian, [SPECIES_XATU] = gMonIcon_Xatu, + [SPECIES_SUDOWOODO] = gMonIcon_Sudowoodo, [SPECIES_POLITOED] = gMonIcon_Politoed, + [SPECIES_AIPOM] = gMonIcon_Aipom, + [SPECIES_WOOPER] = gMonIcon_Wooper, + [SPECIES_QUAGSIRE] = gMonIcon_Quagsire, + [SPECIES_MURKROW] = gMonIcon_Murkrow, + [SPECIES_WOBBUFFET] = gMonIcon_Wobbuffet, + [SPECIES_GIRAFARIG] = gMonIcon_Girafarig, + [SPECIES_GLIGAR] = gMonIcon_Gligar, + [SPECIES_STEELIX] = gMonIcon_Steelix, [SPECIES_SCIZOR] = gMonIcon_Scizor, + [SPECIES_HERACROSS] = gMonIcon_Heracross, + [SPECIES_SNEASEL] = gMonIcon_Sneasel, + [SPECIES_URSARING] = gMonIcon_Ursaring, + [SPECIES_PILOSWINE] = gMonIcon_Piloswine, + [SPECIES_OCTILLERY] = gMonIcon_Octillery, + [SPECIES_HOUNDOOM] = gMonIcon_Houndoom, + [SPECIES_DONPHAN] = gMonIcon_Donphan, + [SPECIES_TORCHIC] = gMonIcon_Torchic, + [SPECIES_COMBUSKEN] = gMonIcon_Combusken, + [SPECIES_BLAZIKEN] = gMonIcon_Blaziken, + [SPECIES_BEAUTIFLY] = gMonIcon_Beautifly, + [SPECIES_DUSTOX] = gMonIcon_Dustox, + [SPECIES_LUDICOLO] = gMonIcon_Ludicolo, + [SPECIES_NUZLEAF] = gMonIcon_Nuzleaf, + [SPECIES_SHIFTRY] = gMonIcon_Shiftry, [SPECIES_MEDITITE] = gMonIcon_Meditite, [SPECIES_MEDICHAM] = gMonIcon_Medicham, #if P_GEN_4_POKEMON == TRUE @@ -1337,6 +1364,7 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_KRICKETUNE] = gMonIcon_Kricketune, [SPECIES_SHINX] = gMonIcon_Shinx, [SPECIES_COMBEE] = gMonIcon_Combee, + [SPECIES_AMBIPOM] = gMonIcon_Ambipom, [SPECIES_GIBLE] = gMonIcon_Gible, [SPECIES_GABITE] = gMonIcon_Gabite, [SPECIES_GARCHOMP] = gMonIcon_Garchomp, @@ -1347,7 +1375,10 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, #endif + [SPECIES_WEAVILE] = gMonIcon_Weavile, [SPECIES_RHYPERIOR] = gMonIcon_Rhyperior, + [SPECIES_TANGROWTH] = gMonIcon_Tangrowth, + [SPECIES_MAMOSWINE] = gMonIcon_Mamoswine, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_UNFEZANT] = gMonIcon_UnfezantF, @@ -1357,6 +1388,7 @@ const u8 *const gMonIconTableFemale[] = #if P_GEN_6_POKEMON == TRUE [SPECIES_PYROAR] = gMonIcon_PyroarF, #endif + [SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian, }; const u8 gMonIconPaletteIndices[] = @@ -2601,9 +2633,36 @@ const u8 gMonIconPaletteIndicesFemale[] = [SPECIES_MAGIKARP] = 0, [SPECIES_GYARADOS] = 0, [SPECIES_EEVEE] = 2, + [SPECIES_MEGANIUM] = 1, + [SPECIES_LEDYBA] = 0, + [SPECIES_LEDIAN] = 0, [SPECIES_XATU] = 1, + [SPECIES_SUDOWOODO] = 1, [SPECIES_POLITOED] = 1, + [SPECIES_AIPOM] = 2, + [SPECIES_WOOPER] = 0, + [SPECIES_QUAGSIRE] = 0, + [SPECIES_MURKROW] = 2, + [SPECIES_WOBBUFFET] = 0, + [SPECIES_GIRAFARIG] = 1, + [SPECIES_GLIGAR] = 0, + [SPECIES_STEELIX] = 0, [SPECIES_SCIZOR] = 0, + [SPECIES_HERACROSS] = 0, + [SPECIES_SNEASEL] = 0, + [SPECIES_URSARING] = 2, + [SPECIES_PILOSWINE] = 2, + [SPECIES_OCTILLERY] = 0, + [SPECIES_HOUNDOOM] = 0, + [SPECIES_DONPHAN] = 0, + [SPECIES_TORCHIC] = 0, + [SPECIES_COMBUSKEN] = 0, + [SPECIES_BLAZIKEN] = 0, + [SPECIES_BEAUTIFLY] = 0, + [SPECIES_DUSTOX] = 5, + [SPECIES_LUDICOLO] = 1, + [SPECIES_NUZLEAF] = 1, + [SPECIES_SHIFTRY] = 5, [SPECIES_MEDITITE] = 0, [SPECIES_MEDICHAM] = 0, #if P_GEN_4_POKEMON == TRUE @@ -2614,12 +2673,16 @@ const u8 gMonIconPaletteIndicesFemale[] = [SPECIES_KRICKETUNE] = 2, [SPECIES_SHINX] = 0, [SPECIES_COMBEE] = 0, + [SPECIES_AMBIPOM] = 2, [SPECIES_GIBLE] = 0, [SPECIES_GABITE] = 0, [SPECIES_GARCHOMP] = 0, [SPECIES_HIPPOPOTAS] = 1, [SPECIES_HIPPOWDON] = 1, + [SPECIES_WEAVILE] = 0, [SPECIES_RHYPERIOR] = 0, + [SPECIES_TANGROWTH] = 0, + [SPECIES_MAMOSWINE] = 2, #endif #if P_GEN_5_POKEMON == TRUE [SPECIES_UNFEZANT] = 1, @@ -2632,6 +2695,7 @@ const u8 gMonIconPaletteIndicesFemale[] = #if P_GEN_8_POKEMON == TRUE [SPECIES_BASCULEGION] = 0, #endif + [SPECIES_SNEASEL_HISUIAN] = 2, }; const struct SpritePalette gMonIconPaletteTable[] =