Extract ui.h

include/fileselect.h

@@ -53,7 +53,6 @@ extern struct_02019EE0 gMapDataBottomSpecial;
 
 extern void sub_08056FEC(u32, struct_020227E8*);
 extern u32 sub_0805F46C(u32, Font*);
-extern void RecoverUI(u32 bottomPt, u32 topPt);
 extern void ClearTilemaps(void);
 extern void sub_0805194C(u32);
 extern WStruct* sub_0805F2C8(void);

include/functions.h

@@ -24,7 +24,6 @@ extern void CreateMinishEntrance(u32 tile);
 extern u32 CreateRandomItemDrop(Entity*, u32);
 extern void DrawDirect(u32, u32);
 extern void DrawEntities(void);
-extern void DrawUIElements(void);
 extern bool32 EntityWithinDistance(Entity*, s32, s32, s32);
 extern void FlushSprites(void);
 extern LayerStruct* GetLayerByIndex(u32);
@@ -79,7 +78,6 @@ extern void sub_08016AD2(Entity*);
 extern u32 sub_0801766C(Entity*);
 extern void sub_0801AFE4(void);
 extern void UpdateUIElements(void);
-extern void sub_0801C25C(void);
 extern void sub_0801E104(void);
 extern void sub_08027870(Entity*);
 extern void sub_08030118(u32);

include/ui.h

@@ -0,0 +1,15 @@
+#ifndef UI_H
+#define UI_H
+
+#include "global.h"
+
+extern void DrawUIElements(void);
+extern void CreateUIElement(u32, u32);
+extern u32 sub_0801C2F0(u32, u32);
+extern void sub_0801C25C(void);
+extern void DrawUI(void);
+extern void InitUI(bool32);
+extern void RefreshUI(void);
+extern void RecoverUI(u32 bottomPt, u32 topPt);
+
+#endif

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

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);

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;

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];

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);

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);
 

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);
 

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();
 }

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);