diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:07:52 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:07:52 -0400 |
| commit | 402f2643bd9159638002b18010d09fa3309c1f9f (patch) | |
| tree | 2ccf4cd24a17630ed107bc5749eaf998927d5476 /graphics_file_rules.mk | |
| parent | d69a051df50232dbc0c2d0b595d5eeb0d5fb3133 (diff) | |
| parent | 7a6d4525c4066038832d85a45ed6df6ab4660309 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into field_player_avatar
Diffstat (limited to 'graphics_file_rules.mk')
| -rw-r--r-- | graphics_file_rules.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 33247d675..cf6563219 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -529,10 +529,10 @@ $(POKEDEXAREAMARKERSDATADIR)/marker.4bpp: $(POKEDEXAREAMARKERFILES) graphics/pokemon/heracross/unk_icon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -graphics/object_events/151.4bpp: %.4bpp: %.png +graphics/object_events/pics/misc/ss_anne.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 4 -graphics/object_events/emoticons.4bpp: %.4bpp: %.png +graphics/misc/emoticons.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 $(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png |