From aa44ecfc4ff7e85629825c7068a014794b206463 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Sat, 16 Dec 2017 12:09:16 -0500
Subject: [PATCH] Consolidate duplicate graphics

---
 event/celebi.asm                        |  11 ++++++-----
 gfx/{special => overworld}/celebi/1.png | Bin
 gfx/{special => overworld}/celebi/2.png | Bin
 gfx/{special => overworld}/celebi/3.png | Bin
 gfx/{special => overworld}/celebi/4.png | Bin
 gfx/special/celebi/leaf.png             | Bin 134 -> 0 bytes
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename gfx/{special => overworld}/celebi/1.png (100%)
 rename gfx/{special => overworld}/celebi/2.png (100%)
 rename gfx/{special => overworld}/celebi/3.png (100%)
 rename gfx/{special => overworld}/celebi/4.png (100%)
 delete mode 100644 gfx/special/celebi/leaf.png

diff --git a/event/celebi.asm b/event/celebi.asm
index c9be9cb39..ab0a333f2 100755
--- a/event/celebi.asm
+++ b/event/celebi.asm
@@ -124,12 +124,13 @@ CelebiEvent_SpawnLeaf: ; 49944
 ; 49962
 
 SpecialCelebiLeafGFX: ; 49962
-INCBIN "gfx/special/celebi/leaf.2bpp"
+INCBIN "gfx/overworld/cut_grass.2bpp"
+
 SpecialCelebiGFX: ; 499a2
-INCBIN "gfx/special/celebi/1.2bpp"
-INCBIN "gfx/special/celebi/2.2bpp"
-INCBIN "gfx/special/celebi/3.2bpp"
-INCBIN "gfx/special/celebi/4.2bpp"
+INCBIN "gfx/overworld/celebi/1.2bpp"
+INCBIN "gfx/overworld/celebi/2.2bpp"
+INCBIN "gfx/overworld/celebi/3.2bpp"
+INCBIN "gfx/overworld/celebi/4.2bpp"
 
 
 UpdateCelebiPosition: ; 49aa2 (12:5aa2)
diff --git a/gfx/special/celebi/1.png b/gfx/overworld/celebi/1.png
similarity index 100%
rename from gfx/special/celebi/1.png
rename to gfx/overworld/celebi/1.png
diff --git a/gfx/special/celebi/2.png b/gfx/overworld/celebi/2.png
similarity index 100%
rename from gfx/special/celebi/2.png
rename to gfx/overworld/celebi/2.png
diff --git a/gfx/special/celebi/3.png b/gfx/overworld/celebi/3.png
similarity index 100%
rename from gfx/special/celebi/3.png
rename to gfx/overworld/celebi/3.png
diff --git a/gfx/special/celebi/4.png b/gfx/overworld/celebi/4.png
similarity index 100%
rename from gfx/special/celebi/4.png
rename to gfx/overworld/celebi/4.png
diff --git a/gfx/special/celebi/leaf.png b/gfx/special/celebi/leaf.png
deleted file mode 100644
index b10e0cf8c4c96c17b9eed47b9fcc58e28173778d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJUr!gukcwN$KmPy!FW<)h=fAzd
zoTxwl4Vu%A)Tgp-6|EODcG3NJ<@|!9^#|rPKD7T|&$hry;v=Jr0dpsRx1@x`j$i(|
gX+IMFH_Gd9GyEvlnUsEi2FQE{Pgg&ebxsLQ08cD0=l}o!