diff --git a/CMakeLists.txt b/CMakeLists.txt
index 646250c52..9238ed593 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,9 @@ endif()
 # Enable the Gfx debugger in LUS to use libgfxd from ZAPDTR
 set(GFX_DEBUG_DISASSEMBLER ON)
 
+# Tell LUS we're using F3DEX_GBI_2 (in a way that doesn't break libgfxd)
+set(USE_F3DEX2 ON)
+
 ################################################################################
 # Set target arch type if empty. Visual studio solution generator provides it.
 ################################################################################
diff --git a/OTRExporter b/OTRExporter
index c2a891be8..287c79891 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit c2a891be8ba1d33e09ee39eb4bf1c95e3b753e0e
+Subproject commit 287c79891882df5a0797cd9d39c0dcb97af9f007
diff --git a/ZAPDTR b/ZAPDTR
index ce2d63d8d..b002f2875 160000
--- a/ZAPDTR
+++ b/ZAPDTR
@@ -1 +1 @@
-Subproject commit ce2d63d8dd594a8ebc35073868d071aa36258317
+Subproject commit b002f28757a7ff9f928a4d9dd1834137edb144bb
diff --git a/libultraship b/libultraship
index 0c4b49112..efeeaf34f 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 0c4b491125e86709400d7bae866159eecd079d38
+Subproject commit efeeaf34fee7bd7b21e9a9dbda84847e1601fd58
diff --git a/mm/CMakeLists.txt b/mm/CMakeLists.txt
index 86e067161..b03c9ff59 100644
--- a/mm/CMakeLists.txt
+++ b/mm/CMakeLists.txt
@@ -423,6 +423,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
            #"$<$<BOOL:${BUILD_CROWD_CONTROL}>:ENABLE_CROWD_CONTROL>"
 		"INCLUDE_GAME_PRINTF;"
            #"ENABLE_CROWD_CONTROL;"
+		"F3DEX_GBI_2"
 		"UNICODE;"
 		"_UNICODE"
 		STORMLIB_NO_AUTO_LINK
@@ -437,6 +438,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
 		"$<$<CONFIG:Release>:"
 			"NDEBUG"
 		">"
+		"F3DEX_GBI_2"
         "SPDLOG_ACTIVE_LEVEL=3;"
 		"SPDLOG_NO_THREAD_ID;"
         "SPDLOG_NO_TLS;"
@@ -450,6 +452,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
 		"$<$<CONFIG:Release>:"
 			"NDEBUG"
 		">"
+		"F3DEX_GBI_2"
 		# "$<$<BOOL:${BUILD_CROWD_CONTROL}>:ENABLE_CROWD_CONTROL>"
 		"SPDLOG_ACTIVE_LEVEL=0;"
 		"_CONSOLE;"
diff --git a/mm/include/gfx.h b/mm/include/gfx.h
index 85705ba2f..ab031b075 100644
--- a/mm/include/gfx.h
+++ b/mm/include/gfx.h
@@ -244,8 +244,8 @@ void func_8012D374(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b);
 void func_8012D40C(f32* param_1, f32* param_2, s16* param_3);
 void gSPSegment(void* value, int segNum, uintptr_t target);
 void gSPSegmentLoadRes(void* value, int segNum, uintptr_t target);
-void gDPSetTextureImage(Gfx* pkt, u32 format, u32 size, u32 width, uintptr_t i);
-void gDPSetTextureImageFB(Gfx* pkt, u32 format, u32 size, u32 width, int fb);
+// void gDPSetTextureImage(Gfx* pkt, u32 format, u32 size, u32 width, uintptr_t i);
+// void gDPSetTextureImageFB(Gfx* pkt, u32 format, u32 size, u32 width, int fb);
 void gSPDisplayList(Gfx* pkt, Gfx* dl);
 void gSPDisplayListOffset(Gfx* pkt, Gfx* dl, int offset);
 void gSPVertex(Gfx* pkt, uintptr_t v, int n, int v0);
diff --git a/mm/src/code/stubs.c b/mm/src/code/stubs.c
index a40bb8e83..35de8a506 100644
--- a/mm/src/code/stubs.c
+++ b/mm/src/code/stubs.c
@@ -184,13 +184,13 @@ void gSPSegmentLoadRes(void* value, int segNum, uintptr_t target) {
     __gSPSegment(value, segNum, target);
 }
 
-void gDPSetTextureImage(Gfx* pkt, u32 format, u32 size, u32 width, uintptr_t i) {
-    __gDPSetTextureImage(pkt, format, size, width, i);
-}
+// void gDPSetTextureImage(Gfx* pkt, u32 format, u32 size, u32 width, uintptr_t i) {
+//     __gDPSetTextureImage(pkt, format, size, width, i);
+// }
 
-void gDPSetTextureImageFB(Gfx* pkt, u32 format, u32 size, u32 width, int fb) {
-    __gDPSetTextureImageFB(pkt, format, size, width, fb);
-}
+// void gDPSetTextureImageFB(Gfx* pkt, u32 format, u32 size, u32 width, int fb) {
+//     __gDPSetTextureImageFB(pkt, format, size, width, fb);
+// }
 
 void gSPDisplayList(Gfx* pkt, Gfx* dl) {
     char* imgData = (char*)dl;