From 39a50a406bb1d7fb04792cd87bc0879617f61f23 Mon Sep 17 00:00:00 2001
From: rozlette <Rozelette@users.noreply.github.com>
Date: Mon, 27 Jun 2022 18:43:28 -0500
Subject: [PATCH] Update names

---
 libultraship/libultraship/Console.cpp         |   4 +-
 libultraship/libultraship/Hooks.cpp           |   2 +-
 libultraship/libultraship/ImGuiImpl.cpp       |   6 +-
 libultraship/libultraship/ImGuiImpl.h         |   2 +-
 .../libultraship/Lib/Fast3D/gfx_pc.cpp        |   4 +-
 libultraship/libultraship/ModManager.cpp      |   2 +-
 libultraship/libultraship/ModModule.h         |   4 +-
 .../libultraship/libultraship.vcxproj         | 910 +++++++++---------
 .../libultraship/libultraship.vcxproj.filters |  12 +-
 soh/src/code/audioMgr.c                       |   2 +-
 .../ovl_kaleido_scope/z_kaleido_scope_PAL.c   |   2 +-
 11 files changed, 475 insertions(+), 475 deletions(-)

diff --git a/libultraship/libultraship/Console.cpp b/libultraship/libultraship/Console.cpp
index 6f04bc917..6708f1bfb 100644
--- a/libultraship/libultraship/Console.cpp
+++ b/libultraship/libultraship/Console.cpp
@@ -1,11 +1,11 @@
-#include "SohConsole.h"
+#include "Console.h"
 
 #include <iostream>
 #include <sstream>
 
 #include "Cvar.h"
 #include "GlobalCtx2.h"
-#include "SohImGuiImpl.h"
+#include "ImGuiImpl.h"
 #include "Lib/ImGui/imgui.h"
 #include "Utils/StringHelper.h"
 #include "Lib/ImGui/imgui_internal.h"
diff --git a/libultraship/libultraship/Hooks.cpp b/libultraship/libultraship/Hooks.cpp
index c11745e84..2b66ed318 100644
--- a/libultraship/libultraship/Hooks.cpp
+++ b/libultraship/libultraship/Hooks.cpp
@@ -1,4 +1,4 @@
-#include "SohHooks.h"
+#include "Hooks.h"
 #include <map>
 #include <string>
 #include <vector>
diff --git a/libultraship/libultraship/ImGuiImpl.cpp b/libultraship/libultraship/ImGuiImpl.cpp
index bcce3adf2..60a29f2f9 100644
--- a/libultraship/libultraship/ImGuiImpl.cpp
+++ b/libultraship/libultraship/ImGuiImpl.cpp
@@ -1,4 +1,4 @@
-#include "SohImGuiImpl.h"
+#include "ImGuiImpl.h"
 
 #include <iostream>
 #include <map>
@@ -10,8 +10,8 @@
 #include "Archive.h"
 #include "Environment.h"
 #include "GameSettings.h"
-#include "SohConsole.h"
-#include "SohHooks.h"
+#include "Console.h"
+#include "Hooks.h"
 #include "Lib/ImGui/imgui_internal.h"
 #include "GlobalCtx2.h"
 #include "ResourceMgr.h"
diff --git a/libultraship/libultraship/ImGuiImpl.h b/libultraship/libultraship/ImGuiImpl.h
index 1ae02c1e7..00f494180 100644
--- a/libultraship/libultraship/ImGuiImpl.h
+++ b/libultraship/libultraship/ImGuiImpl.h
@@ -2,7 +2,7 @@
 
 #include "GameOverlay.h"
 #include "Lib/ImGui/imgui.h"
-#include "SohConsole.h"
+#include "Console.h"
 
 struct GameAsset {
     uint32_t textureId;
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
index cf5403867..89019aa97 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
@@ -25,11 +25,11 @@
 #include "gfx_window_manager_api.h"
 #include "gfx_rendering_api.h"
 #include "gfx_screen_config.h"
-#include "../../SohHooks.h"
+#include "../../Hooks.h"
 
 #include "../../luslog.h"
 #include "../StrHash64.h"
-#include "../../SohImGuiImpl.h"
+#include "../../ImGuiImpl.h"
 #include "../../Environment.h"
 #include "../../GameVersions.h"
 #include "../../ResourceMgr.h"
diff --git a/libultraship/libultraship/ModManager.cpp b/libultraship/libultraship/ModManager.cpp
index c07f169ac..8aa2715de 100644
--- a/libultraship/libultraship/ModManager.cpp
+++ b/libultraship/libultraship/ModManager.cpp
@@ -1,7 +1,7 @@
 #include "ModManager.h"
 #include "TextureMod.h"
 #include "ModModule.h"
-#include "SohImGuiImpl.h"
+#include "ImGuiImpl.h"
 
 namespace Ship {
 	std::vector<ModModule*> modules;
diff --git a/libultraship/libultraship/ModModule.h b/libultraship/libultraship/ModModule.h
index e77c47234..da62273db 100644
--- a/libultraship/libultraship/ModModule.h
+++ b/libultraship/libultraship/ModModule.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "ModManager.h"
-#include "SohHooks.h"
-#include "SohConsole.h"
+#include "Hooks.h"
+#include "Console.h"
 #include "Archive.h"
 
 namespace Ship {
diff --git a/libultraship/libultraship/libultraship.vcxproj b/libultraship/libultraship/libultraship.vcxproj
index 27006aec0..a4e018e2d 100644
--- a/libultraship/libultraship/libultraship.vcxproj
+++ b/libultraship/libultraship/libultraship.vcxproj
@@ -1,456 +1,456 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Testing|Win32">
-      <Configuration>Testing</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Testing|x64">
-      <Configuration>Testing</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{6da9b521-65b7-41e2-8f8a-f0451cc18ed8}</ProjectGuid>
-    <RootNamespace>libultraship</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>libultraship</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level2</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'">
-    <ClCompile>
-      <WarningLevel>Level2</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Audio.cpp" />
-    <ClCompile Include="Blob.cpp" />
-    <ClCompile Include="Cvar.cpp" />
-    <ClCompile Include="Environment.cpp" />
-    <ClCompile Include="Factories\AudioFactory.cpp" />
-    <ClCompile Include="GameOverlay.cpp" />
-    <ClCompile Include="GameSettings.cpp" />
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_dx11.cpp" />
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_win32.cpp" />
-    <ClCompile Include="luslog.cpp" />
-    <ClCompile Include="mixer.c" />
-    <ClCompile Include="ModManager.cpp" />
-    <ClCompile Include="SDLAudioPlayer.cpp" />
-    <ClCompile Include="SohConsole.cpp" />
-    <ClCompile Include="Factories\AnimationFactory.cpp" />
-    <ClCompile Include="Factories\ArrayFactory.cpp" />
-    <ClCompile Include="Factories\BlobFactory.cpp" />
-    <ClCompile Include="Factories\CutsceneFactory.cpp" />
-    <ClCompile Include="Factories\MtxFactory.cpp" />
-    <ClCompile Include="Factories\PathFactory.cpp" />
-    <ClCompile Include="Animation.cpp" />
-    <ClCompile Include="Factories\TextFactory.cpp" />
-    <ClCompile Include="Factories\TextureFactory.cpp" />
-    <ClCompile Include="Factories\VtxFactory.cpp" />
-    <ClCompile Include="Array.cpp" />
-    <ClCompile Include="ConfigFile.cpp" />
-    <ClCompile Include="Controller.cpp" />
-    <ClCompile Include="SohHooks.cpp" />
-    <ClCompile Include="SohImGuiImpl.cpp" />
-    <ClCompile Include="KeyboardController.cpp" />
-    <ClCompile Include="Factories\CollisionHeaderFactory.cpp" />
-    <ClCompile Include="Factories\DisplayListFactory.cpp" />
-    <ClCompile Include="Factories\MaterialFactory.cpp" />
-    <ClCompile Include="Factories\PlayerAnimationFactory.cpp" />
-    <ClCompile Include="Factories\ResourceLoader.cpp" />
-    <ClCompile Include="Factories\SceneFactory.cpp" />
-    <ClCompile Include="Factories\SkeletonFactory.cpp" />
-    <ClCompile Include="Factories\SkeletonLimbFactory.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_cc.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d11.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d12.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d_common.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_dxgi.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_glx.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_opengl.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_pc.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_sdl2.cpp" />
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_opengl3.cpp" />
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_sdl.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui_demo.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui_draw.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui_tables.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui_widgets.cpp" />
-    <ClCompile Include="Lib\stb\stb_impl.c" />
-    <ClCompile Include="Lib\StrHash64.cpp" />
-    <ClCompile Include="Lib\tinyxml2\tinyxml2.cpp" />
-    <ClCompile Include="Archive.cpp" />
-    <ClCompile Include="CollisionHeader.cpp" />
-    <ClCompile Include="ControllerAttachment.cpp" />
-    <ClCompile Include="Cutscene.cpp" />
-    <ClCompile Include="DisplayList.cpp" />
-    <ClCompile Include="GlobalCtx2.cpp" />
-    <ClCompile Include="File.cpp" />
-    <ClCompile Include="Material.cpp" />
-    <ClCompile Include="Matrix.cpp" />
-    <ClCompile Include="MemoryPack.cpp" />
-    <ClCompile Include="Model.cpp" />
-    <ClCompile Include="Path.cpp" />
-    <ClCompile Include="PlayerAnimation.cpp" />
-    <ClCompile Include="Resource.cpp" />
-    <ClCompile Include="ResourceMgr.cpp" />
-    <ClCompile Include="RumblePack.cpp" />
-    <ClCompile Include="Scene.cpp" />
-    <ClCompile Include="Skeleton.cpp" />
-    <ClCompile Include="SkeletonLimb.cpp" />
-    <ClCompile Include="Text.cpp" />
-    <ClCompile Include="Texture.cpp" />
-    <ClCompile Include="TextureMod.cpp" />
-    <ClCompile Include="Utils.cpp" />
-    <ClCompile Include="Vertex.cpp" />
-    <ClCompile Include="WasapiAudioPlayer.cpp" />
-    <ClCompile Include="Window.cpp" />
-    <ClCompile Include="WindowShim.cpp" />
-    <ClCompile Include="stox.cpp" />
-    <ClCompile Include="SDLController.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="abi.h" />
-    <ClInclude Include="Audio.h" />
-    <ClInclude Include="AudioPlayer.h" />
-    <ClInclude Include="Blob.h" />
-    <ClInclude Include="Cvar.h" />
-    <ClInclude Include="Environment.h" />
-    <ClInclude Include="Factories\AudioFactory.h" />
-    <ClInclude Include="GameOverlay.h" />
-    <ClInclude Include="GameSettings.h" />
-    <ClInclude Include="GameVersions.h" />
-    <ClInclude Include="Lib\dr_libs\mp3.h" />
-    <ClInclude Include="Lib\dr_libs\wav.h" />
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_dx11.h" />
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_win32.h" />
-    <ClInclude Include="Lib\stb\stb_image_write.h" />
-    <ClInclude Include="luslog.h" />
-    <ClInclude Include="mixer.h" />
-    <ClInclude Include="ModManager.h" />
-    <ClInclude Include="ModModule.h" />
-    <ClInclude Include="SDLAudioPlayer.h" />
-    <ClInclude Include="SohConsole.h" />
-    <ClInclude Include="Factories\ArrayFactory.h" />
-    <ClInclude Include="Factories\BlobFactory.h" />
-    <ClInclude Include="Factories\CutsceneFactory.h" />
-    <ClInclude Include="Factories\AnimationFactory.h" />
-    <ClInclude Include="Factories\MtxFactory.h" />
-    <ClInclude Include="Factories\PathFactory.h" />
-    <ClInclude Include="Factories\TextFactory.h" />
-    <ClInclude Include="Factories\TextureFactory.h" />
-    <ClInclude Include="Factories\VtxFactory.h" />
-    <ClInclude Include="Animation.h" />
-    <ClInclude Include="Array.h" />
-    <ClInclude Include="Cutscene.h" />
-    <ClInclude Include="SohHooks.h" />
-    <ClInclude Include="SohImGuiImpl.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_cc.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d11.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d12.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d12_guids.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d_common.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_dxgi.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_glx.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_rendering_api.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_screen_config.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_window_manager_api.h" />
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_opengl3.h" />
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_sdl.h" />
-    <ClInclude Include="Lib\ImGui\imconfig.h" />
-    <ClInclude Include="Lib\ImGui\imgui.h" />
-    <ClInclude Include="Lib\ImGui\imgui_internal.h" />
-    <ClInclude Include="Lib\ImGui\imstb_rectpack.h" />
-    <ClInclude Include="Lib\ImGui\imstb_textedit.h" />
-    <ClInclude Include="Lib\ImGui\imstb_truetype.h" />
-    <ClInclude Include="Lib\stb\stb_image.h" />
-    <ClInclude Include="Matrix.h" />
-    <ClInclude Include="Path.h" />
-    <ClInclude Include="Text.h" />
-    <ClInclude Include="TextureMod.h" />
-    <ClInclude Include="Utils.h" />
-    <ClInclude Include="Vertex.h" />
-    <ClInclude Include="stox.h" />
-    <ClInclude Include="Lib\mINI\src\mini\ini.h" />
-    <ClInclude Include="ConfigFile.h" />
-    <ClInclude Include="Controller.h" />
-    <ClInclude Include="KeyboardController.h" />
-    <ClInclude Include="Factories\CollisionHeaderFactory.h" />
-    <ClInclude Include="Factories\DisplayListFactory.h" />
-    <ClInclude Include="Factories\MaterialFactory.h" />
-    <ClInclude Include="Factories\PlayerAnimationFactory.h" />
-    <ClInclude Include="Factories\ResourceLoader.h" />
-    <ClInclude Include="Factories\SceneFactory.h" />
-    <ClInclude Include="Factories\SkeletonFactory.h" />
-    <ClInclude Include="Factories\SkeletonLimbFactory.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_opengl.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_pc.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_sdl.h" />
-    <ClInclude Include="Lib\StrHash64.h" />
-    <ClInclude Include="Lib\tinyxml2\tinyxml2.h" />
-    <ClInclude Include="Archive.h" />
-    <ClInclude Include="CollisionHeader.h" />
-    <ClInclude Include="ControllerAttachment.h" />
-    <ClInclude Include="DisplayList.h" />
-    <ClInclude Include="GlobalCtx2.h" />
-    <ClInclude Include="File.h" />
-    <ClInclude Include="LUSMacros.h" />
-    <ClInclude Include="Material.h" />
-    <ClInclude Include="MemoryPack.h" />
-    <ClInclude Include="Model.h" />
-    <ClInclude Include="PlayerAnimation.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="ResourceMgr.h" />
-    <ClInclude Include="RumblePack.h" />
-    <ClInclude Include="Scene.h" />
-    <ClInclude Include="Skeleton.h" />
-    <ClInclude Include="SkeletonLimb.h" />
-    <ClInclude Include="Texture.h" />
-    <ClInclude Include="WasapiAudioPlayer.h" />
-    <ClInclude Include="Window.h" />
-    <ClInclude Include="UltraController.h" />
-    <ClInclude Include="SDLController.h" />
-    <ClInclude Include="WindowShim.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\OTRGui\build\ZERO_CHECK.vcxproj">
-      <Project>{02d10590-9542-3f55-aaf8-6055677e2a2a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Testing|Win32">
+      <Configuration>Testing</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Testing|x64">
+      <Configuration>Testing</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{6da9b521-65b7-41e2-8f8a-f0451cc18ed8}</ProjectGuid>
+    <RootNamespace>libultraship</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>libultraship</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level2</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'">
+    <ClCompile>
+      <WarningLevel>Level2</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Audio.cpp" />
+    <ClCompile Include="Blob.cpp" />
+    <ClCompile Include="Cvar.cpp" />
+    <ClCompile Include="Environment.cpp" />
+    <ClCompile Include="Factories\AudioFactory.cpp" />
+    <ClCompile Include="GameOverlay.cpp" />
+    <ClCompile Include="GameSettings.cpp" />
+    <ClCompile Include="Lib\ImGui\backends\imgui_impl_dx11.cpp" />
+    <ClCompile Include="Lib\ImGui\backends\imgui_impl_win32.cpp" />
+    <ClCompile Include="luslog.cpp" />
+    <ClCompile Include="mixer.c" />
+    <ClCompile Include="ModManager.cpp" />
+    <ClCompile Include="SDLAudioPlayer.cpp" />
+    <ClCompile Include="Console.cpp" />
+    <ClCompile Include="Factories\AnimationFactory.cpp" />
+    <ClCompile Include="Factories\ArrayFactory.cpp" />
+    <ClCompile Include="Factories\BlobFactory.cpp" />
+    <ClCompile Include="Factories\CutsceneFactory.cpp" />
+    <ClCompile Include="Factories\MtxFactory.cpp" />
+    <ClCompile Include="Factories\PathFactory.cpp" />
+    <ClCompile Include="Animation.cpp" />
+    <ClCompile Include="Factories\TextFactory.cpp" />
+    <ClCompile Include="Factories\TextureFactory.cpp" />
+    <ClCompile Include="Factories\VtxFactory.cpp" />
+    <ClCompile Include="Array.cpp" />
+    <ClCompile Include="ConfigFile.cpp" />
+    <ClCompile Include="Controller.cpp" />
+    <ClCompile Include="Hooks.cpp" />
+    <ClCompile Include="ImGuiImpl.cpp" />
+    <ClCompile Include="KeyboardController.cpp" />
+    <ClCompile Include="Factories\CollisionHeaderFactory.cpp" />
+    <ClCompile Include="Factories\DisplayListFactory.cpp" />
+    <ClCompile Include="Factories\MaterialFactory.cpp" />
+    <ClCompile Include="Factories\PlayerAnimationFactory.cpp" />
+    <ClCompile Include="Factories\ResourceLoader.cpp" />
+    <ClCompile Include="Factories\SceneFactory.cpp" />
+    <ClCompile Include="Factories\SkeletonFactory.cpp" />
+    <ClCompile Include="Factories\SkeletonLimbFactory.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_cc.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_direct3d11.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_direct3d12.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_direct3d_common.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_dxgi.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_glx.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_opengl.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_pc.cpp" />
+    <ClCompile Include="Lib\Fast3D\gfx_sdl2.cpp" />
+    <ClCompile Include="Lib\ImGui\backends\imgui_impl_opengl3.cpp" />
+    <ClCompile Include="Lib\ImGui\backends\imgui_impl_sdl.cpp" />
+    <ClCompile Include="Lib\ImGui\imgui.cpp" />
+    <ClCompile Include="Lib\ImGui\imgui_demo.cpp" />
+    <ClCompile Include="Lib\ImGui\imgui_draw.cpp" />
+    <ClCompile Include="Lib\ImGui\imgui_tables.cpp" />
+    <ClCompile Include="Lib\ImGui\imgui_widgets.cpp" />
+    <ClCompile Include="Lib\stb\stb_impl.c" />
+    <ClCompile Include="Lib\StrHash64.cpp" />
+    <ClCompile Include="Lib\tinyxml2\tinyxml2.cpp" />
+    <ClCompile Include="Archive.cpp" />
+    <ClCompile Include="CollisionHeader.cpp" />
+    <ClCompile Include="ControllerAttachment.cpp" />
+    <ClCompile Include="Cutscene.cpp" />
+    <ClCompile Include="DisplayList.cpp" />
+    <ClCompile Include="GlobalCtx2.cpp" />
+    <ClCompile Include="File.cpp" />
+    <ClCompile Include="Material.cpp" />
+    <ClCompile Include="Matrix.cpp" />
+    <ClCompile Include="MemoryPack.cpp" />
+    <ClCompile Include="Model.cpp" />
+    <ClCompile Include="Path.cpp" />
+    <ClCompile Include="PlayerAnimation.cpp" />
+    <ClCompile Include="Resource.cpp" />
+    <ClCompile Include="ResourceMgr.cpp" />
+    <ClCompile Include="RumblePack.cpp" />
+    <ClCompile Include="Scene.cpp" />
+    <ClCompile Include="Skeleton.cpp" />
+    <ClCompile Include="SkeletonLimb.cpp" />
+    <ClCompile Include="Text.cpp" />
+    <ClCompile Include="Texture.cpp" />
+    <ClCompile Include="TextureMod.cpp" />
+    <ClCompile Include="Utils.cpp" />
+    <ClCompile Include="Vertex.cpp" />
+    <ClCompile Include="WasapiAudioPlayer.cpp" />
+    <ClCompile Include="Window.cpp" />
+    <ClCompile Include="WindowShim.cpp" />
+    <ClCompile Include="stox.cpp" />
+    <ClCompile Include="SDLController.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="abi.h" />
+    <ClInclude Include="Audio.h" />
+    <ClInclude Include="AudioPlayer.h" />
+    <ClInclude Include="Blob.h" />
+    <ClInclude Include="Cvar.h" />
+    <ClInclude Include="Environment.h" />
+    <ClInclude Include="Factories\AudioFactory.h" />
+    <ClInclude Include="GameOverlay.h" />
+    <ClInclude Include="GameSettings.h" />
+    <ClInclude Include="GameVersions.h" />
+    <ClInclude Include="Lib\dr_libs\mp3.h" />
+    <ClInclude Include="Lib\dr_libs\wav.h" />
+    <ClInclude Include="Lib\ImGui\backends\imgui_impl_dx11.h" />
+    <ClInclude Include="Lib\ImGui\backends\imgui_impl_win32.h" />
+    <ClInclude Include="Lib\stb\stb_image_write.h" />
+    <ClInclude Include="luslog.h" />
+    <ClInclude Include="mixer.h" />
+    <ClInclude Include="ModManager.h" />
+    <ClInclude Include="ModModule.h" />
+    <ClInclude Include="SDLAudioPlayer.h" />
+    <ClInclude Include="Console.h" />
+    <ClInclude Include="Factories\ArrayFactory.h" />
+    <ClInclude Include="Factories\BlobFactory.h" />
+    <ClInclude Include="Factories\CutsceneFactory.h" />
+    <ClInclude Include="Factories\AnimationFactory.h" />
+    <ClInclude Include="Factories\MtxFactory.h" />
+    <ClInclude Include="Factories\PathFactory.h" />
+    <ClInclude Include="Factories\TextFactory.h" />
+    <ClInclude Include="Factories\TextureFactory.h" />
+    <ClInclude Include="Factories\VtxFactory.h" />
+    <ClInclude Include="Animation.h" />
+    <ClInclude Include="Array.h" />
+    <ClInclude Include="Cutscene.h" />
+    <ClInclude Include="Hooks.h" />
+    <ClInclude Include="ImGuiImpl.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_cc.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_direct3d11.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_direct3d12.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_direct3d12_guids.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_direct3d_common.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_dxgi.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_glx.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_rendering_api.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_screen_config.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_window_manager_api.h" />
+    <ClInclude Include="Lib\ImGui\backends\imgui_impl_opengl3.h" />
+    <ClInclude Include="Lib\ImGui\backends\imgui_impl_sdl.h" />
+    <ClInclude Include="Lib\ImGui\imconfig.h" />
+    <ClInclude Include="Lib\ImGui\imgui.h" />
+    <ClInclude Include="Lib\ImGui\imgui_internal.h" />
+    <ClInclude Include="Lib\ImGui\imstb_rectpack.h" />
+    <ClInclude Include="Lib\ImGui\imstb_textedit.h" />
+    <ClInclude Include="Lib\ImGui\imstb_truetype.h" />
+    <ClInclude Include="Lib\stb\stb_image.h" />
+    <ClInclude Include="Matrix.h" />
+    <ClInclude Include="Path.h" />
+    <ClInclude Include="Text.h" />
+    <ClInclude Include="TextureMod.h" />
+    <ClInclude Include="Utils.h" />
+    <ClInclude Include="Vertex.h" />
+    <ClInclude Include="stox.h" />
+    <ClInclude Include="Lib\mINI\src\mini\ini.h" />
+    <ClInclude Include="ConfigFile.h" />
+    <ClInclude Include="Controller.h" />
+    <ClInclude Include="KeyboardController.h" />
+    <ClInclude Include="Factories\CollisionHeaderFactory.h" />
+    <ClInclude Include="Factories\DisplayListFactory.h" />
+    <ClInclude Include="Factories\MaterialFactory.h" />
+    <ClInclude Include="Factories\PlayerAnimationFactory.h" />
+    <ClInclude Include="Factories\ResourceLoader.h" />
+    <ClInclude Include="Factories\SceneFactory.h" />
+    <ClInclude Include="Factories\SkeletonFactory.h" />
+    <ClInclude Include="Factories\SkeletonLimbFactory.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_opengl.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_pc.h" />
+    <ClInclude Include="Lib\Fast3D\gfx_sdl.h" />
+    <ClInclude Include="Lib\StrHash64.h" />
+    <ClInclude Include="Lib\tinyxml2\tinyxml2.h" />
+    <ClInclude Include="Archive.h" />
+    <ClInclude Include="CollisionHeader.h" />
+    <ClInclude Include="ControllerAttachment.h" />
+    <ClInclude Include="DisplayList.h" />
+    <ClInclude Include="GlobalCtx2.h" />
+    <ClInclude Include="File.h" />
+    <ClInclude Include="LUSMacros.h" />
+    <ClInclude Include="Material.h" />
+    <ClInclude Include="MemoryPack.h" />
+    <ClInclude Include="Model.h" />
+    <ClInclude Include="PlayerAnimation.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="ResourceMgr.h" />
+    <ClInclude Include="RumblePack.h" />
+    <ClInclude Include="Scene.h" />
+    <ClInclude Include="Skeleton.h" />
+    <ClInclude Include="SkeletonLimb.h" />
+    <ClInclude Include="Texture.h" />
+    <ClInclude Include="WasapiAudioPlayer.h" />
+    <ClInclude Include="Window.h" />
+    <ClInclude Include="UltraController.h" />
+    <ClInclude Include="SDLController.h" />
+    <ClInclude Include="WindowShim.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\OTRGui\build\ZERO_CHECK.vcxproj">
+      <Project>{02d10590-9542-3f55-aaf8-6055677e2a2a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/libultraship/libultraship/libultraship.vcxproj.filters b/libultraship/libultraship/libultraship.vcxproj.filters
index 8cc7aed54..d1682c86f 100644
--- a/libultraship/libultraship/libultraship.vcxproj.filters
+++ b/libultraship/libultraship/libultraship.vcxproj.filters
@@ -300,10 +300,10 @@
     <ClCompile Include="Lib\ImGui\backends\imgui_impl_sdl.cpp">
       <Filter>Source Files\Lib\ImGui</Filter>
     </ClCompile>
-    <ClCompile Include="SohImGuiImpl.cpp">
+    <ClCompile Include="ImGuiImpl.cpp">
       <Filter>Source Files\CustomImpl</Filter>
     </ClCompile>
-    <ClCompile Include="SohConsole.cpp">
+    <ClCompile Include="Console.cpp">
       <Filter>Source Files\CustomImpl</Filter>
     </ClCompile>
     <ClCompile Include="Lib\ImGui\backends\imgui_impl_dx11.cpp">
@@ -336,7 +336,7 @@
     <ClCompile Include="ModManager.cpp">
       <Filter>Source Files\ModManager</Filter>
     </ClCompile>
-    <ClCompile Include="SohHooks.cpp">
+    <ClCompile Include="Hooks.cpp">
       <Filter>Source Files\CustomImpl\Hooks</Filter>
     </ClCompile>
     <ClCompile Include="luslog.cpp">
@@ -584,10 +584,10 @@
     <ClInclude Include="Lib\ImGui\backends\imgui_impl_sdl.h">
       <Filter>Source Files\Lib\ImGui</Filter>
     </ClInclude>
-    <ClInclude Include="SohImGuiImpl.h">
+    <ClInclude Include="ImGuiImpl.h">
       <Filter>Source Files\CustomImpl</Filter>
     </ClInclude>
-    <ClInclude Include="SohConsole.h">
+    <ClInclude Include="Console.h">
       <Filter>Source Files\CustomImpl</Filter>
     </ClInclude>
     <ClInclude Include="Lib\ImGui\backends\imgui_impl_dx11.h">
@@ -632,7 +632,7 @@
     <ClInclude Include="ModModule.h">
       <Filter>Source Files\ModManager\ModModule</Filter>
     </ClInclude>
-    <ClInclude Include="SohHooks.h">
+    <ClInclude Include="Hooks.h">
       <Filter>Source Files\CustomImpl\Hooks</Filter>
     </ClInclude>
     <ClInclude Include="luslog.h">
diff --git a/soh/src/code/audioMgr.c b/soh/src/code/audioMgr.c
index ab34a4617..dc826aa5c 100644
--- a/soh/src/code/audioMgr.c
+++ b/soh/src/code/audioMgr.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "SohHooks.h"
+#include "Hooks.h"
 #include <string.h>
 
 void func_800C3C80(AudioMgr* audioMgr) {
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index be4d038ae..b41c6f97d 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -12,7 +12,7 @@
 #include "textures/map_name_static/map_name_static.h"
 #include "textures/map_48x85_static/map_48x85_static.h"
 #include "vt.h"
-#include "SohHooks.h"
+#include "Hooks.h"
 
 #include "soh/frame_interpolation.h"