diff --git a/OTRExporter b/OTRExporter
index 3cea9ee7c01..8f38b2db664 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit 3cea9ee7c017d842aa4d9ceeb8d3ffbf29c6effb
+Subproject commit 8f38b2db664e2dcb12fa07f34b432c678c22d3e0
diff --git a/ZAPDTR b/ZAPDTR
index f38a9c92eb9..b7f79f7867d 160000
--- a/ZAPDTR
+++ b/ZAPDTR
@@ -1 +1 @@
-Subproject commit f38a9c92eb99368c0607acf356d5651ebdc96f51
+Subproject commit b7f79f7867ddc44dfbe44d89d9e7f3ba54fcf655
diff --git a/libultraship b/libultraship
index 0da318c0f4e..dfee6c301e7 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 0da318c0f4e431313565cad546fc469b8e850388
+Subproject commit dfee6c301e733547c1099d08c472fbc5ebc97cca
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
index 3f086bcac64..6984291d339 100644
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@@ -407,6 +407,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 			">"
             "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:ENABLE_REMOTE_CONTROL>"
 			"INCLUDE_GAME_PRINTF;"
+            "F3DEX_GBI_2"
 			"UNICODE;"
 			"_UNICODE"
 			STORMLIB_NO_AUTO_LINK
@@ -425,6 +426,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 				"NDEBUG;"
 			">"
 			"INCLUDE_GAME_PRINTF;"
+            "F3DEX_GBI_2"
 			"WIN32;"
 			"UNICODE;"
 			"_UNICODE"
@@ -440,6 +442,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
 		"$<$<CONFIG:Release>:"
 			"NDEBUG"
 		">"
+        "F3DEX_GBI_2"
         "SPDLOG_ACTIVE_LEVEL=3;"
 		"SPDLOG_NO_THREAD_ID;"
         "SPDLOG_NO_TLS;"
@@ -453,6 +456,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
 		"$<$<CONFIG:Release>:"
 			"NDEBUG"
 		">"
+        "F3DEX_GBI_2"
         "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:ENABLE_REMOTE_CONTROL>"
 		"SPDLOG_ACTIVE_LEVEL=0;"
 		"_CONSOLE;"