diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:42:18 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:42:18 +0000 |
| commit | 7c79b030e90ae6f4b3b3c91518c315959ede456e (patch) | |
| tree | b12fe2ca0d42b900fb1d45491e81a1bc6d86a348 /graphics_file_rules.mk | |
| parent | 2acab81713aac51f96a50dc42a67ec7761901aa4 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'graphics_file_rules.mk')
| -rw-r--r-- | graphics_file_rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 92c173933..b14d94559 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -70,7 +70,7 @@ $(tilesetdir)/secondary/battle_frontier_outside_west/tiles.4bpp: $(tilesetdir)/s $(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: $(tilesetdir)/secondary/battle_frontier_outside_east/tiles.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/primary/inside_building/tiles.4bpp: $(tilesetdir)/primary/inside_building/tiles.png +$(tilesetdir)/primary/building/tiles.4bpp: $(tilesetdir)/primary/building/tiles.png $(GFX) $< $@ -num_tiles 502 $(tilesetdir)/secondary/shop/tiles.4bpp: $(tilesetdir)/secondary/shop/tiles.png |