summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-05-13 19:44:24 -0400
committergarak <garakmon@gmail.com>2019-05-13 19:44:24 -0400
commit55d66b51770b4f657ed55822e7e76f6d6e3261d8 (patch)
tree1c324c7d2108afb678d2260e63b5591a04571b0d /Makefile
parent4b98d7d07a681279022cec9f082071a374ddbdb9 (diff)
convert map data to json
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a5d83dd43..f990d07c4 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ SCANINC := tools/scaninc/scaninc
PREPROC := tools/preproc/preproc
RAMSCRGEN := tools/ramscrgen/ramscrgen
FIX := tools/gbafix/gbafix
+MAPJSON := tools/mapjson/mapjson
# Clear the default suffixes
.SUFFIXES:
@@ -85,6 +86,9 @@ clean: tidy
rm -f sound/direct_sound_samples/*.bin
rm -f $(SONG_OBJS)
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
+ rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
+ rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
+ find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
@$(MAKE) -C berry_fix clean
tidy:
@@ -94,6 +98,7 @@ tidy:
include graphics_file_rules.mk
include tileset_rules.mk
+include map_data_rules.mk
%.s: ;
%.png: ;