From c85ca4b8601ac5776735cf5217fa481e037d5128 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 30 Dec 2019 10:58:32 -0500 Subject: Standardize farfetchd spelling --- graphics/pokemon/farfetch_d/anim_front.png | Bin 1032 -> 0 bytes graphics/pokemon/farfetch_d/back.png | Bin 696 -> 0 bytes graphics/pokemon/farfetch_d/footprint.png | Bin 99 -> 0 bytes graphics/pokemon/farfetch_d/front.png | Bin 733 -> 0 bytes graphics/pokemon/farfetch_d/icon.png | Bin 396 -> 0 bytes graphics/pokemon/farfetch_d/normal.pal | 19 ------------------- graphics/pokemon/farfetch_d/shiny.pal | 19 ------------------- graphics/pokemon/farfetchd/anim_front.png | Bin 0 -> 1032 bytes graphics/pokemon/farfetchd/back.png | Bin 0 -> 696 bytes graphics/pokemon/farfetchd/footprint.png | Bin 0 -> 99 bytes graphics/pokemon/farfetchd/front.png | Bin 0 -> 733 bytes graphics/pokemon/farfetchd/icon.png | Bin 0 -> 396 bytes graphics/pokemon/farfetchd/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/farfetchd/shiny.pal | 19 +++++++++++++++++++ src/anim_mon_front_pics.c | 2 +- src/data/graphics/pokemon.h | 12 ++++++------ 16 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 graphics/pokemon/farfetch_d/anim_front.png delete mode 100644 graphics/pokemon/farfetch_d/back.png delete mode 100644 graphics/pokemon/farfetch_d/footprint.png delete mode 100644 graphics/pokemon/farfetch_d/front.png delete mode 100644 graphics/pokemon/farfetch_d/icon.png delete mode 100644 graphics/pokemon/farfetch_d/normal.pal delete mode 100644 graphics/pokemon/farfetch_d/shiny.pal create mode 100644 graphics/pokemon/farfetchd/anim_front.png create mode 100644 graphics/pokemon/farfetchd/back.png create mode 100644 graphics/pokemon/farfetchd/footprint.png create mode 100644 graphics/pokemon/farfetchd/front.png create mode 100644 graphics/pokemon/farfetchd/icon.png create mode 100644 graphics/pokemon/farfetchd/normal.pal create mode 100644 graphics/pokemon/farfetchd/shiny.pal diff --git a/graphics/pokemon/farfetch_d/anim_front.png b/graphics/pokemon/farfetch_d/anim_front.png deleted file mode 100644 index 23176939b..000000000 Binary files a/graphics/pokemon/farfetch_d/anim_front.png and /dev/null differ diff --git a/graphics/pokemon/farfetch_d/back.png b/graphics/pokemon/farfetch_d/back.png deleted file mode 100644 index 7f981b389..000000000 Binary files a/graphics/pokemon/farfetch_d/back.png and /dev/null differ diff --git a/graphics/pokemon/farfetch_d/footprint.png b/graphics/pokemon/farfetch_d/footprint.png deleted file mode 100644 index 2f08f732d..000000000 Binary files a/graphics/pokemon/farfetch_d/footprint.png and /dev/null differ diff --git a/graphics/pokemon/farfetch_d/front.png b/graphics/pokemon/farfetch_d/front.png deleted file mode 100644 index d938c1b50..000000000 Binary files a/graphics/pokemon/farfetch_d/front.png and /dev/null differ diff --git a/graphics/pokemon/farfetch_d/icon.png b/graphics/pokemon/farfetch_d/icon.png deleted file mode 100644 index cb3cd931b..000000000 Binary files a/graphics/pokemon/farfetch_d/icon.png and /dev/null differ diff --git a/graphics/pokemon/farfetch_d/normal.pal b/graphics/pokemon/farfetch_d/normal.pal deleted file mode 100644 index 397d1195c..000000000 --- a/graphics/pokemon/farfetch_d/normal.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 213 -255 255 255 -213 213 213 -230 230 164 -197 197 131 -255 230 106 -230 172 90 -189 106 41 -205 255 139 -65 222 65 -0 156 32 -230 197 123 -180 148 82 -131 98 32 -98 65 0 -16 16 16 diff --git a/graphics/pokemon/farfetch_d/shiny.pal b/graphics/pokemon/farfetch_d/shiny.pal deleted file mode 100644 index 5537612ce..000000000 --- a/graphics/pokemon/farfetch_d/shiny.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 213 -255 255 255 -213 213 213 -230 230 164 -197 197 131 -255 230 106 -230 172 90 -189 106 41 -205 255 139 -139 189 57 -98 148 16 -246 189 180 -213 148 139 -172 106 98 -131 65 57 -16 16 16 diff --git a/graphics/pokemon/farfetchd/anim_front.png b/graphics/pokemon/farfetchd/anim_front.png new file mode 100644 index 000000000..23176939b Binary files /dev/null and b/graphics/pokemon/farfetchd/anim_front.png differ diff --git a/graphics/pokemon/farfetchd/back.png b/graphics/pokemon/farfetchd/back.png new file mode 100644 index 000000000..7f981b389 Binary files /dev/null and b/graphics/pokemon/farfetchd/back.png differ diff --git a/graphics/pokemon/farfetchd/footprint.png b/graphics/pokemon/farfetchd/footprint.png new file mode 100644 index 000000000..2f08f732d Binary files /dev/null and b/graphics/pokemon/farfetchd/footprint.png differ diff --git a/graphics/pokemon/farfetchd/front.png b/graphics/pokemon/farfetchd/front.png new file mode 100644 index 000000000..d938c1b50 Binary files /dev/null and b/graphics/pokemon/farfetchd/front.png differ diff --git a/graphics/pokemon/farfetchd/icon.png b/graphics/pokemon/farfetchd/icon.png new file mode 100644 index 000000000..cb3cd931b Binary files /dev/null and b/graphics/pokemon/farfetchd/icon.png differ diff --git a/graphics/pokemon/farfetchd/normal.pal b/graphics/pokemon/farfetchd/normal.pal new file mode 100644 index 000000000..397d1195c --- /dev/null +++ b/graphics/pokemon/farfetchd/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +230 230 164 +197 197 131 +255 230 106 +230 172 90 +189 106 41 +205 255 139 +65 222 65 +0 156 32 +230 197 123 +180 148 82 +131 98 32 +98 65 0 +16 16 16 diff --git a/graphics/pokemon/farfetchd/shiny.pal b/graphics/pokemon/farfetchd/shiny.pal new file mode 100644 index 000000000..5537612ce --- /dev/null +++ b/graphics/pokemon/farfetchd/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +230 230 164 +197 197 131 +255 230 106 +230 172 90 +189 106 41 +205 255 139 +139 189 57 +98 148 16 +246 189 180 +213 148 139 +172 106 98 +131 65 57 +16 16 16 diff --git a/src/anim_mon_front_pics.c b/src/anim_mon_front_pics.c index b566b7760..d764e10ac 100644 --- a/src/anim_mon_front_pics.c +++ b/src/anim_mon_front_pics.c @@ -84,7 +84,7 @@ const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/anim_f const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/anim_front.4bpp.lz"); const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/anim_front.4bpp.lz"); const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/anim_front.4bpp.lz"); const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/anim_front.4bpp.lz"); const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/anim_front.4bpp.lz"); const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/anim_front.4bpp.lz"); diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 07415949d..45e34030f 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -572,12 +572,12 @@ const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/sh const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/icon.4bpp"); const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/footprint.1bpp"); -const u32 gMonStillFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/front.4bpp.lz"); -const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/normal.gbapal.lz"); -const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/back.4bpp.lz"); -const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/shiny.gbapal.lz"); -const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetch_d/icon.4bpp"); -const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetch_d/footprint.1bpp"); +const u32 gMonStillFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/front.4bpp.lz"); +const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/normal.gbapal.lz"); +const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/back.4bpp.lz"); +const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/shiny.gbapal.lz"); +const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/icon.4bpp"); +const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/footprint.1bpp"); const u32 gMonStillFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/front.4bpp.lz"); const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/normal.gbapal.lz"); -- cgit v1.2.3