From ba0fe59140dfe76c77e60746396326115a9c460e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 20:47:44 -0400 Subject: Fix building and update build instructions --- INSTALL.md | 1 - Makefile | 3 +++ build_tools.sh | 1 + json_data_rules.mk | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index fc08af81b..31f136c76 100644 --- a/INSTALL.md +++ b/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**: diff --git a/Makefile b/Makefile index 5d01ba6b9..b8b021287 100644 --- a/Makefile +++ b/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 diff --git a/build_tools.sh b/build_tools.sh index 212df96e7..f64b01573 100755 --- a/build_tools.sh +++ b/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++} diff --git a/json_data_rules.mk b/json_data_rules.mk index 1c731078a..980e63e88 100644 --- a/json_data_rules.mk +++ b/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 -- cgit v1.2.3 From 8a301ce4b91fd81b2c2a6fa2733ea5d3ba63f47d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 20:50:38 -0400 Subject: forgot to finish decompiling this palette WHOOPS --- graphics/item_pc/unk_8E85408.pal | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 graphics/item_pc/unk_8E85408.pal diff --git a/graphics/item_pc/unk_8E85408.pal b/graphics/item_pc/unk_8E85408.pal new file mode 100644 index 000000000..b873bd0f6 --- /dev/null +++ b/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 -- cgit v1.2.3