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 00000000..9f7f4749 Binary files /dev/null and b/graphics/npc/malon.png differ 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