main.c statics

include/arm_proxy.h

@@ -0,0 +1,6 @@
+#ifndef ARM_PROXY_H
+#define ARM_PROXY_H
+
+extern void PrepNextFrame(void);
+
+#endif

include/main.h

@@ -77,17 +77,13 @@ static_assert(sizeof(UI) == 0x3b4);
 extern Main gMain;
 extern UI gUnk_02032EC0;
 
-void InitScreen();
+void InitScreen(u32 screen);
 
 extern void InitSound(void);
-extern void sub_080560B8(void);
 extern void sub_08056208(void);
 extern void sub_0804FFE4(void);
-extern void MessageInitialize(void);
 extern void sub_080ADD30(void);
 
-extern void InitScreen(u32);
-extern void PrepNextFrame(void);
 extern void ReadKeyInput(void);
 extern void DoSoftReset(void);
 extern void sub_08056260(void);

include/textbox.h

@@ -56,6 +56,7 @@ typedef struct {
 extern struct_02022780 gUnk_02022780;
 static_assert(sizeof(struct_02022780) == 0xa8);
 
+void MessageInitialize(void);
 void ShowTextbox(u32 index);
 void TextboxAtPosition(u32 index, u32 x, u32 y);
 void TextboxNoOverlap(u32 index, Entity* ent);

src/fileScreen.c

@@ -6,6 +6,7 @@
 #include "menu.h"
 #include "dma.h"
 #include "random.h"
+#include "textbox.h"
 
 // copy, erase, start
 #define NUM_FILE_OPERATIONS 3

src/intro.c

@@ -6,6 +6,7 @@
 #include "readKeyInput.h"
 #include "screen.h"
 #include "structures.h"
+#include "textbox.h"
 
 typedef struct {
     u8 filler0[0x4];

src/main.c

@@ -7,6 +7,8 @@
 #include "random.h"
 #include "readKeyInput.h"
 #include "save.h"
+#include "textbox.h"
+#include "arm_proxy.h"
 
 extern void HandleIntroScreen(void);
 extern void HandleChooseFileScreen(void);
@@ -21,6 +23,8 @@ static void (*const sScreenHandlers[])(void) = {
     [SCREEN_CREDITS] = HandleCreditsScreen,   [SCREEN_DEBUG_TEXT] = HandleDebugTextScreen,
 };
 
+static void sub_080560B8(void);
+
 void MainLoop(void) {
     int var0;
 
@@ -161,7 +165,7 @@ const Defaults sDefaultSettings = {
 };
 
 // single misplaced ldr
-NONMATCH("asm/non_matching/sub_080560B8.inc", void sub_080560B8(void)) {
+NONMATCH("asm/non_matching/sub_080560B8.inc", static void sub_080560B8(void)) {
     u32 temp;
     u32 b;