From 8e0627d30cab9b84e8c52a26061983d8e189427a Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Wed, 8 Nov 2023 15:06:47 -0800
Subject: [PATCH] Cleanup from Isaac

---
 data/dynos.c.h            |  1 -
 data/dynos.cpp.h          |  3 ---
 data/dynos_gfx_update.cpp | 10 ----------
 data/dynos_main.cpp       |  3 ++-
 src/pc/loading.c          |  3 ---
 5 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 data/dynos_gfx_update.cpp

diff --git a/data/dynos.c.h b/data/dynos.c.h
index a5df5a3f..5f97e136 100644
--- a/data/dynos.c.h
+++ b/data/dynos.c.h
@@ -38,7 +38,6 @@ void dynos_generate_packs(const char* directory);
 void dynos_actor_override(void** aSharedChild);
 void dynos_add_actor_custom(const char *filePath, const char* geoName);
 const void* dynos_geolayout_get(const char *name);
-void *dynos_geolayout_to_graphnode(const void *geoLayout, bool keepInMemory);
 
 // -- collisions -- //
 void dynos_add_collision(const char *filePath, const char* collisionName);
diff --git a/data/dynos.cpp.h b/data/dynos.cpp.h
index aff4a2c6..876372f3 100644
--- a/data/dynos.cpp.h
+++ b/data/dynos.cpp.h
@@ -779,7 +779,6 @@ static type &__##name() {           \
 // Main
 //
 
-void DynOS_UpdateOpt(void *aPad);
 void *DynOS_SwapCmd(void *aCmd);
 void *DynOS_UpdateCmd(void *aCmd);
 void DynOS_UpdateGfx();
@@ -793,7 +792,6 @@ void DynOS_ReturnToMainMenu();
 //
 
 void DynOS_Gfx_Init();
-void DynOS_Gfx_Update();
 void DynOS_Gfx_Free(GfxData *aGfxData);
 
 //
@@ -999,7 +997,6 @@ void DynOS_Col_Generate(const SysPath &aPackFolder, Array<Pair<u64, String>> _Ac
 
 DataNode<GeoLayout>* DynOS_Geo_Parse(GfxData* aGfxData, DataNode<GeoLayout>* aNode, bool aDisplayPercent);
 void DynOS_Geo_Write(BinFile *aFile, GfxData *aGfxData, DataNode<GeoLayout> *aNode);
-DataNode<GeoLayout>** DynOS_Geo_GetLoading(void);
 void DynOS_Geo_Load(BinFile *aFile, GfxData *aGfxData);
 
 DataNode<Gfx>* DynOS_Gfx_Parse(GfxData* aGfxData, DataNode<Gfx>* aNode);
diff --git a/data/dynos_gfx_update.cpp b/data/dynos_gfx_update.cpp
deleted file mode 100644
index a7f3a4b1..00000000
--- a/data/dynos_gfx_update.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "dynos.cpp.h"
-extern "C" {
-}
-
-bool gDynosModShutdown = false;
-
-void DynOS_Gfx_Update() {
-    DynOS_Mod_Update();
-    DynOS_Tex_Update();
-}
diff --git a/data/dynos_main.cpp b/data/dynos_main.cpp
index a2b107e6..023a9c10 100644
--- a/data/dynos_main.cpp
+++ b/data/dynos_main.cpp
@@ -40,7 +40,8 @@ void *DynOS_UpdateCmd(void *aCmd) {
 }
 
 void DynOS_UpdateGfx() {
-    DynOS_Gfx_Update();
+    DynOS_Mod_Update();
+    DynOS_Tex_Update();
 }
 
 bool DynOS_IsTransitionActive() {
diff --git a/src/pc/loading.c b/src/pc/loading.c
index 59918269..83af5820 100644
--- a/src/pc/loading.c
+++ b/src/pc/loading.c
@@ -4,8 +4,6 @@
 #include "djui/djui.h"
 #include "pc/djui/djui_unicode.h"
 
-#include "controller/controller_keyboard.h"
-
 #include "pc_main.h"
 #include "loading.h"
 #include "pc/utils/misc.h"
@@ -27,7 +25,6 @@ pthread_mutex_t gLoadingThreadMutex = PTHREAD_MUTEX_INITIALIZER;
 bool gIsThreaded = false;
 
 extern Vp D_8032CF00;
-extern u8 gRenderingInterpolated;
 
 static void loading_screen_produce_one_frame() {