convert map data to json

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: ;

asm/macros/map.inc

@@ -53,6 +53,10 @@
 	inc _num_signs
 	.endm
 
+	.macro bg_hidden_item_event x, y, height, item, flag, unknown
+	bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown
+	.endm
+
 	.macro map_events npcs, warps, traps, signs
 	.byte _num_npcs, _num_warps, _num_traps, _num_signs
 	.4byte \npcs, \warps, \traps, \signs

build_tools.sh

@@ -7,3 +7,4 @@ make -C tools/preproc CXX=${1:-g++}
 make -C tools/ramscrgen CXX=${1:-g++}
 make -C tools/rsfont CXX=${1:-g++}
 make -C tools/scaninc CXX=${1:-g++}
+make -C tools/mapjson CXX=${1:-g++}

constants/constants.inc

@@ -2,7 +2,7 @@
 	.include "constants/misc_constants.inc"
 	.include "constants/type_constants.inc"
 	.include "constants/contest_constants.inc"
-	.include "constants/item_data_constants.inc"
+@	.include "constants/item_data_constants.inc"
 	.include "constants/battle_move_constants.inc"
 	.include "constants/trainer_constants.inc"
 	.include "constants/berry_constants.inc"

data/layouts/.gitignore

@@ -0,0 +1,2 @@
+layouts.inc
+layouts_table.inc