toolchain upgrade

.clangd

@@ -1,6 +1,6 @@
 CompileFlags:
   Compiler: /usr/bin/g++
-  CompilationDatabase: ./target/megaton/none/make
+  CompilationDatabase: ./target/megaton/none/
   Remove: [ -march=*, -mtune=*, -mtp=* ]
 Diagnostics:
   Suppress: 

Megaton.toml

@@ -3,9 +3,8 @@ name = "botwsavs"
 title-id = 0x01007ef00011e000
 
 # make configuration
-[make]
+[build]
 entry = "exl_module_init"
-
 sources = [
     "src",
     "libs/exlaunch/source"
@@ -19,50 +18,41 @@ includes = [
     "libs/sead/include",
     "libs/nnheaders/include",
 ]
-defines = [
-    "NNSDK",
-    "SWITCH",
-    "__SWITCH__",
-    "EXL_DEBUG",
-    "EXL_LOAD_KIND_ENUM=2",
-    "EXL_LOAD_KIND=Module",
-    "NN_SDK_MAJOR=7",
-    "NN_SDK_MINOR=3",
-    "NN_SDK_PATCH=2",
-    "NN_WARE_MAJOR=7",
-    "NN_WARE_MINOR=3",
-    "NN_WARE_PATCH=2",
-]
-# linker scripts (relative to project root)
-ld-scripts = [
+ldscripts = [
     "libs/exlaunch/misc/link.ld",
     "libs/botw-symbols/ld/ld160.ld",
     "link.ld",
 ]
-# extra macros to define. The macros can be a string or a list of strings, which are joined with a space
-extra = [
-    { DEFINES = [
-        "-DEXL_PROGRAM_ID=$(MEGATON_MODULE_TITLE_ID)",
-        "-DEXL_MODULE_NAME='\"$(MEGATON_MODULE_NAME)\"'"
-    ]},
-    { CXXFLAGS = [
-        "-Wno-invalid-offsetof",
-    ]},
+
+[build.flags]
+c = [
+    "<default>",
+    "-DNNSDK",
+    "-DSWITCH",
+    "-D__SWITCH__",
+    "-DEXL_DEBUG",
+    "-DEXL_LOAD_KIND_ENUM=2",
+    "-DEXL_LOAD_KIND=Module",
+    "-DEXL_PROGRAM_ID=0x01007ef00011e000",
+    "-DEXL_MODULE_NAME=\"botwsavs\"",
+    "-DNN_SDK_MAJOR=7",
+    "-DNN_SDK_MINOR=3",
+    "-DNN_SDK_PATCH=2",
+    "-DNN_WARE_MAJOR=7",
+    "-DNN_WARE_MINOR=3",
+    "-DNN_WARE_PATCH=2",
+    "-DBOTW_VERSION=160",
+]
+cxx = [
+    "<default>",
+    "-Wno-invalid-offsetof",
 ]
 
 [check]
 ignore = [
     ".data",
     ".text",
 ]
-disallowed-instructions = [
-    '^msr\s*spsel',
-    '^msr\s*daifset',
-    '^mrs\.*daif',
-    '^mrs\.*tpidr_el1',
-    '^msr\s*tpidr_el1',
-    '^hlt',
-]
 symbols = [
     "libs/botw-symbols/symbols/160/main.syms",
     "libs/botw-symbols/symbols/160/rtld.syms",

scripts/lftp-upload.sh

@@ -1,6 +1,6 @@
 mkdir -p -f /atmosphere/contents/01007EF00011E000/exefs
 cd /atmosphere/contents/01007EF00011E000/exefs
-mput -e target/megaton/none/make/botwsavs.nso
+mput -e target/megaton/none/botwsavs.nso
 mput -e target/megaton/none/main.npdm
 rm -f subsdk9
 mv botwsavs.nso subsdk9

src/main.cpp

@@ -9,6 +9,7 @@ extern "C" void exl_main(void* x0, void* x1) {
     nn::fs::MountSdCardForDebug("sd");
 
     botw::savs::msg::install_hooks();
+
     botw::savs::start_worker_thread();
 }