From 06b6853fb8526d873f7be0435363fd9c148e5d5e Mon Sep 17 00:00:00 2001
From: Ashley Coleman <me@ashleycoleman.me>
Date: Thu, 26 Nov 2020 11:26:05 -0800
Subject: Rename farfetchd graphics to match define

---
 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 701 -> 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/back.png       | Bin 0 -> 696 bytes
 graphics/pokemon/farfetchd/footprint.png  | Bin 0 -> 99 bytes
 graphics/pokemon/farfetchd/front.png      | Bin 0 -> 701 bytes
 graphics/pokemon/farfetchd/icon.png       | Bin 0 -> 396 bytes
 graphics/pokemon/farfetchd/normal.pal     |  19 +++++++++++++++++++
 graphics/pokemon/farfetchd/shiny.pal      |  19 +++++++++++++++++++
 include/graphics.h                        |   2 +-
 src/data/graphics/pokemon.h               |  12 ++++++------
 14 files changed, 45 insertions(+), 45 deletions(-)
 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/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/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 5b3bb3664..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 2a2dfd6aa..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 222 90
-230 172 90
-156 115 41
-205 255 139
-123 205 65
-74 131 24
-205 189 123
-180 148 82
-139 90 41
-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/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..5b3bb3664
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..2a2dfd6aa
--- /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 222 90
+230 172 90
+156 115 41
+205 255 139
+123 205 65
+74 131 24
+205 189 123
+180 148 82
+139 90 41
+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/include/graphics.h b/include/graphics.h
index 35ef29391..04cafced8 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4486,7 +4486,7 @@ extern const u8 gMonIcon_Slowpoke[];
 extern const u8 gMonIcon_Slowbro[];
 extern const u8 gMonIcon_Magnemite[];
 extern const u8 gMonIcon_Magneton[];
-extern const u8 gMonIcon_Farfetch_d[];
+extern const u8 gMonIcon_Farfetchd[];
 extern const u8 gMonIcon_Doduo[];
 extern const u8 gMonIcon_Dodrio[];
 extern const u8 gMonIcon_Seel[];
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index edb7e982d..bdf780908 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 gMonFrontPic_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 gMonFrontPic_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 gMonFrontPic_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