megaton (#18)

* remove exlaunch * update botw-symbols * use libmegaton * update check section
Pistonight · Nov 10, 2024 · 1408a4f · 1408a4f
1 parent bbf4532
commit 1408a4f
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 34 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -14,7 +14,3 @@
 	path = libs/sead
 	url = https://github.com/open-ead/sead
 	branch = master
-[submodule "exlaunch"]
-	path = libs/exlaunch
-	url = https://github.com/Pistonight/exlaunch
-	branch = dev
diff --git a/Megaton.toml b/Megaton.toml
@@ -4,24 +4,20 @@ title-id = 0x01007ef00011e000
 
 # make configuration
 [build]
-entry = "exl_module_init"
 sources = [
     "src",
-    "libs/exlaunch/source",
     "libs/botw-symbols/src",
 ]
 includes = [
     "src",
     "libs/botw/src",
     "libs/botw/lib/agl/include",
     "libs/botw/lib/gsys/include",
-    "libs/botw-symbols/src",
-    "libs/exlaunch/source",
+    "libs/botw-symbols/include",
     "libs/sead/include",
     "libs/nnheaders/include",
 ]
 ldscripts = [
-    "libs/exlaunch/misc/link.ld",
     "libs/botw-symbols/ld/ld160.ld",
     "libs/botw-symbols/ld/toolkit160.ld",
 ]
@@ -32,11 +28,6 @@ c = [
     "-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",
@@ -56,10 +47,6 @@ c = [
 ]
 
 [check]
-ignore = [
-    ".data",
-    ".text",
-]
 symbols = [
     "libs/botw-symbols/symbols/160/main.syms",
     "libs/botw-symbols/symbols/160/rtld.syms",

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -17,7 +17,7 @@ tasks:
     aliases: [b]
     desc: Build the mod
     cmds:
-      - megaton -p debug
+      - megaton build -p debug
 
   check:
     desc: Check code for errors

diff --git a/libs/botw-symbols b/libs/botw-symbols
diff --git a/libs/exlaunch b/libs/exlaunch
diff --git a/src/core/controller.hpp b/src/core/controller.hpp
@@ -1,6 +1,6 @@
 #pragma once
+#include <megaton/prelude.h>
 
-#include <exl/types.h>
 #include <toolkit/io/data_reader.hpp>
 #include <toolkit/io/data_writer.hpp>
 #include <toolkit/mem/string.hpp>

diff --git a/src/core/reporter.hpp b/src/core/reporter.hpp
@@ -1,7 +1,7 @@
 #pragma once
+#include <megaton/prelude.h>
 
 #include <algorithm>
-#include <exl/types.h>
 #include <toolkit/mem/string.hpp>
 
 namespace botw::savs {

diff --git a/src/core/state.hpp b/src/core/state.hpp
@@ -1,6 +1,6 @@
 #pragma once
+#include <megaton/prelude.h>
 
-#include <exl/types.h>
 #include <toolkit/io/data_reader.hpp>
 #include <toolkit/io/data_writer.hpp>
 #include <toolkit/pmdm.hpp>

diff --git a/src/core/time.hpp b/src/core/time.hpp
@@ -1,10 +1,9 @@
 #pragma once
-
-#include <exl/types.h>
+#include <megaton/prelude.h>
 
 namespace botw::savs::time {
 
-inline float ticks_to_secs_f32(u32 ticks) {
+inline f32 ticks_to_secs_f32(u32 ticks) {
     // 1 tick = 3 frames
     // 1s = 30 frames = 10 ticks
     return ticks / 10.0F;

diff --git a/src/core/worker.hpp b/src/core/worker.hpp
@@ -1,8 +1,8 @@
 #pragma once
+#include <megaton/prelude.h>
 
 #include "core/controller.hpp"
 #include "core/state.hpp"
-#include <exl/types.h>
 
 namespace botw::savs {
 

diff --git a/src/impl/raw_ptr.hpp b/src/impl/raw_ptr.hpp
@@ -5,7 +5,7 @@
  * from the research.
  */
 #pragma once
-#include <exl/types.h>
+#include <megaton/prelude.h>
 #include <toolkit/mem/mem_ptr.hpp>
 #include <toolkit/mem/safe_ptr.hpp>
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,4 +1,4 @@
-#include <exl/lib.hpp>
+#include <megaton/prelude.h>
 #include <nn/fs.h>
 #include <toolkit/equipment.hpp>
 #include <toolkit/msg/info.hpp>
@@ -7,8 +7,7 @@
 
 #include "core/worker.hpp"
 
-extern "C" void exl_main(void* x0, void* x1) {
-    exl::hook::Initialize();
+extern "C" void megaton_main() {
     nn::fs::MountSdCardForDebug("sd");
 
     botw::msg::info::init();
@@ -18,5 +17,3 @@ extern "C" void exl_main(void* x0, void* x1) {
 
     botw::savs::start_worker_thread();
 }
-
-extern "C" NORETURN void exl_exception_entry() { EXL_ABORT(0x420); }
+24 −3		README.md
+1 −1		badges/150.json
+0 −0		include/toolkit/equipment.hpp
+0 −0		include/toolkit/io/data_reader.hpp
+0 −0		include/toolkit/io/data_writer.hpp
+0 −0		include/toolkit/io/file.hpp
+0 −0		include/toolkit/mem/internal_ptr.hpp
+0 −0		include/toolkit/mem/mem_ptr.hpp
+0 −0		include/toolkit/mem/named_value.hpp
+0 −0		include/toolkit/mem/safe_ptr.hpp
+0 −0		include/toolkit/mem/string.hpp
+0 −0		include/toolkit/mem/unique_ptr.hpp
+0 −0		include/toolkit/msg/info.hpp
+0 −0		include/toolkit/msg/loader_hook.hpp
+33 −0		include/toolkit/msg/screen.hpp
+0 −0		include/toolkit/msg/widget.hpp
+0 −0		include/toolkit/pmdm.hpp
+0 −0		include/toolkit/scoped_lock.hpp
+0 −0		include/toolkit/sead/list.hpp
+0 −0		include/toolkit/tcp.hpp
+40 −17		ld/ld150.ld
+3 −25		ld/ld150_stubs.ld
+4 −4		src/equipment.cpp
+0 −0		src/io/data_reader.cpp
+0 −0		src/io/data_writer.cpp
+0 −0		src/io/file.cpp
+3 −2		src/mem.cpp
+0 −0		src/msg/info.cpp
+6 −2		src/msg/loader_hook.cpp
+153 −0		src/msg/screen.cpp
+12 −3		src/msg/widget.cpp
+4 −3		src/pmdm.cpp
+0 −0		src/sead/list.cpp
+0 −0		src/sead/safe_string.cpp
+0 −0		src/tcp.cpp