From 5f236d558aa37918f0286383ba9489a550283d7f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 6 Jun 2020 15:29:42 -0400
Subject: libsyscall.a source

---
 Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4cb2b845..4180f456 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE))
 
 export LM_LICENSE_FILE := $(TOOLS_DIR)/mwccarm/license.dat
 export MWCIncludes := arm9/lib/include
+export MWLibraries := arm9/lib
 
 ######################### Targets ###########################
 
@@ -220,7 +221,7 @@ endif
 .SECONDARY:
 .DELETE_ON_ERROR:
 .SECONDEXPANSION:
-.PHONY: all clean mostlyclean tidy tools $(TOOLDIRS) patch_mwasmarm arm9 arm7
+.PHONY: all libs clean mostlyclean tidy tools $(TOOLDIRS) patch_mwasmarm arm9 arm7
 
 MAKEFLAGS += --no-print-directory
 
@@ -230,18 +231,18 @@ ifeq ($(COMPARE),1)
 endif
 
 clean: mostlyclean
-	make -C arm9 clean
-	make -C arm7 clean
-	make -C tools/mwasmarm_patcher clean
+	$(MAKE) -C arm9 clean
+	$(MAKE) -C arm7 clean
+	$(MAKE) -C tools/mwasmarm_patcher clean
 
 mostlyclean: tidy
-	make -C arm9 mostlyclean
-	make -C arm7 mostlyclean
+	$(MAKE) -C arm9 mostlyclean
+	$(MAKE) -C arm7 mostlyclean
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} +
 
 tidy:
-	make -C arm9 tidy
-	make -C arm7 tidy
+	$(MAKE) -C arm9 tidy
+	$(MAKE) -C arm7 tidy
 	$(RM) -r $(BUILD_DIR)
 
 tools: $(TOOLDIRS)
-- 
cgit v1.2.3


From c576367217f71a5e81d767d6ae77c4d21e836de4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 6 Jun 2020 19:15:06 -0400
Subject: .gitignore narcs; remove narcs on clean

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4180f456..fba80bac 100644
--- a/Makefile
+++ b/Makefile
@@ -234,6 +234,7 @@ clean: mostlyclean
 	$(MAKE) -C arm9 clean
 	$(MAKE) -C arm7 clean
 	$(MAKE) -C tools/mwasmarm_patcher clean
+	$(RM) $(filter-out poketool/personal/pms.narc,$(filter %.narc %.arc,$(NITROFS_FILES)))
 
 mostlyclean: tidy
 	$(MAKE) -C arm9 mostlyclean
-- 
cgit v1.2.3


From 04f767c06d9e5702cdbb41bd49a2791164e021f1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 7 Jun 2020 10:41:08 -0400
Subject: Decompile growth rate tables

---
 Makefile | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index fba80bac..b7b31dbb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,11 @@
 include config.mk
 include filesystem.mk
 
+HOSTCC = $(CC)
+HOSTCXX = $(CXX)
+HOSTCFLAGS = $(CFLAGS)
+HOSTCXXFLAGS = $(CXXFLAGS)
+
 .PHONY: clean tidy all default patch_mwasmarm
 
 # Try to include devkitarm if installed
@@ -234,7 +239,8 @@ clean: mostlyclean
 	$(MAKE) -C arm9 clean
 	$(MAKE) -C arm7 clean
 	$(MAKE) -C tools/mwasmarm_patcher clean
-	$(RM) $(filter-out poketool/personal/pms.narc,$(filter %.narc %.arc,$(NITROFS_FILES)))
+	$(RM) $(filter-out files/poketool/personal/pms.narc,$(filter %.narc %.arc,$(HOSTFS_FILES)))
+	$(MAKE) -C files/poketool/personal/growtbl clean
 
 mostlyclean: tidy
 	$(MAKE) -C arm9 mostlyclean
@@ -310,16 +316,24 @@ DUMMY != mkdir -p $(ALL_DIRS)
 %.png: ;
 %.pal: ;
 
-%.narc: members = $(wildcard $(@D)/$*/*)
+##################### Filesystem #####################
+
+%.narc: members = $(wildcard $(@D)/$*/*.bin)
 %.narc: $$(members)
 	$(NARCCOMP) -o $@ -p 255 $^
 
-%.arc: members = $(wildcard $(@D)/$*/*)
+%.arc: members = $(wildcard $(@D)/$*/*.bin)
 %.arc: $$(members)
 	$(NARCCOMP) -o $@ -p 255 $^
 
 files/poketool/personal/pms.narc: ;
 
+files/poketool/personal/growtbl.narc: $(wildcard files/poketool/personal/growtbl/*.txt)
+	$(MAKE) -C $(<D)
+	$(NARCCOMP) -o $@ -p 255 $(^:%.txt=%.bin)
+
+######################## Misc #######################
+
 $(BUILD_DIR)/pokediamond_bnr.bin: pokediamond.bsf graphics/icon.4bpp graphics/icon.gbapal
 	$(MAKEBANNER) $< $@
 
-- 
cgit v1.2.3