From b40ba5a4430b3cc5a2e91b21837c0f6534853011 Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Sun, 16 Aug 2020 21:11:48 -0700
Subject: [PATCH] malon gfx

---
 .gitignore             |   3 ++-
 data/data_081320FC.s   |   7 ++++++-
 graphics/npc/malon.png | Bin 0 -> 1837 bytes
 graphics_file_rules.mk |   3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 graphics/npc/malon.png

diff --git a/.gitignore b/.gitignore
index d1b99ebd..27c775cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,4 +62,5 @@ types_*.taghl
 !sound/programmable_wave_samples/*.pcm
 _Deparsed_XSubs.pm
 *.py
-*.sna
\ No newline at end of file
+*.sna
+__pycache__
\ No newline at end of file
diff --git a/data/data_081320FC.s b/data/data_081320FC.s
index 70fed072..dbc4d281 100755
--- a/data/data_081320FC.s
+++ b/data/data_081320FC.s
@@ -5527,11 +5527,16 @@ gUnk_08214B7E:: @ 08214B7E
 gUnk_082157FF:: @ 082157FF
 	.incbin "baserom.gba", 0x2157FF, 0x0002CB5
 
+@ 0x2184B4 - 0x21DCB3
 gUnk_082184B4::
 	.incbin "graphics/npc/postman.4bpp"
 
+@ 0x21DCB4 - 0x21E913
 gUnk_0821DCB4::
-	.incbin "baserom.gba", 0x21DCB4, 0x000134B
+	.incbin "graphics/npc/malon.4bpp"
+
+gUnk_0821E8F4::
+	.incbin "baserom.gba", 0x21E8F4, 0x000070B
 
 gUnk_0821EFFF:: @ 0821EFFF
 	.incbin "baserom.gba", 0x21EFFF, 0x00000F1
diff --git a/graphics/npc/malon.png b/graphics/npc/malon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f7f4749a240c92bf0050ace38d3fc77d19c2db7
GIT binary patch
literal 1837
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
b8$SL5@Q#b3S>5qa00000NkvXXu0mjfRhoAh

literal 0
HcmV?d00001

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 25373c9c..027e6549 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -10,4 +10,7 @@ $(GFXDIR)/pot_portal.4bpp: %.4bpp: %.png
 	$(GFX) $< $@
 
 $(GFXDIR)/npc/postman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@
+
+$(GFXDIR)/npc/malon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@
\ No newline at end of file