From f4e5715bf29386b9dda69cd64f575b0a61cadbc5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 30 May 2020 15:27:33 -0400
Subject: Use makebanner.exe

---
 Makefile             |   8 +++++---
 data/icon.s          |   6 ------
 data/title.s         |  16 ----------------
 data/title/title.txt | Bin 50 -> 0 bytes
 pokediamond.bsf      | Bin 0 -> 522 bytes
 pokediamond.lcf      |   3 +--
 6 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 data/icon.s
 delete mode 100644 data/title.s
 delete mode 100644 data/title/title.txt
 create mode 100644 pokediamond.bsf

diff --git a/Makefile b/Makefile
index ec593216..718dac26 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,7 @@ SHA1SUM = sha1sum
 JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc
 GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx
 MWASMARM_PATCHER = $(TOOLS_DIR)/mwasmarm_patcher/mwasmarm_patcher$(EXE) -q
+MAKEBANNER = $(WINE) $(TOOLS_DIR)/bin/makebanner.exe
 
 TOOLDIRS = $(filter-out $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*))
 TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%)
@@ -271,9 +272,9 @@ arm7:
 $(BINFILES): %.bin: %.sbin
 	@cp $< $@
 
-$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BINFILES)
+$(ELF): $(BUILD_DIR)/$(LD_SCRIPT) $(O_FILES) $(BINFILES) $(BUILD_DIR)/pokediamond_bnr.bin
 	# Hack because mwldarm doesn't like the sbin suffix
-	$(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(BINFILES)
+	$(LD) $(LDFLAGS) -o $@ $^
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill=0xFF --pad-to=0x04000000 $< $@
@@ -296,7 +297,8 @@ DUMMY != mkdir -p $(ALL_DIRS)
 %.png: ;
 %.pal: ;
 
-$(BUILD_DIR)/data/icon.o: graphics/icon.4bpp graphics/icon.gbapal
+$(BUILD_DIR)/pokediamond_bnr.bin: pokediamond.bsf graphics/icon.4bpp graphics/icon.gbapal
+	$(MAKEBANNER) $< $@
 
 ### Debug Print ###
 
diff --git a/data/icon.s b/data/icon.s
deleted file mode 100644
index 976077b0..00000000
--- a/data/icon.s
+++ /dev/null
@@ -1,6 +0,0 @@
-	.text
-	.short 0x0001
-	.short 0x048B
-	.space 0x1C
-	.incbin "graphics/icon.4bpp"
-	.incbin "graphics/icon.gbapal"
diff --git a/data/title.s b/data/title.s
deleted file mode 100644
index 56b16107..00000000
--- a/data/title.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.text
-	.global ROMTitles
-ROMTitles:
-	; UTF16LE has a leading short that should be skipped
-	.incbin "data/title/title.txt", 2
-	.space 0x100-(.-ROMTitles)
-	.incbin "data/title/title.txt", 2
-	.space 0x200-(.-ROMTitles)
-	.incbin "data/title/title.txt", 2
-	.space 0x300-(.-ROMTitles)
-	.incbin "data/title/title.txt", 2
-	.space 0x400-(.-ROMTitles)
-	.incbin "data/title/title.txt", 2
-	.space 0x500-(.-ROMTitles)
-	.incbin "data/title/title.txt", 2
-	.space 0x600-(.-ROMTitles)
diff --git a/data/title/title.txt b/data/title/title.txt
deleted file mode 100644
index 2d687892..00000000
Binary files a/data/title/title.txt and /dev/null differ
diff --git a/pokediamond.bsf b/pokediamond.bsf
new file mode 100644
index 00000000..61ed2951
Binary files /dev/null and b/pokediamond.bsf differ
diff --git a/pokediamond.lcf b/pokediamond.lcf
index daee270d..3ae3f17e 100644
--- a/pokediamond.lcf
+++ b/pokediamond.lcf
@@ -655,8 +655,7 @@ SECTIONS {
     } > fileallocationtable
 
     .icon_title : AT(0x338600) {
-        icon.o(.text)
-        title.o(.text)
+        INCLUDE pokediamond_bnr.bin
     } > icon_title
 
 	.FILE_339000 : AT (0x339000) {
-- 
cgit v1.2.3