1.2.0 port

Raytwo · Raytwo · commit b74c082c6159 · 2020-02-14T22:44:13.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,25 @@
+*.elf
+*.i64
+*.id0
+*.id1
+*.id2
+*.idb
+*.nso
+*.pfs0
+*.nacp
+*.nam
+*.nro
+*.o
+*.txt
+*.til
+*.pchtxt
+*.ips
+.vscode/
+build*/
+debug/
+release/
+lib/
+linkerscripts/symstemp.ld
+skyline_patch*/
+scripts/.idea/*
+!exported.txt
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 
 .PHONY: all clean skyline skyline_patch send
 
-CROSSVER ?= 111
+CROSSVER ?= 120
 IP ?= 192.168.1.8
 
 all: skyline skyline_patch send
diff --git a/linkerscripts/syms120.ld b/linkerscripts/syms120.ld
@@ -0,0 +1 @@
+blank = 0;
diff --git a/patches/codehook_111.slpatch b/patches/codehook_111.slpatch
diff --git a/patches/codehook_120.slpatch b/patches/codehook_120.slpatch
@@ -0,0 +1 @@
+[version=120, target=main]
diff --git a/patches/configs/120.config b/patches/configs/120.config
@@ -0,0 +1,7 @@
+[build_id]
+main=89048449BA238C8CF565518B83BF02D3
+
+[nso_load_addr]
+main=0
+subsdk0=0x3174000
+;sdk=subsdk0+1 TODO: need load address formula to calculate
diff --git a/patches/maps/120/main.map b/patches/maps/120/main.map
@@ -0,0 +1 @@
+﻿
diff --git a/patches/maps/120/sdk.map b/patches/maps/120/sdk.map
diff --git a/scripts/sendPatch.py b/scripts/sendPatch.py
@@ -33,7 +33,7 @@ def ensuredirectory(connection,root,path):
 consolePort = 5000
 
 if len(sys.argv) < 4:
-    version = '111'
+    version = '120'
 else:
     version = sys.argv[2]
 
diff --git a/source/main.cpp b/source/main.cpp
@@ -119,7 +119,7 @@ u64 archive_fake_uncomp_size(u64* archive_ptr, u32 entryid)
 }
 
 char* hook_get_version_string() {
-    return "Aldebaran 0.0.1β";
+    return "Aldebaran 0.0.2β";
 }
 
 void stub() {}
@@ -160,22 +160,21 @@ void runtimePatchMain() {
         NULL);
 
     A64HookFunction(
-        reinterpret_cast<void*>(text + 0x46cfa0),
+        reinterpret_cast<void*>(text + 0x4a12b0),
         reinterpret_cast<void*>(forge_hook),
         (void**)&og_load_entryid);
 
     A64HookFunction(
-        reinterpret_cast<void*>(text + 0x46c830),
+        reinterpret_cast<void*>(text + 0x4a0b40),
         reinterpret_cast<void*>(archive_fake_uncomp_size),
         (void**)&uncompress_entryid);
 
     A64HookFunction(
-        reinterpret_cast<void*>(text + 0x3b7f50),
+        reinterpret_cast<void*>(text + 0x3e63e0),
         reinterpret_cast<void*>(hook_get_version_string),
         NULL);
-
     
-    fe_malloc = (void* (*) (u64, u64)) text + 0x584ab0;
+    fe_malloc = (void* (*) (u64, u64)) text + 0x5bab80;
 
     skyline::Plugin::Manager::Init();
 }
