diff --git a/.gitmodules b/.gitmodules
index 7edd423..fb18d61 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,4 +5,7 @@
[submodule "External/GoldHEN_Plugins_SDK"]
path = External/GoldHEN_Plugins_SDK
url = https://github.com/GoldHEN/GoldHEN_Plugins_SDK
- shallow = true
\ No newline at end of file
+ shallow = true
+[submodule "External/ps4-libjbc"]
+ path = External/ps4-libjbc
+ url = https://github.com/OSM-Made/ps4-libjbc
diff --git a/External/GoldHEN_Plugins_SDK b/External/GoldHEN_Plugins_SDK
index 20991d2..4d706c6 160000
--- a/External/GoldHEN_Plugins_SDK
+++ b/External/GoldHEN_Plugins_SDK
@@ -1 +1 @@
-Subproject commit 20991d2244ae510847c0ccf6549591352084cb73
+Subproject commit 4d706c61238949be07e0204a7f33f34ee59b86f3
diff --git a/External/ps4-libjbc b/External/ps4-libjbc
new file mode 160000
index 0000000..9910dcc
--- /dev/null
+++ b/External/ps4-libjbc
@@ -0,0 +1 @@
+Subproject commit 9910dcc1465d606d7791741986a6eeb6f01e49da
diff --git a/Orbis Suite 3.0.sln b/Orbis Suite 3.0.sln
index 3904063..71e2ace 100644
--- a/Orbis Suite 3.0.sln
+++ b/Orbis Suite 3.0.sln
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Playstation", "Playstation"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{DBCE3AAD-373D-4EB6-8964-2A4BE1E9F575}"
ProjectSection(SolutionItems) = preProject
- Misc\DriverDefinitions.h = Misc\DriverDefinitions.h
Misc\Increment.bat = Misc\Increment.bat
EndProjectSection
EndProject
@@ -50,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetupBA", "Windows\Installe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrbisLibraryManager", "Windows\OrbisLibraryManager\OrbisLibraryManager.csproj", "{53869FE9-BAFF-4FED-B8E3-20660865426C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OrbisLibAPI", "Playstation\OrbisLibAPI\OrbisLibAPI.vcxproj", "{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -206,6 +207,22 @@ Global
{53869FE9-BAFF-4FED-B8E3-20660865426C}.Release|x64.Build.0 = Release|Any CPU
{53869FE9-BAFF-4FED-B8E3-20660865426C}.Release|x86.ActiveCfg = Release|Any CPU
{53869FE9-BAFF-4FED-B8E3-20660865426C}.Release|x86.Build.0 = Release|Any CPU
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|Any CPU.Build.0 = Debug|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|Win32.ActiveCfg = Debug|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|Win32.Build.0 = Debug|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|x64.ActiveCfg = Debug|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|x64.Build.0 = Debug|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|x86.ActiveCfg = Debug|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|x86.Build.0 = Debug|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|Any CPU.ActiveCfg = Release|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|Any CPU.Build.0 = Release|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|Win32.ActiveCfg = Release|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|Win32.Build.0 = Release|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|x64.ActiveCfg = Release|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|x64.Build.0 = Release|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|x86.ActiveCfg = Release|x64
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|x86.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -222,6 +239,7 @@ Global
{A37095E9-80BD-4A6B-AF8B-33D278CF92F3} = {6046C772-BE17-4BC8-A362-AD8C77F9178E}
{33C378F9-36C5-4C2C-8350-FD1C8DD5AB66} = {6046C772-BE17-4BC8-A362-AD8C77F9178E}
{53869FE9-BAFF-4FED-B8E3-20660865426C} = {8F0E1457-FB1E-47A4-9DA8-74A6B757CAA4}
+ {22E600CA-B7A4-4FA1-A1DB-6BA4736E6121} = {8E8E4C8D-E3E1-4CB9-BD78-7ADAB2F2CF45}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B6EE1D0-5ADF-44A2-B6EE-E5C8E110EE47}
diff --git a/Playstation/Build/pkg/Daemons/ORBS30000/sce_module/libSceFios2.prx b/Playstation/Build/pkg/Daemons/ORBS30000/sce_module/libSceFios2.prx
new file mode 100644
index 0000000..1f83bdc
Binary files /dev/null and b/Playstation/Build/pkg/Daemons/ORBS30000/sce_module/libSceFios2.prx differ
diff --git a/Playstation/Build/pkg/Daemons/ORBS30000/sce_module/libc.prx b/Playstation/Build/pkg/Daemons/ORBS30000/sce_module/libc.prx
new file mode 100644
index 0000000..e49b25d
Binary files /dev/null and b/Playstation/Build/pkg/Daemons/ORBS30000/sce_module/libc.prx differ
diff --git a/Playstation/Build/pkg/Daemons/ORBS30000/sce_sys/icon0.png b/Playstation/Build/pkg/Daemons/ORBS30000/sce_sys/icon0.png
new file mode 100644
index 0000000..ad77945
Binary files /dev/null and b/Playstation/Build/pkg/Daemons/ORBS30000/sce_sys/icon0.png differ
diff --git a/Playstation/Build/pkg/Daemons/ORBS30000/sce_sys/param b/Playstation/Build/pkg/Daemons/ORBS30000/sce_sys/param
new file mode 100644
index 0000000..54664db
Binary files /dev/null and b/Playstation/Build/pkg/Daemons/ORBS30000/sce_sys/param differ
diff --git a/Playstation/Build/pkg/Orbis Suite.gp4 b/Playstation/Build/pkg/Orbis Suite.gp4
index 04e59c9..a81df46 100644
--- a/Playstation/Build/pkg/Orbis Suite.gp4
+++ b/Playstation/Build/pkg/Orbis Suite.gp4
@@ -33,6 +33,11 @@
+
+
+
+
+
@@ -40,6 +45,11 @@
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Playstation/Build/pkg/sce_module/libjbc.sprx b/Playstation/Build/pkg/sce_module/libjbc.sprx
deleted file mode 100644
index 93b937f..0000000
Binary files a/Playstation/Build/pkg/sce_module/libjbc.sprx and /dev/null differ
diff --git a/Playstation/OrbisLibAPI/Common.h b/Playstation/OrbisLibAPI/Common.h
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/Playstation/OrbisLibAPI/Common.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/Playstation/OrbisLibAPI/OrbisLibAPI.vcxproj b/Playstation/OrbisLibAPI/OrbisLibAPI.vcxproj
new file mode 100644
index 0000000..1088826
--- /dev/null
+++ b/Playstation/OrbisLibAPI/OrbisLibAPI.vcxproj
@@ -0,0 +1,71 @@
+
+
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ 15.0
+ {22e600ca-b7a4-4fa1-a1db-6ba4736e6121}
+ Win32Proj
+
+
+
+ Makefile
+ true
+ v141
+
+
+ Makefile
+ false
+ v141
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ eboot.bin
+ _DEBUG;$(NMakePreprocessorDefinitions)
+ call build.bat $(IntDir) "$(TargetName)" "$(SolutionDir)"
+ del /s /q /f $(IntDir)\*.o
+del /s /q /f $(IntDir)\*.elf
+del /s /q /f $(IntDir)\*.oelf
+call build.bat $(IntDir) "$(TargetName)" "$(SolutionDir)"
+ del /s /q /f $(IntDir)\*.o
+del /s /q /f $(IntDir)\*.elf
+del /s /q /f $(IntDir)\*.oelf
+ $(SolutionDir)
+ $(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)
+
+
+ eboot.bin
+ NDEBUG;$(NMakePreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Playstation/OrbisLibAPI/OrbisLibAPI.vcxproj.filters b/Playstation/OrbisLibAPI/OrbisLibAPI.vcxproj.filters
new file mode 100644
index 0000000..2929653
--- /dev/null
+++ b/Playstation/OrbisLibAPI/OrbisLibAPI.vcxproj.filters
@@ -0,0 +1,28 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;ipp;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+
+
+
+ Header Files
+
+
+
\ No newline at end of file
diff --git a/Playstation/OrbisLibAPI/build.bat b/Playstation/OrbisLibAPI/build.bat
new file mode 100644
index 0000000..d60c721
--- /dev/null
+++ b/Playstation/OrbisLibAPI/build.bat
@@ -0,0 +1,31 @@
+SETLOCAL EnableDelayedExpansion
+
+Rem Libraries to link in
+set libraries=-lc++ -lc -lSceSysModule -lkernel -lSceVideoOut -lSceSystemService -lSceSysCore -lSceSystemStateMgr -lSceNet -lScePad -lSceUserService -lSceRegMgr -lSceFreeType -lSceMsgDialog -lSceCommonDialog -lGoldHEN_Hook
+
+Rem Read the script arguments into local vars
+set intdir=%1
+set targetname=%~2
+set outputPath=%3
+
+set outputElf=%intdir%%targetname%.elf
+set outputOelf=%intdir%%targetname%.oelf
+
+Rem Compile object files for all the source files
+for %%f in (*.cpp) do (
+ clang++ -cc1 -triple x86_64-scei-ps4-elf -I"%OO_PS4_TOOLCHAIN%\\include" -I"%OO_PS4_TOOLCHAIN%\\include\\c++\\v1" -I"..\\..\\External\\GoldHEN_Plugins_SDK\\include" -DORBISLIB_DEBUG -emit-obj -o %intdir%\%%~nf.o %%~nf.cpp
+)
+
+Rem Get a list of object files for linking
+set obj_files=
+for %%f in (%1\\*.o) do set obj_files=!obj_files! .\%%f
+
+Rem Link the input ELF
+ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\\lib" "-L..\\..\\External\\GoldHEN_Plugins_SDK" %libraries% --verbose "%OO_PS4_TOOLCHAIN%\lib\crt1.o" %obj_files%
+
+Rem Create the eboot
+%OO_PS4_TOOLCHAIN%\bin\windows\create-fself.exe -in "%outputElf%" --out "%outputOelf%" --eboot "eboot.bin"
+
+Rem Cleanup
+copy "eboot.bin" %outputPath%\Playstation\Build\pkg\Daemons\ORBS30000\eboot.bin
+del "eboot.bin"
\ No newline at end of file
diff --git a/Playstation/OrbisLibAPI/main.cpp b/Playstation/OrbisLibAPI/main.cpp
new file mode 100644
index 0000000..1bc6e14
--- /dev/null
+++ b/Playstation/OrbisLibAPI/main.cpp
@@ -0,0 +1,7 @@
+#include "Common.h"
+
+int main()
+{
+ // Your code here...
+ return 0;
+}
\ No newline at end of file
diff --git a/Playstation/OrbisSuite/OrbisSuite.vcxproj b/Playstation/OrbisSuite/OrbisSuite.vcxproj
index e3c222d..699ce2f 100644
--- a/Playstation/OrbisSuite/OrbisSuite.vcxproj
+++ b/Playstation/OrbisSuite/OrbisSuite.vcxproj
@@ -76,6 +76,8 @@ del /s /q /f $(IntDir)\*.elf
del /s /q /f $(IntDir)\*.oelf
$(SolutionDir)
$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)
+ External\GoldHEN_Plugins_SDK\include;$(IncludePath)
+ External\GoldHEN_Plugins_SDK\source;$(SourcePath)
$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)
diff --git a/Playstation/OrbisSuite/Utilities.cpp b/Playstation/OrbisSuite/Utilities.cpp
index 818e153..2010265 100644
--- a/Playstation/OrbisSuite/Utilities.cpp
+++ b/Playstation/OrbisSuite/Utilities.cpp
@@ -99,11 +99,6 @@ void InstallDaemon(const char* Daemon)
sprintf(IconPath, "%s%s/sce_sys/icon0.png", DAEMONPATH, Daemon);
CopyFile(IconFromPath, IconPath);
- char LibjbcFromPath[0x100], LibjbcPath[0x100];
- sprintf(LibjbcFromPath, "%s%s/sce_module/libjbc.sprx", DAEMONGETPATH, Daemon);
- sprintf(LibjbcPath, "%s%s/sce_module/libjbc.sprx", DAEMONPATH, Daemon);
- CopyFile(LibjbcFromPath, LibjbcPath);
-
klog("[%s] Installation Success!\n", Daemon);
}
diff --git a/Playstation/OrbisSuite/build.bat b/Playstation/OrbisSuite/build.bat
index b5995f8..29510b1 100644
--- a/Playstation/OrbisSuite/build.bat
+++ b/Playstation/OrbisSuite/build.bat
@@ -1,7 +1,7 @@
SETLOCAL EnableDelayedExpansion
Rem Libraries to link in
-set libraries=-lc++ -lc -lSceSysModule -lkernel -lSceVideoOut -lSceSystemService -lSceSysCore -lSceSystemStateMgr -lSceNet -lScePad -lSceUserService -lSceRegMgr -lSceFreeType -lSceMsgDialog -lSceCommonDialog
+set libraries=-lc++ -lc -lSceSysModule -lkernel -lSceVideoOut -lSceSystemService -lSceSysCore -lSceSystemStateMgr -lSceNet -lScePad -lSceUserService -lSceRegMgr -lSceFreeType -lSceMsgDialog -lSceCommonDialog -lGoldHEN_Hook
Rem Read the script arguments into local vars
set intdir=%1
@@ -13,7 +13,7 @@ set outputOelf=%intdir%%targetname%.oelf
Rem Compile object files for all the source files
for %%f in (*.cpp) do (
- clang++ -cc1 -triple x86_64-scei-ps4-elf -I"%OO_PS4_TOOLCHAIN%\\include" -I"%OO_PS4_TOOLCHAIN%\\include\\c++\\v1" -DORBISLIB_DEBUG -emit-obj -o %intdir%\%%~nf.o %%~nf.cpp
+ clang++ -cc1 -triple x86_64-scei-ps4-elf -I"%OO_PS4_TOOLCHAIN%\\include" -I"%OO_PS4_TOOLCHAIN%\\include\\c++\\v1" -I"..\\..\\External\\GoldHEN_Plugins_SDK\\include" -DORBISLIB_DEBUG -emit-obj -o %intdir%\%%~nf.o %%~nf.cpp
)
Rem Get a list of object files for linking
@@ -21,7 +21,7 @@ set obj_files=
for %%f in (%1\\*.o) do set obj_files=!obj_files! .\%%f
Rem Link the input ELF
-ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\\lib" %libraries% --verbose "%OO_PS4_TOOLCHAIN%\lib\crt1.o" %obj_files%
+ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\\lib" "-L..\\..\\External\\GoldHEN_Plugins_SDK" %libraries% --verbose "%OO_PS4_TOOLCHAIN%\lib\crt1.o" %obj_files%
Rem Create the eboot
%OO_PS4_TOOLCHAIN%\bin\windows\create-fself.exe -in "%outputElf%" --out "%outputOelf%" --eboot "eboot.bin"
diff --git a/Playstation/OrbisSuite/main.cpp b/Playstation/OrbisSuite/main.cpp
index 6d5a524..5c6eb17 100644
--- a/Playstation/OrbisSuite/main.cpp
+++ b/Playstation/OrbisSuite/main.cpp
@@ -1,6 +1,5 @@
#include "Common.h"
-
-#define DEBUG_BUILD
+#include "../../External/GoldHEN_Plugins_SDK/include/GoldHEN.h"
int main()
{
@@ -12,9 +11,19 @@ int main()
return 0;
}
+ //TODO: Bug? This doesnt seem to work for some reason.
// Check GoldHEN SDK Version make sure we can run!
+ auto sdkVersion = sys_sdk_version();
+ if (sdkVersion < GOLDHEN_SDK_VERSION)
+ {
+ Notify("Invalid GoldHEN SDK Version %d Orbis Toolbox supports %d+", sdkVersion, GOLDHEN_SDK_VERSION);
+ sceSystemServiceLoadExec("exit", 0);
+ return 0;
+ }
// Use future GoldHEN JB
+ jailbreak_backup jb1;
+ sys_sdk_jailbreak(&jb1);
//MakeDirs
MakeDir("/data/Orbis Suite");
@@ -23,19 +32,21 @@ int main()
mount_large_fs("/dev/da0x4.crypt", "/system", "exfatfs", "511", MNT_UPDATE);
// Install all the things! :D
- //InstallDaemon("ORBS30000"); // Orbis Lib
+ InstallDaemon("ORBS30000"); // Orbis Lib
InstallOrbisToolbox();
- // Pull module list of SceShellUI to see if we should unload the toolbox.
+ //TODO: Pull module list of SceShellUI to see if we should unload the toolbox.
// Use GoldHEN SDK to load PRX to SceShellUI.
- /*
-
- auto Handle = OrbisDriver::LoadSPRX("SceShellUI", "/data/Orbis Toolbox/OrbisToolbox-2.0.sprx");
- if (Handle > 0)
- klog("Orbis Toolbox loaded! %d\n", Handle);
+ auto Handle = sys_sdk_proc_prx_load("SceShellUI", "/user/data/Orbis Toolbox/OrbisToolbox-2.0.sprx");
- */
+ if (Handle > 0)
+ klog("Orbis Toolbox loaded! %d\n", Handle);
+ else
+ {
+ klog("error: %d\n", Handle);
+ Notify("Failed to load Orbis Toolbox!");
+ }
sceSystemServiceLoadExec("exit", 0);
diff --git a/Playstation/OrbisToolbox-2.0/OrbisToolbox-2.0.vcxproj b/Playstation/OrbisToolbox-2.0/OrbisToolbox-2.0.vcxproj
index 7919a57..aed5004 100644
--- a/Playstation/OrbisToolbox-2.0/OrbisToolbox-2.0.vcxproj
+++ b/Playstation/OrbisToolbox-2.0/OrbisToolbox-2.0.vcxproj
@@ -54,6 +54,7 @@ del /s /q /f $(IntDir)\*.elf
del /s /q /f $(IntDir)\*.oelf
$(SolutionDir)
$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)
+ External\GoldHEN_Plugins_SDK\include;$(ExternalIncludePath)
WIN32;NDEBUG;$(NMakePreprocessorDefinitions)
diff --git a/Playstation/OrbisToolbox-2.0/OrbisToolbox-2.0.vcxproj.filters b/Playstation/OrbisToolbox-2.0/OrbisToolbox-2.0.vcxproj.filters
index 55a86c9..f9d55ca 100644
--- a/Playstation/OrbisToolbox-2.0/OrbisToolbox-2.0.vcxproj.filters
+++ b/Playstation/OrbisToolbox-2.0/OrbisToolbox-2.0.vcxproj.filters
@@ -174,9 +174,6 @@
Header Files\Utilities\Memory Utils
-
- Header Files\Utilities\Memory Utils
-
Header Files\Utilities\Memory Utils
@@ -195,9 +192,6 @@
Header Files\Utilities\Mono
-
- Header Files\Utilities\Memory Utils
-
Header Files\Utilities\PS Utils
@@ -216,6 +210,12 @@
Header Files\Utilities\Mono
+
+ Header Files\Utilities\Memory Utils
+
+
+ Header Files\Utilities\Memory Utils
+
@@ -308,9 +308,6 @@
Source Files\Utilities\Memory Utils
-
- Source Files\Utilities\Memory Utils
-
Source Files\Utilities\Memory Utils
@@ -332,6 +329,9 @@
Source Files\Utilities\Mono
+
+ Source Files\Utilities\Memory Utils
+
diff --git a/Playstation/OrbisToolbox-2.0/Version.h b/Playstation/OrbisToolbox-2.0/Version.h
index 8ebf8ed..e343861 100644
--- a/Playstation/OrbisToolbox-2.0/Version.h
+++ b/Playstation/OrbisToolbox-2.0/Version.h
@@ -1,11 +1,11 @@
-#pragma once
-#define ORBIS_TOOLBOX_MAJOR 2
-#define ORBIS_TOOLBOX_MINOR 0
-#define ORBIS_TOOLBOX_BUILDVERSION 198
-#define stringify(a) stringify_(a)
-#define stringify_(a) #a
-#if defined(ORBIS_TOOLBOX_DEBUG)
-#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Dev Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
-#else
-#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
-#endif
+#pragma once
+#define ORBIS_TOOLBOX_MAJOR 2
+#define ORBIS_TOOLBOX_MINOR 0
+#define ORBIS_TOOLBOX_BUILDVERSION 218
+#define stringify(a) stringify_(a)
+#define stringify_(a) #a
+#if defined(ORBIS_TOOLBOX_DEBUG)
+#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Dev Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
+#else
+#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
+#endif
diff --git a/Playstation/OrbisToolbox-2.0/build.bat b/Playstation/OrbisToolbox-2.0/build.bat
index 1db648b..2fea6d5 100644
--- a/Playstation/OrbisToolbox-2.0/build.bat
+++ b/Playstation/OrbisToolbox-2.0/build.bat
@@ -13,7 +13,7 @@ set outputOelf=%intdir%%targetname%.oelf
set outputPrx=%intdir%%targetname%.prx
set outputStub=%intdir%%targetname%_stub.so
-Rem Compile object files for all the source files -DORBIS_TOOLBOX_DEBUG
+Rem Compile object files for all the source files
for %%f in (*.cpp) do (
clang++ -cc1 -triple x86_64-scei-ps4-elf -I"%OO_PS4_TOOLCHAIN%\include" -I"%OO_PS4_TOOLCHAIN%\\include\\c++\\v1" -emit-obj -o %intdir%\%%~nf.o %%~nf.cpp
)
@@ -28,7 +28,7 @@ set obj_files=
for %%f in (%intdir%\\*.o) do set obj_files=!obj_files! .\%%f
Rem Link the input ELF
-ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\lib" %libraries% --verbose "%OO_PS4_TOOLCHAIN%\lib\crtlib.o" %obj_files%
+ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\lib" %libraries% --verbose "..\\..\\External\\GoldHEN_Plugins_SDK\\build\\crtprx.o" %obj_files%
Rem Create stub shared libraries
for %%f in (*.cpp) do (
@@ -49,15 +49,15 @@ del "%outputPrx%"
REM Generate the script. Will overwrite any existing temp.txt
REM echo open 192.168.0.54 1337> temp.txt
-echo open 192.168.0.54 2121> temp.txt
-echo anonymous>> temp.txt
-echo anonymous>> temp.txt
-echo cd "/data/Orbis Toolbox/">> temp.txt
-echo send "%outputPath%\Playstation\Build\pkg\Orbis Toolbox\%targetname%.sprx">> temp.txt
-echo quit>> temp.txt
+REM echo open 192.168.0.54 2121> temp.txt
+REM echo anonymous>> temp.txt
+REM echo anonymous>> temp.txt
+REM echo cd "/data/Orbis Toolbox/">> temp.txt
+REM echo send "%outputPath%\Playstation\Build\pkg\Orbis Toolbox\%targetname%.sprx">> temp.txt
+REM echo quit>> temp.txt
REM Launch FTP and pass it the script
-ftp -s:temp.txt
+REM ftp -s:temp.txt
REM Clean up.
-del temp.txt
\ No newline at end of file
+REM del temp.txt
\ No newline at end of file
diff --git a/Windows/OrbisNeighborHood/Resources/BuildNumber.txt b/Windows/OrbisNeighborHood/Resources/BuildNumber.txt
index 66227ac..b6e4b18 100644
--- a/Windows/OrbisNeighborHood/Resources/BuildNumber.txt
+++ b/Windows/OrbisNeighborHood/Resources/BuildNumber.txt
@@ -1 +1 @@
-1369
+1382
diff --git a/Windows/OrbisNeighborHood/Resources/BuildString.txt b/Windows/OrbisNeighborHood/Resources/BuildString.txt
index 3fde21b..45e9184 100644
--- a/Windows/OrbisNeighborHood/Resources/BuildString.txt
+++ b/Windows/OrbisNeighborHood/Resources/BuildString.txt
@@ -1 +1 @@
-Version 3.0.1369 Debug Build Sunday November 13 2022 10:27 AM
+Version 3.0.1382 Debug Build Wednesday November 30 2022 3:20 PM