From f50f6b23fbd389dddbcff87161d87ace6181b16e Mon Sep 17 00:00:00 2001
From: GutPuncher <GodsOfficialMessenger@protonmail.com>
Date: Mon, 19 Feb 2024 11:51:00 -0500
Subject: [PATCH] fix(sata-fix): review + test #147, #139. Fix build script
 limine git pull divergent branch error message issue. Revert Define.ZC

---
 build/build-iso.sh   | 2 ++
 src/System/Define.ZC | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/build-iso.sh b/build/build-iso.sh
index 3535c830..d72aa87f 100755
--- a/build/build-iso.sh
+++ b/build/build-iso.sh
@@ -73,6 +73,8 @@ then
 	git fetch
 	git remote set-head origin $LIMINE_BINARY_BRANCH
 	git switch $LIMINE_BINARY_BRANCH
+	git config --local pull.ff true
+	git config --local pull.rebase true
 	git pull
 	rm limine
 
diff --git a/src/System/Define.ZC b/src/System/Define.ZC
index 1a7e87c4..d9411781 100755
--- a/src/System/Define.ZC
+++ b/src/System/Define.ZC
@@ -15,7 +15,7 @@ U0 LoadDocDefines()
 	//$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/System/Boot/BootDVD.ZC,DD_BOOT_HIGH_LOC_DVD"$
 
 $TR,"LineRep"$
-$ID,2$DefinePrint("DD_ZEALOS_LOC","99,241");
+$ID,2$DefinePrint("DD_ZEALOS_LOC","99,737");
 $ID,-2$
 	DefinePrint("DD_MP_VECT", "%08X", MP_VECT_ADDR);
 	DefinePrint("DD_MP_VECT_END", "%08X", MP_VECT_ADDR + COREAP_16BIT_INIT_END - COREAP_16BIT_INIT - 1);