Data entry for new sprites
Add sprite defines, entries to gender tables, etc.
This commit is contained in:
BuffelSaft
parent
0f5444d331
commit
db928a1329
10 changed files with 110 additions and 3 deletions
|
|
@ -453,6 +453,7 @@ extern const u32 gMonFrontPic_Burmy[];
|
|||
extern const u32 gMonFrontPic_Wormadam[];
|
||||
extern const u32 gMonFrontPic_Mothim[];
|
||||
extern const u32 gMonFrontPic_Combee[];
|
||||
extern const u32 gMonFrontPic_CombeeF[];
|
||||
extern const u32 gMonFrontPic_Vespiquen[];
|
||||
extern const u32 gMonFrontPic_Pachirisu[];
|
||||
extern const u32 gMonFrontPic_Buizel[];
|
||||
|
|
@ -487,6 +488,7 @@ extern const u32 gMonFrontPic_Munchlax[];
|
|||
extern const u32 gMonFrontPic_Riolu[];
|
||||
extern const u32 gMonFrontPic_Lucario[];
|
||||
extern const u32 gMonFrontPic_Hippopotas[];
|
||||
extern const u32 gMonFrontPic_HippopotasF[];
|
||||
extern const u32 gMonFrontPic_Hippowdon[];
|
||||
extern const u32 gMonFrontPic_Skorupi[];
|
||||
extern const u32 gMonFrontPic_Drapion[];
|
||||
|
|
@ -559,6 +561,7 @@ extern const u32 gMonFrontPic_Musharna[];
|
|||
extern const u32 gMonFrontPic_Pidove[];
|
||||
extern const u32 gMonFrontPic_Tranquill[];
|
||||
extern const u32 gMonFrontPic_Unfezant[];
|
||||
extern const u32 gMonFrontPic_UnfezantF[];
|
||||
extern const u32 gMonFrontPic_Blitzle[];
|
||||
extern const u32 gMonFrontPic_Zebstrika[];
|
||||
extern const u32 gMonFrontPic_Roggenrola[];
|
||||
|
|
@ -630,7 +633,9 @@ extern const u32 gMonFrontPic_Escavalier[];
|
|||
extern const u32 gMonFrontPic_Foongus[];
|
||||
extern const u32 gMonFrontPic_Amoonguss[];
|
||||
extern const u32 gMonFrontPic_Frillish[];
|
||||
extern const u32 gMonFrontPic_FrillishF[];
|
||||
extern const u32 gMonFrontPic_Jellicent[];
|
||||
extern const u32 gMonFrontPic_JellicentF[];
|
||||
extern const u32 gMonFrontPic_Alomomola[];
|
||||
extern const u32 gMonFrontPic_Joltik[];
|
||||
extern const u32 gMonFrontPic_Galvantula[];
|
||||
|
|
@ -706,6 +711,7 @@ extern const u32 gMonFrontPic_Spewpa[];
|
|||
extern const u32 gMonFrontPic_Vivillon[];
|
||||
extern const u32 gMonFrontPic_Litleo[];
|
||||
extern const u32 gMonFrontPic_Pyroar[];
|
||||
extern const u32 gMonFrontPic_PyroarF[];
|
||||
extern const u32 gMonFrontPic_Flabebe[];
|
||||
extern const u32 gMonFrontPic_Floette[];
|
||||
extern const u32 gMonFrontPic_Florges[];
|
||||
|
|
@ -1627,7 +1633,9 @@ extern const u32 gMonBackPic_Munchlax[];
|
|||
extern const u32 gMonBackPic_Riolu[];
|
||||
extern const u32 gMonBackPic_Lucario[];
|
||||
extern const u32 gMonBackPic_Hippopotas[];
|
||||
extern const u32 gMonBackPic_HippopotasF[];
|
||||
extern const u32 gMonBackPic_Hippowdon[];
|
||||
extern const u32 gMonBackPic_HippowdonF[];
|
||||
extern const u32 gMonBackPic_Skorupi[];
|
||||
extern const u32 gMonBackPic_Drapion[];
|
||||
extern const u32 gMonBackPic_Croagunk[];
|
||||
|
|
@ -1699,6 +1707,7 @@ extern const u32 gMonBackPic_Musharna[];
|
|||
extern const u32 gMonBackPic_Pidove[];
|
||||
extern const u32 gMonBackPic_Tranquill[];
|
||||
extern const u32 gMonBackPic_Unfezant[];
|
||||
extern const u32 gMonBackPic_UnfezantF[];
|
||||
extern const u32 gMonBackPic_Blitzle[];
|
||||
extern const u32 gMonBackPic_Zebstrika[];
|
||||
extern const u32 gMonBackPic_Roggenrola[];
|
||||
|
|
@ -1770,7 +1779,9 @@ extern const u32 gMonBackPic_Escavalier[];
|
|||
extern const u32 gMonBackPic_Foongus[];
|
||||
extern const u32 gMonBackPic_Amoonguss[];
|
||||
extern const u32 gMonBackPic_Frillish[];
|
||||
extern const u32 gMonBackPic_FrillishF[];
|
||||
extern const u32 gMonBackPic_Jellicent[];
|
||||
extern const u32 gMonBackPic_JellicentF[];
|
||||
extern const u32 gMonBackPic_Alomomola[];
|
||||
extern const u32 gMonBackPic_Joltik[];
|
||||
extern const u32 gMonBackPic_Galvantula[];
|
||||
|
|
@ -1846,6 +1857,7 @@ extern const u32 gMonBackPic_Spewpa[];
|
|||
extern const u32 gMonBackPic_Vivillon[];
|
||||
extern const u32 gMonBackPic_Litleo[];
|
||||
extern const u32 gMonBackPic_Pyroar[];
|
||||
extern const u32 gMonBackPic_PyroarF[];
|
||||
extern const u32 gMonBackPic_Flabebe[];
|
||||
extern const u32 gMonBackPic_Floette[];
|
||||
extern const u32 gMonBackPic_Florges[];
|
||||
|
|
@ -2765,7 +2777,9 @@ extern const u32 gMonPalette_Munchlax[];
|
|||
extern const u32 gMonPalette_Riolu[];
|
||||
extern const u32 gMonPalette_Lucario[];
|
||||
extern const u32 gMonPalette_Hippopotas[];
|
||||
extern const u32 gMonPalette_HippopotasF[];
|
||||
extern const u32 gMonPalette_Hippowdon[];
|
||||
extern const u32 gMonPalette_HippowdonF[];
|
||||
extern const u32 gMonPalette_Skorupi[];
|
||||
extern const u32 gMonPalette_Drapion[];
|
||||
extern const u32 gMonPalette_Croagunk[];
|
||||
|
|
@ -2837,6 +2851,7 @@ extern const u32 gMonPalette_Musharna[];
|
|||
extern const u32 gMonPalette_Pidove[];
|
||||
extern const u32 gMonPalette_Tranquill[];
|
||||
extern const u32 gMonPalette_Unfezant[];
|
||||
extern const u32 gMonPalette_UnfezantF[];
|
||||
extern const u32 gMonPalette_Blitzle[];
|
||||
extern const u32 gMonPalette_Zebstrika[];
|
||||
extern const u32 gMonPalette_Roggenrola[];
|
||||
|
|
@ -2908,7 +2923,9 @@ extern const u32 gMonPalette_Escavalier[];
|
|||
extern const u32 gMonPalette_Foongus[];
|
||||
extern const u32 gMonPalette_Amoonguss[];
|
||||
extern const u32 gMonPalette_Frillish[];
|
||||
extern const u32 gMonPalette_FrillishF[];
|
||||
extern const u32 gMonPalette_Jellicent[];
|
||||
extern const u32 gMonPalette_JellicentF[];
|
||||
extern const u32 gMonPalette_Alomomola[];
|
||||
extern const u32 gMonPalette_Joltik[];
|
||||
extern const u32 gMonPalette_Galvantula[];
|
||||
|
|
@ -2984,6 +3001,7 @@ extern const u32 gMonPalette_Spewpa[];
|
|||
extern const u32 gMonPalette_Vivillon[];
|
||||
extern const u32 gMonPalette_Litleo[];
|
||||
extern const u32 gMonPalette_Pyroar[];
|
||||
extern const u32 gMonPalette_PyroarF[];
|
||||
extern const u32 gMonPalette_Flabebe[];
|
||||
extern const u32 gMonPalette_Floette[];
|
||||
extern const u32 gMonPalette_Florges[];
|
||||
|
|
@ -3930,6 +3948,9 @@ extern const u32 gMonShinyPalette_Munchlax[];
|
|||
extern const u32 gMonShinyPalette_Riolu[];
|
||||
extern const u32 gMonShinyPalette_Lucario[];
|
||||
extern const u32 gMonShinyPalette_Hippopotas[];
|
||||
extern const u32 gMonShinyPalette_HippopotasF[];
|
||||
extern const u32 gMonShinyPalette_Hippowdon[];
|
||||
extern const u32 gMonShinyPalette_HippowdonF[];
|
||||
extern const u32 gMonShinyPalette_Hippowdon[];
|
||||
extern const u32 gMonShinyPalette_Skorupi[];
|
||||
extern const u32 gMonShinyPalette_Drapion[];
|
||||
|
|
@ -4002,6 +4023,7 @@ extern const u32 gMonShinyPalette_Musharna[];
|
|||
extern const u32 gMonShinyPalette_Pidove[];
|
||||
extern const u32 gMonShinyPalette_Tranquill[];
|
||||
extern const u32 gMonShinyPalette_Unfezant[];
|
||||
extern const u32 gMonShinyPalette_UnfezantF[];
|
||||
extern const u32 gMonShinyPalette_Blitzle[];
|
||||
extern const u32 gMonShinyPalette_Zebstrika[];
|
||||
extern const u32 gMonShinyPalette_Roggenrola[];
|
||||
|
|
@ -4073,7 +4095,9 @@ extern const u32 gMonShinyPalette_Escavalier[];
|
|||
extern const u32 gMonShinyPalette_Foongus[];
|
||||
extern const u32 gMonShinyPalette_Amoonguss[];
|
||||
extern const u32 gMonShinyPalette_Frillish[];
|
||||
extern const u32 gMonShinyPalette_FrillishF[];
|
||||
extern const u32 gMonShinyPalette_Jellicent[];
|
||||
extern const u32 gMonShinyPalette_JellicentF[];
|
||||
extern const u32 gMonShinyPalette_Alomomola[];
|
||||
extern const u32 gMonShinyPalette_Joltik[];
|
||||
extern const u32 gMonShinyPalette_Galvantula[];
|
||||
|
|
@ -4149,6 +4173,7 @@ extern const u32 gMonShinyPalette_Spewpa[];
|
|||
extern const u32 gMonShinyPalette_Vivillon[];
|
||||
extern const u32 gMonShinyPalette_Litleo[];
|
||||
extern const u32 gMonShinyPalette_Pyroar[];
|
||||
extern const u32 gMonShinyPalette_PyroarF[];
|
||||
extern const u32 gMonShinyPalette_Flabebe[];
|
||||
extern const u32 gMonShinyPalette_Floette[];
|
||||
extern const u32 gMonShinyPalette_Florges[];
|
||||
|
|
@ -5159,6 +5184,7 @@ extern const u8 gMonIcon_Musharna[];
|
|||
extern const u8 gMonIcon_Pidove[];
|
||||
extern const u8 gMonIcon_Tranquill[];
|
||||
extern const u8 gMonIcon_Unfezant[];
|
||||
extern const u8 gMonIcon_UnfezantF[];
|
||||
extern const u8 gMonIcon_Blitzle[];
|
||||
extern const u8 gMonIcon_Zebstrika[];
|
||||
extern const u8 gMonIcon_Roggenrola[];
|
||||
|
|
@ -5230,7 +5256,9 @@ extern const u8 gMonIcon_Escavalier[];
|
|||
extern const u8 gMonIcon_Foongus[];
|
||||
extern const u8 gMonIcon_Amoonguss[];
|
||||
extern const u8 gMonIcon_Frillish[];
|
||||
extern const u8 gMonIcon_FrillishF[];
|
||||
extern const u8 gMonIcon_Jellicent[];
|
||||
extern const u8 gMonIcon_JellicentF[];
|
||||
extern const u8 gMonIcon_Alomomola[];
|
||||
extern const u8 gMonIcon_Joltik[];
|
||||
extern const u8 gMonIcon_Galvantula[];
|
||||
|
|
@ -5306,6 +5334,7 @@ extern const u8 gMonIcon_Spewpa[];
|
|||
extern const u8 gMonIcon_Vivillon[];
|
||||
extern const u8 gMonIcon_Litleo[];
|
||||
extern const u8 gMonIcon_Pyroar[];
|
||||
extern const u8 gMonIcon_PyroarF[];
|
||||
extern const u8 gMonIcon_Flabebe[];
|
||||
extern const u8 gMonIcon_Floette[];
|
||||
extern const u8 gMonIcon_Florges[];
|
||||
|
|
|
|||
|
|
@ -305,6 +305,13 @@ const union AnimCmd *const gAnims_MonPic[] =
|
|||
const bool8 SpeciesHasGenderDifference[NUM_SPECIES] =
|
||||
{
|
||||
[SPECIES_EEVEE] = TRUE,
|
||||
[SPECIES_COMBEE] = TRUE,
|
||||
[SPECIES_HIPPOPOTAS] = TRUE,
|
||||
[SPECIES_HIPPOWDON] = TRUE,
|
||||
[SPECIES_UNFEZANT] = TRUE,
|
||||
[SPECIES_FRILLISH] = TRUE,
|
||||
[SPECIES_JELLICENT] = TRUE,
|
||||
[SPECIES_PYROAR] = TRUE,
|
||||
};
|
||||
|
||||
#include "data/pokemon_graphics/front_pic_coordinates.h"
|
||||
|
|
|
|||
|
|
@ -416,6 +416,7 @@ const u32 gMonFrontPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4
|
|||
const u32 gMonFrontPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/anim_frontf.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz");
|
||||
|
|
@ -450,6 +451,7 @@ const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/anim_f
|
|||
const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_frontf.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/anim_front.4bpp.lz");
|
||||
|
|
@ -521,7 +523,8 @@ const u32 gMonFrontPic_Munna[] = INCBIN_U32("graphics/pokemon/munna/anim_front.4
|
|||
const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/anim_frontf.4bpp.lz");
|
||||
const u32 gMonFrontPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/anim_front.4bpp.lz");
|
||||
|
|
@ -593,7 +596,9 @@ const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/an
|
|||
const u32 gMonFrontPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/anim_frontf.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/anim_frontf.4bpp.lz");
|
||||
const u32 gMonFrontPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/anim_front.4bpp.lz");
|
||||
|
|
@ -669,6 +674,7 @@ const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/front.4bpp
|
|||
const u32 gMonFrontPic_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/frontf.4bpp.lz");
|
||||
const u32 gMonFrontPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/front.4bpp.lz");
|
||||
|
|
@ -1590,7 +1596,9 @@ const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/back.4b
|
|||
const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/back.4bpp.lz");
|
||||
const u32 gMonBackPic_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/backf.4bpp.lz");
|
||||
const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/back.4bpp.lz");
|
||||
const u32 gMonBackPic_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/backf.4bpp.lz");
|
||||
const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/back.4bpp.lz");
|
||||
|
|
@ -1662,6 +1670,7 @@ const u32 gMonBackPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/back.4b
|
|||
const u32 gMonBackPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/back.4bpp.lz");
|
||||
const u32 gMonBackPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/backf.4bpp.lz");
|
||||
const u32 gMonBackPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/back.4bpp.lz");
|
||||
|
|
@ -1733,7 +1742,9 @@ const u32 gMonBackPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/bac
|
|||
const u32 gMonBackPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/back.4bpp.lz");
|
||||
const u32 gMonBackPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/backf.4bpp.lz");
|
||||
const u32 gMonBackPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/back.4bpp.lz");
|
||||
const u32 gMonBackPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/backf.4bpp.lz");
|
||||
const u32 gMonBackPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/back.4bpp.lz");
|
||||
|
|
@ -1809,6 +1820,7 @@ const u32 gMonBackPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/back.4bpp.l
|
|||
const u32 gMonBackPic_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/back.4bpp.lz");
|
||||
const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/backf.4bpp.lz");
|
||||
const u32 gMonBackPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/back.4bpp.lz");
|
||||
|
|
@ -2728,7 +2740,9 @@ const u32 gMonPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/normal.
|
|||
const u32 gMonPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/normal.gbapal.lz");
|
||||
const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/normalf.gbapal.lz");
|
||||
const u32 gMonPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/normal.gbapal.lz");
|
||||
const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/normalf.gbapal.lz");
|
||||
const u32 gMonPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/normal.gbapal.lz");
|
||||
|
|
@ -2800,6 +2814,7 @@ const u32 gMonPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/normal.
|
|||
const u32 gMonPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/normal.gbapal.lz");
|
||||
const u32 gMonPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/normalf.gbapal.lz");
|
||||
const u32 gMonPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/normal.gbapal.lz");
|
||||
|
|
@ -2871,7 +2886,9 @@ const u32 gMonPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/nor
|
|||
const u32 gMonPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/normal.gbapal.lz");
|
||||
const u32 gMonPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/normalf.gbapal.lz");
|
||||
const u32 gMonPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/normal.gbapal.lz");
|
||||
const u32 gMonPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/normalf.gbapal.lz");
|
||||
const u32 gMonPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/normal.gbapal.lz");
|
||||
|
|
@ -2947,6 +2964,7 @@ const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/normal.gbap
|
|||
const u32 gMonPalette_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/normal.gbapal.lz");
|
||||
const u32 gMonPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/normalf.gbapal.lz");
|
||||
const u32 gMonPalette_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Floette[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Florges[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz");
|
||||
|
|
@ -3893,7 +3911,9 @@ const u32 gMonShinyPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/sh
|
|||
const u32 gMonShinyPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/shinyf.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/shinyf.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/shiny.gbapal.lz");
|
||||
|
|
@ -3965,6 +3985,7 @@ const u32 gMonShinyPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/sh
|
|||
const u32 gMonShinyPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/shinyf.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/shiny.gbapal.lz");
|
||||
|
|
@ -4036,7 +4057,9 @@ const u32 gMonShinyPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalie
|
|||
const u32 gMonShinyPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/shinyf.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/shinyf.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/shiny.gbapal.lz");
|
||||
|
|
@ -4112,6 +4135,7 @@ const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/shiny.
|
|||
const u32 gMonShinyPalette_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/shinyf.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Floette[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Florges[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz");
|
||||
|
|
@ -5122,6 +5146,7 @@ const u8 gMonIcon_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/icon.4bpp");
|
|||
const u8 gMonIcon_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/icon.4bpp");
|
||||
const u8 gMonIcon_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/icon.4bpp");
|
||||
const u8 gMonIcon_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/icon.4bpp");
|
||||
const u8 gMonIcon_UnfezantF[] = INCBIN_U8("graphics/pokemon/unfezant/iconf.4bpp");
|
||||
const u8 gMonIcon_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/icon.4bpp");
|
||||
const u8 gMonIcon_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/icon.4bpp");
|
||||
const u8 gMonIcon_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/icon.4bpp");
|
||||
|
|
@ -5193,7 +5218,9 @@ const u8 gMonIcon_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/icon.4bp
|
|||
const u8 gMonIcon_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/icon.4bpp");
|
||||
const u8 gMonIcon_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/icon.4bpp");
|
||||
const u8 gMonIcon_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/icon.4bpp");
|
||||
const u8 gMonIcon_FrillishF[] = INCBIN_U8("graphics/pokemon/frillish/iconf.4bpp");
|
||||
const u8 gMonIcon_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/icon.4bpp");
|
||||
const u8 gMonIcon_JellicentF[] = INCBIN_U8("graphics/pokemon/jellicent/iconf.4bpp");
|
||||
const u8 gMonIcon_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/icon.4bpp");
|
||||
const u8 gMonIcon_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/icon.4bpp");
|
||||
const u8 gMonIcon_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/icon.4bpp");
|
||||
|
|
@ -5269,6 +5296,7 @@ const u8 gMonIcon_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/icon.4bpp");
|
|||
const u8 gMonIcon_Vivillon[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp");
|
||||
const u8 gMonIcon_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/icon.4bpp");
|
||||
const u8 gMonIcon_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/icon.4bpp");
|
||||
const u8 gMonIcon_PyroarF[] = INCBIN_U8("graphics/pokemon/pyroar/iconf.4bpp");
|
||||
const u8 gMonIcon_Flabebe[] = INCBIN_U8("graphics/pokemon/flabebe/icon.4bpp");
|
||||
const u8 gMonIcon_Floette[] = INCBIN_U8("graphics/pokemon/floette/icon.4bpp");
|
||||
const u8 gMonIcon_Florges[] = INCBIN_U8("graphics/pokemon/florges/icon.4bpp");
|
||||
|
|
|
|||
|
|
@ -1278,4 +1278,11 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
|
|||
const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
|
||||
{
|
||||
SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF),
|
||||
SPECIES_SPRITE(COMBEE, gMonBackPic_Combee),
|
||||
SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF),
|
||||
SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF),
|
||||
SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF),
|
||||
SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF),
|
||||
SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF),
|
||||
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5974,7 +5974,8 @@ static const union AnimCmd sAnim_TRANQUILL_1[] =
|
|||
|
||||
static const union AnimCmd sAnim_UNFEZANT_1[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 1),
|
||||
ANIMCMD_FRAME(1, 40),
|
||||
ANIMCMD_FRAME(0, 20),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1278,4 +1278,11 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
|
|||
const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
|
||||
{
|
||||
SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF),
|
||||
SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF),
|
||||
SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF),
|
||||
SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon),
|
||||
SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF),
|
||||
SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF),
|
||||
SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF),
|
||||
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1278,4 +1278,11 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
|
|||
const struct CompressedSpritePalette gMonPaletteTableFemale[] =
|
||||
{
|
||||
SPECIES_PAL(EEVEE, gMonPalette_Eevee),
|
||||
SPECIES_PAL(COMBEE, gMonPalette_Combee),
|
||||
SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF),
|
||||
SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF),
|
||||
SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF),
|
||||
SPECIES_PAL(FRILLISH, gMonPalette_FrillishF),
|
||||
SPECIES_PAL(JELLICENT, gMonPalette_JellicentF),
|
||||
SPECIES_PAL(PYROAR, gMonPalette_PyroarF),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1278,4 +1278,11 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
|
|||
const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
|
||||
{
|
||||
SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee),
|
||||
SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee),
|
||||
SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF),
|
||||
SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF),
|
||||
SPECIES_SHINY_PAL(UNFEZANT, gMonShinyPalette_UnfezantF),
|
||||
SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF),
|
||||
SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF),
|
||||
SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2451,7 +2451,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
|
|||
[SPECIES_MUSHARNA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
|
||||
[SPECIES_PIDOVE - 1] = ANIM_V_SQUISH_AND_BOUNCE,
|
||||
[SPECIES_TRANQUILL - 1] = ANIM_V_SQUISH_AND_BOUNCE,
|
||||
[SPECIES_UNFEZANT - 1] = ANIM_V_SQUISH_AND_BOUNCE,
|
||||
[SPECIES_UNFEZANT - 1] = ANIM_V_STRETCH,
|
||||
[SPECIES_BLITZLE - 1] = ANIM_V_SQUISH_AND_BOUNCE,
|
||||
[SPECIES_ZEBSTRIKA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
|
||||
[SPECIES_ROGGENROLA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
|
||||
|
|
|
|||
|
|
@ -1240,6 +1240,13 @@ const u8 *const gMonIconTable[] =
|
|||
const u8 *const gMonIconTableFemale[] =
|
||||
{
|
||||
[SPECIES_EEVEE] = gMonIcon_Eevee,
|
||||
[SPECIES_COMBEE] = gMonIcon_Combee,
|
||||
[SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas,
|
||||
[SPECIES_HIPPOWDON] = gMonIcon_Hippowdon,
|
||||
[SPECIES_UNFEZANT] = gMonIcon_UnfezantF,
|
||||
[SPECIES_FRILLISH] = gMonIcon_FrillishF,
|
||||
[SPECIES_JELLICENT] = gMonIcon_JellicentF,
|
||||
[SPECIES_PYROAR] = gMonIcon_PyroarF,
|
||||
};
|
||||
|
||||
const u8 gMonIconPaletteIndices[] =
|
||||
|
|
@ -2421,6 +2428,13 @@ const u8 gMonIconPaletteIndices[] =
|
|||
const u8 gMonIconPaletteIndicesFemale[] =
|
||||
{
|
||||
[SPECIES_EEVEE] = 2,
|
||||
[SPECIES_COMBEE] = 0,
|
||||
[SPECIES_HIPPOPOTAS] = 1,
|
||||
[SPECIES_HIPPOWDON] = 1,
|
||||
[SPECIES_UNFEZANT] = 1,
|
||||
[SPECIES_FRILLISH] = 1,
|
||||
[SPECIES_JELLICENT] = 1,
|
||||
[SPECIES_PYROAR] = 2,
|
||||
};
|
||||
|
||||
const struct SpritePalette gMonIconPaletteTable[] =
|
||||
|
|
|
|||
Loading…
Reference in a new issue