From 294c9656bec076e1993375966a725723a931fa33 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sat, 13 Jan 2018 01:30:08 -0500
Subject: [PATCH 1/4] fix broken build after building without tools

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a0f93e2509..585236e75f 100644
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,10 @@ SCANINC := tools/scaninc/scaninc
 PREPROC := tools/preproc/preproc
 RAMSCRGEN := tools/ramscrgen/ramscrgen
 
-# Clear the default suffixes.
+# Clear the default suffixes
 .SUFFIXES:
+# Delete files that weren't built properly
+.DELETE_ON_ERROR:
 
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:

From 98ee41806e87f5b1cd43bab4dff1466b65aa036c Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sat, 13 Jan 2018 01:30:43 -0500
Subject: [PATCH 2/4] use .SECONDARY instead of .PRECIOUS to prevent files from
 being deleted

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 585236e75f..14768cd2fd 100644
--- a/Makefile
+++ b/Makefile
@@ -45,14 +45,14 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen
 
 # Clear the default suffixes
 .SUFFIXES:
+# Don't delete intermediate files
+.SECONDARY:
 # Delete files that weren't built properly
 .DELETE_ON_ERROR:
 
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
 
-.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin
-
 .PHONY: rom clean compare tidy
 
 $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR))

From 84d364819acb147ea7651ec3d890cd0b985e40be Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sat, 13 Jan 2018 01:31:07 -0500
Subject: [PATCH 3/4] add a rule for baserom.gba

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

diff --git a/Makefile b/Makefile
index 14768cd2fd..fa2acb282a 100644
--- a/Makefile
+++ b/Makefile
@@ -168,3 +168,6 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
+
+baserom.gba: ;
+	$(error baserom.gba is required to build)

From 0051d8aeeaea614b3d8c23f80df7d8b1dd6c607f Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sat, 13 Jan 2018 01:32:29 -0500
Subject: [PATCH 4/4] make build_tools.sh executable

---
 build_tools.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 build_tools.sh

diff --git a/build_tools.sh b/build_tools.sh
old mode 100644
new mode 100755