Extract some data

And split up subtasks and world events.

3 files changed, 23 insertions, 16 deletions

diff --git a/src/manager/enterRoomTextboxManager.c b/src/manager/enterRoomTextboxManager.c
index 0dcf7c9b..59f31e2f 100644
--- a/src/manager/enterRoomTextboxManager.c
+++ b/src/manager/enterRoomTextboxManager.c
@@ -7,6 +7,7 @@
 #include "manager/enterRoomTextboxManager.h"
 #include "area.h"
 #include "common.h"
+#include "fileselect.h"
 #include "functions.h"
 #include "game.h"
 #include "message.h"
@@ -14,18 +15,24 @@
 
 extern u8 gUnk_02034DF0[0x2F2];
 
-extern const u16 gUnk_08108DE8[];
-extern void (*const EnterRoomTextboxManager_Actions[])(EnterRoomTextboxManager*);
-extern const u8 gUnk_08108E30[0x18];
-extern const u8 gUnk_08108E48[0x18];
-extern const u8 gUnk_08108E60[];
+const u16 gUnk_08108DE8[] = { 0,     0x70b, 0x70c, 0x70d, 0x70e, 0x70f, 0x710, 0x711, 0x712, 0x713, 0x714,
+                              0x715, 0x716, 0x717, 0x718, 0x719, 0x71a, 0x71b, 0x71c, 0x71d, 0x71e, 0x71f,
+                              0x726, 0x720, 0x720, 0x721, 0x722, 0x723, 0x725, 0x727, 0x724, 0x728 };
+void sub_0805E140(EnterRoomTextboxManager*);
+void sub_0805E18C(EnterRoomTextboxManager*);
+void (*const EnterRoomTextboxManager_Actions[])(EnterRoomTextboxManager*) = {
+    sub_0805E140,
+    sub_0805E18C,
+};
 
-extern void sub_0805F46C(void*, const void*);
+extern const Font gUnk_08108E30;
+extern const Font gUnk_08108E48;
+extern const u8 gUnk_08108E60[];
 
 void sub_0805E140(EnterRoomTextboxManager*);
 void sub_0805E18C(EnterRoomTextboxManager*); // unused?
 void sub_0805E1D8(EnterRoomTextboxManager*);
-void sub_0805E1F8(u32, u32);
+void sub_0805E1F8(u32, bool32);
 
 void EnterRoomTextboxManager_Main(EnterRoomTextboxManager* this) {
     EnterRoomTextboxManager_Actions[super->action](this);
@@ -65,21 +72,21 @@ void sub_0805E1D8(EnterRoomTextboxManager* this) {
     DeleteThisEntity();
 }
 
-void sub_0805E1F8(u32 unk0, u32 unk1) {
+void sub_0805E1F8(u32 unk0, bool32 isDungeon) {
     struct {
         u8 unk_00[4];
         u8 unk_04;
         u8 unk_05;
         u8 unk_06[3];
     } PACKED tmp;
-    const u8* tmp2;
+    const Font* font;
     MemClear(&gUnk_02034DF0, 0x80);
     MemCopy(gUnk_08108E60, &tmp, sizeof(tmp));
     tmp.unk_04 = unk0 >> 8;
     tmp.unk_05 = unk0;
-    tmp2 = gUnk_08108E48;
-    if (!unk1)
-        tmp2 = gUnk_08108E30;
-    sub_0805F46C(&tmp, tmp2);
+    font = &gUnk_08108E48;
+    if (!isDungeon)
+        font = &gUnk_08108E30;
+    ShowTextBox((u32)&tmp, font);
     gScreen.bg0.updated = 1;
 }
diff --git a/src/manager/staticBackgroundManager.c b/src/manager/staticBackgroundManager.c
index f069196c..a8bd1810 100644
--- a/src/manager/staticBackgroundManager.c
+++ b/src/manager/staticBackgroundManager.c
@@ -63,14 +63,14 @@ void sub_0805B474(StaticBackgroundManager* this) {
 }
 
 void sub_0805B4B4(StaticBackgroundManager* this) {
-    sub_0805B4D0(super->type);
+    LoadStaticBackground(super->type);
     if (super->type == 2) {
         sub_0806D0F8();
     }
     StaticBackgroundManager_Main(this);
 }
 
-void sub_0805B4D0(u32 param_1) {
+void LoadStaticBackground(u32 param_1) {
     static const u8 gUnk_08108C5C[] = { 0x14, 0x15, 0x14, 0x2f, 0x4b, 0x4e, 0x4d, 0 };
     s32 iVar1;
     u32 uVar2;
diff --git a/src/manager/weatherChangeManager.c b/src/manager/weatherChangeManager.c
index b74edcc2..f1988de4 100644
--- a/src/manager/weatherChangeManager.c
+++ b/src/manager/weatherChangeManager.c
@@ -58,7 +58,7 @@ void sub_080595E4(WeatherChangeManager* this) {
     gRoomVars.unk_10[0] = 0xFF;
     sub_08059690(this);
     sub_080596E0(this);
-    sub_0805B4D0(0);
+    LoadStaticBackground(0);
 }
 
 void sub_08059608(WeatherChangeManager* this) {