Rename Furfrou Species tags to match Pokemon Showdown exports (#6041)
moostoet
GitHub
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 710 B After Width: | Height: | Size: 710 B |
|
Before Width: | Height: | Size: 471 B After Width: | Height: | Size: 471 B |
|
Before Width: | Height: | Size: 849 B After Width: | Height: | Size: 849 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 710 B After Width: | Height: | Size: 710 B |
|
Before Width: | Height: | Size: 474 B After Width: | Height: | Size: 474 B |
|
Before Width: | Height: | Size: 941 B After Width: | Height: | Size: 941 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 657 B After Width: | Height: | Size: 657 B |
|
Before Width: | Height: | Size: 508 B After Width: | Height: | Size: 508 B |
|
Before Width: | Height: | Size: 909 B After Width: | Height: | Size: 909 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 610 B After Width: | Height: | Size: 610 B |
|
Before Width: | Height: | Size: 493 B After Width: | Height: | Size: 493 B |
|
Before Width: | Height: | Size: 908 B After Width: | Height: | Size: 908 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 635 B After Width: | Height: | Size: 635 B |
|
Before Width: | Height: | Size: 467 B After Width: | Height: | Size: 467 B |
|
Before Width: | Height: | Size: 932 B After Width: | Height: | Size: 932 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 630 B After Width: | Height: | Size: 630 B |
|
Before Width: | Height: | Size: 459 B After Width: | Height: | Size: 459 B |
|
Before Width: | Height: | Size: 908 B After Width: | Height: | Size: 908 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 732 B After Width: | Height: | Size: 732 B |
|
Before Width: | Height: | Size: 471 B After Width: | Height: | Size: 471 B |
|
Before Width: | Height: | Size: 930 B After Width: | Height: | Size: 930 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 724 B After Width: | Height: | Size: 724 B |
|
Before Width: | Height: | Size: 458 B After Width: | Height: | Size: 458 B |
|
Before Width: | Height: | Size: 938 B After Width: | Height: | Size: 938 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 683 B After Width: | Height: | Size: 683 B |
|
Before Width: | Height: | Size: 512 B After Width: | Height: | Size: 512 B |
|
Before Width: | Height: | Size: 946 B After Width: | Height: | Size: 946 B |
@ -1214,15 +1214,15 @@
|
||||
#define SPECIES_FLORGES_ORANGE 1143
|
||||
#define SPECIES_FLORGES_BLUE 1144
|
||||
#define SPECIES_FLORGES_WHITE 1145
|
||||
#define SPECIES_FURFROU_HEART_TRIM 1146
|
||||
#define SPECIES_FURFROU_STAR_TRIM 1147
|
||||
#define SPECIES_FURFROU_DIAMOND_TRIM 1148
|
||||
#define SPECIES_FURFROU_DEBUTANTE_TRIM 1149
|
||||
#define SPECIES_FURFROU_MATRON_TRIM 1150
|
||||
#define SPECIES_FURFROU_DANDY_TRIM 1151
|
||||
#define SPECIES_FURFROU_LA_REINE_TRIM 1152
|
||||
#define SPECIES_FURFROU_KABUKI_TRIM 1153
|
||||
#define SPECIES_FURFROU_PHARAOH_TRIM 1154
|
||||
#define SPECIES_FURFROU_HEART 1146
|
||||
#define SPECIES_FURFROU_STAR 1147
|
||||
#define SPECIES_FURFROU_DIAMOND 1148
|
||||
#define SPECIES_FURFROU_DEBUTANTE 1149
|
||||
#define SPECIES_FURFROU_MATRON 1150
|
||||
#define SPECIES_FURFROU_DANDY 1151
|
||||
#define SPECIES_FURFROU_LA_REINE 1152
|
||||
#define SPECIES_FURFROU_KABUKI 1153
|
||||
#define SPECIES_FURFROU_PHARAOH 1154
|
||||
#define SPECIES_MEOWSTIC_F 1155
|
||||
#define SPECIES_AEGISLASH_BLADE 1156
|
||||
#define SPECIES_PUMPKABOO_SMALL 1157
|
||||
|
||||
@ -4212,31 +4212,31 @@ $(POKEMONGFXDIR)/florges/orange/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/florges/white/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/heart_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/heart/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/star_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/star/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/diamond_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/diamond/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/debutante_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/debutante/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/matron_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/matron/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/dandy_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/dandy/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/la_reine_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/la_reine/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/kabuki_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/kabuki/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/furfrou/pharaoh_trim/overworld.4bpp: %.4bpp: %.png
|
||||
$(POKEMONGFXDIR)/furfrou/pharaoh/overworld.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 4
|
||||
|
||||
$(POKEMONGFXDIR)/hoopa/unbound/overworld.4bpp: %.4bpp: %.png
|
||||
|
||||
@ -19787,92 +19787,92 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
|
||||
const u8 gMonFootprint_Furfrou[] = INCBIN_U8("graphics/pokemon/furfrou/footprint.1bpp");
|
||||
#endif //P_FOOTPRINTS
|
||||
|
||||
const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouHeartTrim[] = INCBIN_U8("graphics/pokemon/furfrou/heart_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouHeart[] = INCBIN_U8("graphics/pokemon/furfrou/heart/icon.4bpp");
|
||||
|
||||
const u32 gMonFrontPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouStarTrim[] = INCBIN_U8("graphics/pokemon/furfrou/star_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouStar[] = INCBIN_U8("graphics/pokemon/furfrou/star/icon.4bpp");
|
||||
|
||||
const u32 gMonFrontPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouDiamondTrim[] = INCBIN_U8("graphics/pokemon/furfrou/diamond_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouDiamond[] = INCBIN_U8("graphics/pokemon/furfrou/diamond/icon.4bpp");
|
||||
|
||||
const u32 gMonFrontPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouDebutanteTrim[] = INCBIN_U8("graphics/pokemon/furfrou/debutante_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouDebutante[] = INCBIN_U8("graphics/pokemon/furfrou/debutante/icon.4bpp");
|
||||
|
||||
const u32 gMonFrontPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouMatronTrim[] = INCBIN_U8("graphics/pokemon/furfrou/matron_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouMatron[] = INCBIN_U8("graphics/pokemon/furfrou/matron/icon.4bpp");
|
||||
|
||||
const u32 gMonFrontPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouDandyTrim[] = INCBIN_U8("graphics/pokemon/furfrou/dandy_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouDandy[] = INCBIN_U8("graphics/pokemon/furfrou/dandy/icon.4bpp");
|
||||
|
||||
const u32 gMonFrontPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouLaReineTrim[] = INCBIN_U8("graphics/pokemon/furfrou/la_reine_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouLaReine[] = INCBIN_U8("graphics/pokemon/furfrou/la_reine/icon.4bpp");
|
||||
|
||||
const u32 gMonFrontPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouKabukiTrim[] = INCBIN_U8("graphics/pokemon/furfrou/kabuki_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouKabuki[] = INCBIN_U8("graphics/pokemon/furfrou/kabuki/icon.4bpp");
|
||||
|
||||
const u32 gMonFrontPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouPharaohTrim[] = INCBIN_U8("graphics/pokemon/furfrou/pharaoh_trim/icon.4bpp");
|
||||
const u32 gMonFrontPic_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/anim_front.4bpp.lz");
|
||||
const u32 gMonPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/normal.gbapal.lz");
|
||||
const u32 gMonBackPic_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/back.4bpp.lz");
|
||||
const u32 gMonShinyPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/shiny.gbapal.lz");
|
||||
const u8 gMonIcon_FurfrouPharaoh[] = INCBIN_U8("graphics/pokemon/furfrou/pharaoh/icon.4bpp");
|
||||
|
||||
#if OW_POKEMON_OBJECT_EVENTS
|
||||
const u32 gObjectEventPic_FurfrouNatural[] = INCBIN_COMP("graphics/pokemon/furfrou/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouHeartTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/heart_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouStarTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/star_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouDiamondTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/diamond_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouDebutanteTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/debutante_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouMatronTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/matron_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouDandyTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/dandy_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouLaReineTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/la_reine_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouKabukiTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/kabuki_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouPharaohTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/pharaoh_trim/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouHeart[] = INCBIN_COMP("graphics/pokemon/furfrou/heart/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouStar[] = INCBIN_COMP("graphics/pokemon/furfrou/star/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouDiamond[] = INCBIN_COMP("graphics/pokemon/furfrou/diamond/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouDebutante[] = INCBIN_COMP("graphics/pokemon/furfrou/debutante/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouMatron[] = INCBIN_COMP("graphics/pokemon/furfrou/matron/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouDandy[] = INCBIN_COMP("graphics/pokemon/furfrou/dandy/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouLaReine[] = INCBIN_COMP("graphics/pokemon/furfrou/la_reine/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouKabuki[] = INCBIN_COMP("graphics/pokemon/furfrou/kabuki/overworld.4bpp");
|
||||
const u32 gObjectEventPic_FurfrouPharaoh[] = INCBIN_COMP("graphics/pokemon/furfrou/pharaoh/overworld.4bpp");
|
||||
#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
|
||||
const u32 gOverworldPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/overworld_normal.gbapal.lz");
|
||||
const u32 gOverworldPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/overworld_normal.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouHeart[] = INCBIN_U32("graphics/pokemon/furfrou/heart/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouStar[] = INCBIN_U32("graphics/pokemon/furfrou/star/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouDiamond[] = INCBIN_U32("graphics/pokemon/furfrou/diamond/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouDebutante[] = INCBIN_U32("graphics/pokemon/furfrou/debutante/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouMatron[] = INCBIN_U32("graphics/pokemon/furfrou/matron/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouDandy[] = INCBIN_U32("graphics/pokemon/furfrou/dandy/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouLaReine[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouKabuki[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki/overworld_shiny.gbapal.lz");
|
||||
const u32 gShinyOverworldPalette_FurfrouPharaoh[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh/overworld_shiny.gbapal.lz");
|
||||
#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
|
||||
#endif //OW_POKEMON_OBJECT_EVENTS
|
||||
#endif //P_FAMILY_FURFROU
|
||||
|
||||
@ -4679,32 +4679,32 @@ static const struct SpriteFrameImage sPicTable_Pangoro[] = {
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouNatural[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouNatural, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouHeartTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouHeartTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouHeart[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouHeart, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouStarTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouStarTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouStar[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouStar, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouDiamondTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouDiamondTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouDiamond[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouDiamond, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouDebutanteTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouDebutanteTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouDebutante[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouDebutante, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouMatronTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouMatronTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouMatron[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouMatron, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouDandyTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouDandyTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouDandy[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouDandy, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouLaReineTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouLaReineTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouLaReine[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouLaReine, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouKabukiTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouKabukiTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouKabuki[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouKabuki, 4, 4),
|
||||
};
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouPharaohTrim[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouPharaohTrim, 4, 4),
|
||||
static const struct SpriteFrameImage sPicTable_FurfrouPharaoh[] = {
|
||||
overworld_ascending_frames(gObjectEventPic_FurfrouPharaoh, 4, 4),
|
||||
};
|
||||
#endif //P_FAMILY_FURFROU
|
||||
|
||||
|
||||
@ -1459,15 +1459,15 @@ static const u16 sFlorgesFormSpeciesIdTable[] = {
|
||||
#if P_FAMILY_FURFROU
|
||||
static const u16 sFurfrouFormSpeciesIdTable[] = {
|
||||
SPECIES_FURFROU_NATURAL,
|
||||
SPECIES_FURFROU_HEART_TRIM,
|
||||
SPECIES_FURFROU_STAR_TRIM,
|
||||
SPECIES_FURFROU_DIAMOND_TRIM,
|
||||
SPECIES_FURFROU_DEBUTANTE_TRIM,
|
||||
SPECIES_FURFROU_MATRON_TRIM,
|
||||
SPECIES_FURFROU_DANDY_TRIM,
|
||||
SPECIES_FURFROU_LA_REINE_TRIM,
|
||||
SPECIES_FURFROU_KABUKI_TRIM,
|
||||
SPECIES_FURFROU_PHARAOH_TRIM,
|
||||
SPECIES_FURFROU_HEART,
|
||||
SPECIES_FURFROU_STAR,
|
||||
SPECIES_FURFROU_DIAMOND,
|
||||
SPECIES_FURFROU_DEBUTANTE,
|
||||
SPECIES_FURFROU_MATRON,
|
||||
SPECIES_FURFROU_DANDY,
|
||||
SPECIES_FURFROU_LA_REINE,
|
||||
SPECIES_FURFROU_KABUKI,
|
||||
SPECIES_FURFROU_PHARAOH,
|
||||
FORM_SPECIES_END,
|
||||
};
|
||||
#endif //P_FAMILY_FURFROU
|
||||
|
||||
@ -1894,15 +1894,15 @@ const u16 gPokedexOrder_Weight[] =
|
||||
NATIONAL_DEX_SIMISEAR,
|
||||
NATIONAL_DEX_MARACTUS,
|
||||
NATIONAL_DEX_FURFROU,//_NATURAL,
|
||||
//NATIONAL_DEX_FURFROU_HEART_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_STAR_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_DIAMOND_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_DEBUTANTE_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_MATRON_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_DANDY_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_LA_REINE_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_KABUKI_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_PHARAOH_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_HEART,
|
||||
//NATIONAL_DEX_FURFROU_STAR,
|
||||
//NATIONAL_DEX_FURFROU_DIAMOND,
|
||||
//NATIONAL_DEX_FURFROU_DEBUTANTE,
|
||||
//NATIONAL_DEX_FURFROU_MATRON,
|
||||
//NATIONAL_DEX_FURFROU_DANDY,
|
||||
//NATIONAL_DEX_FURFROU_LA_REINE,
|
||||
//NATIONAL_DEX_FURFROU_KABUKI,
|
||||
//NATIONAL_DEX_FURFROU_PHARAOH,
|
||||
NATIONAL_DEX_PERRSERKER,
|
||||
NATIONAL_DEX_INDEEDEE,//_MALE,
|
||||
//NATIONAL_DEX_INDEEDEE_FEMALE,
|
||||
@ -3711,15 +3711,15 @@ const u16 gPokedexOrder_Height[] =
|
||||
NATIONAL_DEX_TALONFLAME,
|
||||
NATIONAL_DEX_VIVILLON,
|
||||
NATIONAL_DEX_FURFROU,//_NATURAL,
|
||||
//NATIONAL_DEX_FURFROU_HEART_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_STAR_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_DIAMOND_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_DEBUTANTE_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_MATRON_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_DANDY_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_LA_REINE_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_KABUKI_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_PHARAOH_TRIM,
|
||||
//NATIONAL_DEX_FURFROU_HEART,
|
||||
//NATIONAL_DEX_FURFROU_STAR,
|
||||
//NATIONAL_DEX_FURFROU_DIAMOND,
|
||||
//NATIONAL_DEX_FURFROU_DEBUTANTE,
|
||||
//NATIONAL_DEX_FURFROU_MATRON,
|
||||
//NATIONAL_DEX_FURFROU_DANDY,
|
||||
//NATIONAL_DEX_FURFROU_LA_REINE,
|
||||
//NATIONAL_DEX_FURFROU_KABUKI,
|
||||
//NATIONAL_DEX_FURFROU_PHARAOH,
|
||||
//NATIONAL_DEX_ZYGARDE_10,
|
||||
//NATIONAL_DEX_ZYGARDE_10_POWER_CONSTRUCT,
|
||||
NATIONAL_DEX_SALAZZLE,
|
||||
|
||||
@ -2192,16 +2192,16 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
|
||||
.formChangeTable = sFurfrouFormChangeTable, \
|
||||
}
|
||||
|
||||
[SPECIES_FURFROU_NATURAL] = FURFROU_MISC_INFO(Natural, FALSE, 48, 3, 56, 0, 0),
|
||||
[SPECIES_FURFROU_HEART_TRIM] = FURFROU_MISC_INFO(HeartTrim, FALSE, 56, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_STAR_TRIM] = FURFROU_MISC_INFO(StarTrim, FALSE, 56, 2, 64, 1, 0),
|
||||
[SPECIES_FURFROU_DIAMOND_TRIM] = FURFROU_MISC_INFO(DiamondTrim, FALSE, 48, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_DEBUTANTE_TRIM] = FURFROU_MISC_INFO(DebutanteTrim, TRUE, 48, 2, 56, 1, 2),
|
||||
[SPECIES_FURFROU_MATRON_TRIM] = FURFROU_MISC_INFO(MatronTrim, FALSE, 48, 2, 56, 1, 2),
|
||||
[SPECIES_FURFROU_DANDY_TRIM] = FURFROU_MISC_INFO(DandyTrim, FALSE, 48, 2, 56, 1, 1),
|
||||
[SPECIES_FURFROU_LA_REINE_TRIM] = FURFROU_MISC_INFO(LaReineTrim, FALSE, 48, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_KABUKI_TRIM] = FURFROU_MISC_INFO(KabukiTrim, FALSE, 56, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_PHARAOH_TRIM] = FURFROU_MISC_INFO(PharaohTrim, FALSE, 48, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_NATURAL] = FURFROU_MISC_INFO(Natural, FALSE, 48, 3, 56, 0, 0),
|
||||
[SPECIES_FURFROU_HEART] = FURFROU_MISC_INFO(Heart, FALSE, 56, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_STAR] = FURFROU_MISC_INFO(Star, FALSE, 56, 2, 64, 1, 0),
|
||||
[SPECIES_FURFROU_DIAMOND] = FURFROU_MISC_INFO(Diamond, FALSE, 48, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_DEBUTANTE] = FURFROU_MISC_INFO(Debutante, TRUE, 48, 2, 56, 1, 2),
|
||||
[SPECIES_FURFROU_MATRON] = FURFROU_MISC_INFO(Matron, FALSE, 48, 2, 56, 1, 2),
|
||||
[SPECIES_FURFROU_DANDY] = FURFROU_MISC_INFO(Dandy, FALSE, 48, 2, 56, 1, 1),
|
||||
[SPECIES_FURFROU_LA_REINE] = FURFROU_MISC_INFO(LaReine, FALSE, 48, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_KABUKI] = FURFROU_MISC_INFO(Kabuki, FALSE, 56, 2, 56, 1, 0),
|
||||
[SPECIES_FURFROU_PHARAOH] = FURFROU_MISC_INFO(Pharaoh, FALSE, 48, 2, 56, 1, 0),
|
||||
#endif //P_FAMILY_FURFROU
|
||||
|
||||
#if P_FAMILY_ESPURR
|
||||
|
||||