From edaea5f274d6f8789777fa70af9edbf29a6bdd8b Mon Sep 17 00:00:00 2001
From: Harrison <53527582+HTV04@users.noreply.github.com>
Date: Thu, 25 Feb 2021 21:27:44 -0500
Subject: [PATCH] Revert ZIP changes

---
 .gitignore |  3 +--
 Makefile   | 13 +++++--------
 README.md  |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index cfd8dac..b7358f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 arm9/build/
 arm11/build/
 eclipse_project/
-open_agb_firm/
 *.sublime-project
 *.sublime-workspace
 arm9/open_agb_firm9.bin
@@ -10,4 +9,4 @@ arm9/open_agb_firm9.elf
 arm11/open_agb_firm11.elf
 tools/gba_db_builder/gba_db.bin
 open_agb_firm.firm
-open_agb_firm*.zip
+open_agb_firm*.7z
diff --git a/Makefile b/Makefile
index 7f12da5..620d749 100644
--- a/Makefile
+++ b/Makefile
@@ -53,17 +53,14 @@ arm11/$(TARGET)11.bin:
 clean:
 	@$(MAKE) --no-print-directory -C arm9 clean
 	@$(MAKE) --no-print-directory -C arm11 clean
-	rm -rf open_agb_firm $(TARGET).firm *.zip
+	rm -f $(TARGET).firm *.7z
 
 release: clean
 	@$(MAKE) -j4 --no-print-directory -C arm9 NO_DEBUG=1
 	@$(MAKE) -j4 --no-print-directory -C arm11 NO_DEBUG=1
 	firm_builder $(TARGET).firm $(ENTRY9) $(ENTRY11) $(SECTION0_ADR) $(SECTION0_TYPE) \
 		$(SECTION0_FILE) $(SECTION1_ADR) $(SECTION1_TYPE) $(SECTION1_FILE)
-	@mkdir open_agb_firm
-	@mkdir open_agb_firm/3ds
-	@cp LICENSE.txt open_agb_firm.firm README.md open_agb_firm
-	@cp resources/gba_db.bin open_agb_firm/3ds
-	@cp thirdparty/fatfs/LICENSE.txt open_agb_firm/LICENSE_fatfs.txt
-	@cp thirdparty/inih/LICENSE.txt open_agb_firm/LICENSE_inih.txt
-	@zip -r $(TARGET)$(VERS_STRING).zip open_agb_firm
+	@7z a -mx -m0=ARM -m1=LZMA $(TARGET)$(VERS_STRING).7z $(TARGET).firm
+	@7z u -mx -m0=LZMA $(TARGET)$(VERS_STRING).7z resources/gba_db.bin
+	@7z u -mx -m0=PPMD $(TARGET)$(VERS_STRING).7z LICENSE.txt thirdparty/fatfs/LICENSE.txt thirdparty/inih/LICENSE.txt README.md
+	@7z rn $(TARGET)$(VERS_STRING).7z resources/gba_db.bin 3ds/open_agb_firm/gba_db.bin thirdparty/fatfs/LICENSE.txt LICENSE_fatfs.txt thirdparty/inih/LICENSE.txt LICENSE_inih.txt
diff --git a/README.md b/README.md
index 6009d24..f116f51 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ To compile open_agb_firm, the following needs to be installed:
 * [Corelink DMA-330 Assembler](https://github.com/profi200/dma330as)
 * [CTR Firm Builder](https://github.com/derrekr/ctr_firm_builder)
 
-Additionally, `zip` needs to be installed to make release builds. Also, make sure that the `dma330as` and `firmbuilder` binaries are in the PATH environment variable and accessible to the Makefile.
+Additionally, `p7zip-full` needs to be installed to make release builds. Also, make sure that the `dma330as` and `firmbuilder` binaries are in the PATH environment variable and accessible to the Makefile.
 
 Build open_agb_firm as a debug build via `make`, or as a release build via `make release`.