From 7e381924abb805fa9f53e450a4d417c747edfa0b Mon Sep 17 00:00:00 2001
From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com>
Date: Wed, 22 Jan 2025 12:54:30 +0000
Subject: [PATCH] fix forwarder creation bug on ams 1.7.1, fix cmake project
 version bug

i was checking against ams 1.7.1, however the change was introduced in ams 1.8.0.
fixes #106

as for cmake, i have no idea why this bug happens, but sometimes it will use the project version for hbl.
which results in sphaira having a version number of 3.0.0.
this only seemed to happen when building the zip with no current build.
---
 sphaira/CMakeLists.txt | 2 +-
 sphaira/source/owo.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphaira/CMakeLists.txt b/sphaira/CMakeLists.txt
index dc7dc4a..ed0e11b 100644
--- a/sphaira/CMakeLists.txt
+++ b/sphaira/CMakeLists.txt
@@ -330,7 +330,7 @@ nx_generate_nacp(
     OUTPUT sphaira.nacp
     NAME ${CMAKE_PROJECT_NAME}
     AUTHOR TotalJustice
-    VERSION ${CMAKE_PROJECT_VERSION}
+    VERSION ${sphaira_VERSION}
 )
 
 # create nro
diff --git a/sphaira/source/owo.cpp b/sphaira/source/owo.cpp
index 85135bc..0f0d2b0 100644
--- a/sphaira/source/owo.cpp
+++ b/sphaira/source/owo.cpp
@@ -655,7 +655,7 @@ void patch_npdm(std::vector<u8>& npdm, const NpdmPatch& patch) {
     splGetConfig(SplConfigItem_ExosphereVersion, &ver);
     ver >>= 40;
 
-    if (ver >= MAKEHOSVERSION(1,7,1)) {
+    if (ver >= MAKEHOSVERSION(1,8,0)) {
         npdm_patch_kc(npdm, meta.aci0_offset + aci0.kac_offset, aci0.kac_size, 16, BIT(19));
         npdm_patch_kc(npdm, meta.acid_offset + acid.kac_offset, acid.kac_size, 16, BIT(19));
     }