Remove debug elements and visual SoA (#3086)

2 files changed, 8 insertions, 1 deletions

diff --git a/soh/src/code/z_debug.c b/soh/src/code/z_debug.c
index 294f530cc..8eb9de5a8 100644
--- a/soh/src/code/z_debug.c
+++ b/soh/src/code/z_debug.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 typedef struct {
     u8 x;
@@ -219,8 +220,9 @@ void func_80063D7C(GraphicsContext* gfxCtx) {
     GfxPrint printer;
     Gfx* tempRet;
 
-    if (!CVarGetInteger("gDebugEnabled", 0))
+    if (!CVarGetInteger("gDebugEnabled", 0) || GameInteractor_NoUIActive()) {
         return;
+    }
 
     OPEN_DISPS(gfxCtx);
 
diff --git a/soh/src/code/z_debug_display.c b/soh/src/code/z_debug_display.c
index e6f3764c8..555151b7c 100644
--- a/soh/src/code/z_debug_display.c
+++ b/soh/src/code/z_debug_display.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 typedef struct {
     /* 0x00 */ s16 drawType;  // indicates which draw function to use when displaying the object
@@ -34,6 +35,10 @@ DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX,
                                         GraphicsContext* gfxCtx) {
     DebugDispObject* prevHead = sDebugObjectListHead;
 
+    if (GameInteractor_NoUIActive()) {
+        return sDebugObjectListHead;
+    }
+
     sDebugObjectListHead = Graph_Alloc(gfxCtx, sizeof(DebugDispObject));
 
     sDebugObjectListHead->pos.x = posX;