Extract ui.h

9 files changed, 10 insertions, 9 deletions

diff --git a/src/fileselect.c b/src/fileselect.c
index b0ce954b..2281d90f 100644
--- a/src/fileselect.c
+++ b/src/fileselect.c
@@ -16,6 +16,7 @@
 #include "subtask.h"
 #include "item.h"
 #include "game.h"
+#include "ui.h"
 
 // copy, erase, start
 #define NUM_FILE_OPERATIONS 3
diff --git a/src/game.c b/src/game.c
index 781f1acf..d34760cb 100644
--- a/src/game.c
+++ b/src/game.c
@@ -32,6 +32,7 @@
 #include "player.h"
 #include "transitions.h"
 #include "roomid.h"
+#include "ui.h"
 
 // Game task
 
@@ -100,7 +101,6 @@ extern void sub_080185F8(void);
 extern void UpdateDoorTransition(void);
 extern bool32 CheckInitPortal(void);
 extern void UpdateCarriedObject(void);
-extern void DrawUI(void);
 extern void CollisionMain(void);
 extern void sub_0805BB74(s32);
 extern void CreateZeldaFollower(void);
@@ -112,7 +112,6 @@ extern void UpdateScroll(void);
 extern void UpdateBgAnimations(void);
 extern void CleanUpGFXSlots(void);
 extern void sub_080ADE24(void);
-extern void InitUI(bool32);
 extern void sub_0801AE44(u32);
 extern void GenerateAreaHint(void);
 extern void ForceSetPlayerState(u32);
diff --git a/src/interrupts.c b/src/interrupts.c
index 0477426a..e9d6e7e9 100644
--- a/src/interrupts.c
+++ b/src/interrupts.c
@@ -9,6 +9,7 @@
 #include "screen.h"
 #include "gba/m4a.h"
 #include "object.h"
+#include "ui.h"
 
 extern u8 gUnk_03003DE0;
 extern u8 gUnk_03000C30;
diff --git a/src/menu/figurine_menu.c b/src/menu/figurine_menu.c
index 1c9f6557..cd155de2 100644
--- a/src/menu/figurine_menu.c
+++ b/src/menu/figurine_menu.c
@@ -11,6 +11,7 @@
 #include "game.h"
 #include "functions.h"
 #include "message.h"
+#include "ui.h"
 
 extern const struct {
     u8 filler[7];
diff --git a/src/menu/kinstone_menu.c b/src/menu/kinstone_menu.c
index c0e9f7b6..67976f59 100644
--- a/src/menu/kinstone_menu.c
+++ b/src/menu/kinstone_menu.c
@@ -14,12 +14,12 @@
 #include "npc.h"
 #include "enemy.h"
 #include "functions.h"
+#include "ui.h"
 
 extern u32 sub_08000E44(u32);
 extern void sub_080A3B74(void);
 extern s32 sub_080A3B48(void);
 extern void sub_0805ECEC(u32, u32, u32, u32);
-extern void sub_0801C2F0(u32, u32);
 extern void sub_0801E6C8(u32);
 extern void sub_0801E798(u32);
 extern WStruct* sub_0805F2C8(void);
diff --git a/src/menu/pause_menu.c b/src/menu/pause_menu.c
index 4952837d..0eef154b 100644
--- a/src/menu/pause_menu.c
+++ b/src/menu/pause_menu.c
@@ -11,6 +11,7 @@
 #include "itemMetaData.h"
 #include "structures.h"
 #include "functions.h"
+#include "ui.h"
 
 extern void sub_080A4DB8(u32);
 
diff --git a/src/message.c b/src/message.c
index e4db0a1e..2b0e5bc0 100644
--- a/src/message.c
+++ b/src/message.c
@@ -6,6 +6,7 @@
 #include "functions.h"
 #include "message.h"
 #include "save.h"
+#include "ui.h"
 
 #define MESSAGE_ADVANCE_KEYS (A_BUTTON | B_BUTTON | DPAD_ANY | R_BUTTON)
 #define MESSAGE_PRESS_ANY_ADVANCE_KEYS ((gInput.newKeys & MESSAGE_ADVANCE_KEYS) != 0)
@@ -32,8 +33,6 @@ enum {
 
 extern void WriteBit(u32*, u32);
 extern bool32 sub_0805EF40(Token* tok, const u8*);
-extern void RecoverUI(u32 bottomPt, u32 topPt);
-extern void RefreshUI(void);
 extern void sub_0805F918(u32, u32, void*);
 extern u32 DecToHex(u32, u8*, u32);
 
diff --git a/src/script.c b/src/script.c
index 92fad99a..f5bfe726 100644
--- a/src/script.c
+++ b/src/script.c
@@ -8,6 +8,7 @@
 #include "kinstone.h"
 #include "functions.h"
 #include "item.h"
+#include "ui.h"
 
 void InitScriptForEntity(Entity*, ScriptExecutionContext*, u16*);
 void InitScriptExecutionContext(ScriptExecutionContext* context, u16* script);
@@ -152,8 +153,6 @@ void ScriptCommand_CameraTargetPlayer(Entity* entity, ScriptExecutionContext* co
 void ScriptCommand_0807F0B4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807F0C8(Entity* entity, ScriptExecutionContext* context);
 
-extern void RecoverUI(u32);
-
 typedef void (*ScriptCommand)(Entity*, ScriptExecutionContext*);
 
 extern u16* gUnk_08001A7C[];
@@ -455,7 +454,7 @@ void sub_0807DF38(void) {
 void sub_0807DF50(void) {
     gPauseMenuOptions.disabled = 0;
     gUnk_0200AF00.unk_1 = 0;
-    RecoverUI(0);
+    RecoverUI(0, 0);
     ResetPlayerAnimationAndAction();
     PlayerDropHeldObject();
 }
diff --git a/src/subtask2.c b/src/subtask2.c
index 995d1683..799fe6ed 100644
--- a/src/subtask2.c
+++ b/src/subtask2.c
@@ -10,6 +10,7 @@
 #include "functions.h"
 #include "main.h"
 #include "message.h"
+#include "ui.h"
 
 extern u8 gUnk_08128D38[];
 extern u8 gUnk_08128D43[];
@@ -69,7 +70,6 @@ extern void (*const gUnk_0812901C[])(void);
 
 void sub_080A74F4(void);
 
-extern void DrawUI(void);
 extern void UpdateCarriedObject(void);
 
 extern void (*const gSubtasks[])(void);