Merge branch 'master' into battle_anim_mon_movement

INSTALL.md

@@ -26,7 +26,6 @@ To set up the repository:
 	make install-sdk prefix=../pokefirered
 
 	cd ../pokefirered
-	./build_tools.sh
 
 To build **pokefirered.gba**:
 

Makefile

@@ -89,6 +89,8 @@ OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
 
 MAKEFLAGS += --no-print-directory
 
+AUTO_GEN_TARGETS :=
+
 all: rom
 
 rom: $(ROM)
@@ -117,6 +119,7 @@ clean: tidy
 	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 {} +
+	rm -f $(AUTO_GEN_TARGETS)
 	@$(MAKE) clean -C berry_fix
 	@$(MAKE) clean -C tools/gbagfx
 	@$(MAKE) clean -C tools/scaninc

build_tools.sh

@@ -8,3 +8,4 @@ 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++}
+make -C tools/jsonproc CXX=${1:-g++}

graphics/item_pc/unk_8E85408.pal

@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+148 189 246
+106 172 230
+238 246 246
+222 230 230
+255 189 74
+230 131 41
+172 74 8
+156 164 172
+115 123 139
+164 255 139
+139 238 106
+115 222 82
+98 205 57
+230 230 238
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+189 213 213
+238 255 255
+222 246 255
+255 255 255
+164 222 255
+16 172 222
+0 82 115
+0 115 139
+0 123 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+189 213 213
+238 255 255
+222 246 255
+255 255 255
+164 222 255
+24 82 180
+0 90 131
+24 82 180
+24 82 180

json_data_rules.mk

@@ -6,4 +6,4 @@ AUTO_GEN_TARGETS += src/data/items.h
 src/data/items.h: src/data/items.json src/data/items.json.txt
 	$(JSONPROC) $^ $@
 
-$(BUILD_DIR)/src/item.o: C_DEP += src/data/items.h
+$(C_BUILDDIR)/item.o: c_dep += src/data/items.h