From 6aac6a6efd1d50c221580bfb0ab749136323f053 Mon Sep 17 00:00:00 2001
From: KiritoDv <kiritodev01@gmail.com>
Date: Wed, 30 Oct 2024 17:37:31 -0600
Subject: [PATCH 1/3] Bump dependencies

---
 libultraship | 2 +-
 tools/Torch  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libultraship b/libultraship
index e15b3ab1..00c6bcc8 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit e15b3ab12a696a5fe400185966752f0927200b5a
+Subproject commit 00c6bcc88286173ce22b8a6656373d3aa5830c62
diff --git a/tools/Torch b/tools/Torch
index 29857867..ff8c2d13 160000
--- a/tools/Torch
+++ b/tools/Torch
@@ -1 +1 @@
-Subproject commit 298578677e28ef1fe0d3a425f2856930c6cc4ef1
+Subproject commit ff8c2d13c71069f3117faf42ed25f0816229a872

From f4f28384dc4a0a07234efdd7969ab3d905836ab3 Mon Sep 17 00:00:00 2001
From: KiritoDv <kiritodev01@gmail.com>
Date: Wed, 30 Oct 2024 17:42:10 -0600
Subject: [PATCH 2/3] Cleaned up cmake

---
 CMakeLists.txt | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6d21b43..e9a51296 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,23 +18,15 @@ set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use")
 
 # Add a custom module path to locate additional CMake modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
-include(FindFontconfig)
 
 if (WIN32)
 include(cmake/automate-vcpkg.cmake)
-# Forced to use MSVC
-set(MSVC ON)
-
-if(MSVC)
 set(VCPKG_TRIPLET x64-windows-static)
 set(VCPKG_TARGET_TRIPLET x64-windows-static)
-else()
-set(VCPKG_TRIPLET x64-mingw-static)
-set(VCPKG_TARGET_TRIPLET x64-mingw-static)
-endif()
-
 vcpkg_bootstrap()
-vcpkg_install_packages(fontconfig sdl2 zlib bzip2 libzip libpng getopt dirent libusb pthread glew glfw3 nlohmann-json tinyxml2 spdlog)
+vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 glew glfw3 nlohmann-json tinyxml2 spdlog)
+else()
+include(FindFontconfig)
 endif()
 
 if (MSVC)

From da42f90cd301968a37d280a5f89caa197ca1b30d Mon Sep 17 00:00:00 2001
From: KiritoDv <kiritodev01@gmail.com>
Date: Sun, 17 Nov 2024 23:54:32 -0600
Subject: [PATCH 3/3] Fixed ub on gauge bar

---
 src/engine/fox_hud.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c
index 32c8633c..ff8d1fdb 100644
--- a/src/engine/fox_hud.c
+++ b/src/engine/fox_hud.c
@@ -267,7 +267,7 @@ void HUD_ShieldGaugeFrame_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
 }
 
 void HUD_ShieldGaugeBars_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale, f32 arg4) {
-    TextureRect_CI8_2(&gMasterDisp, aShieldGaugeTex, aShieldGaugeTLUT, 48, 12, xPos, yPos, xScale, yScale, 48.0f * arg4,
+    TextureRect_CI8_2(&gMasterDisp, aShieldGaugeTex, aShieldGaugeTLUT, 48, 8, xPos, yPos, xScale, yScale, 48.0f * arg4,
                       8.0f);
 }
 
@@ -312,6 +312,7 @@ void HUD_GoldRings_Draw(void) {
     f32 x;
     f32 y;
     s32 goldRingFrameIdx;
+    s16 newX = OTRGetRectDimensionFromLeftEdge(0);
 
     sGoldRingsFwork[6] += 0.7f;
     if (sGoldRingsFwork[6] >= 12.0f) {
@@ -366,8 +367,8 @@ void HUD_GoldRings_Draw(void) {
                     y += 7.00f;
                     scale += 0.06f;
                 }
-
-                Matrix_Translate(gGfxMatrix, x, y, -100.0f, MTXF_NEW);
+                
+                Matrix_Translate(gGfxMatrix, newX + x, y, -100.0f, MTXF_NEW);
                 Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY);
                 Matrix_SetGfxMtx(&gMasterDisp);
                 gDPSetPrimColor(gMasterDisp++, 0, 0, 180, 180, 0, 50);