diff --git a/config/RSBE01_02/splits.txt b/config/RSBE01_02/splits.txt
index 8b0ea60..a05434a 100644
--- a/config/RSBE01_02/splits.txt
+++ b/config/RSBE01_02/splits.txt
@@ -24,6 +24,9 @@ sora/sr/sr_common.cpp:
 sora/sr/sr_revision.cpp:
 	.text       start:0x8000C8E0 end:0x8000C8E8
 
+sora/main.cpp:
+	.text       start:0x8000C8E8 end:0x8000C960
+
 sora/gf/gf_3d_scene_event.cpp:
 	.text       start:0x80010C9C end:0x80010D38
 
diff --git a/config/RSBE01_02/symbols.txt b/config/RSBE01_02/symbols.txt
index 4ad8ed9..f967578 100644
--- a/config/RSBE01_02/symbols.txt
+++ b/config/RSBE01_02/symbols.txt
@@ -2258,21 +2258,21 @@ fn_80016688 = .text:0x80016688; // type:function size:0x68
 fn_800166F0 = .text:0x800166F0; // type:function size:0x90
 fn_80016780 = .text:0x80016780; // type:function size:0x30
 fn_800167B0 = .text:0x800167B0; // type:function size:0x14
-fn_800167C4 = .text:0x800167C4; // type:function size:0xE4
-fn_800168A8 = .text:0x800168A8; // type:function size:0x58
+__ct__13gfApplicationFv = .text:0x800167C4; // type:function size:0xE4
+__dt__13gfApplicationFv = .text:0x800168A8; // type:function size:0x58
 fn_80016900 = .text:0x80016900; // type:function size:0x28
 fn_80016928 = .text:0x80016928; // type:function size:0x10
 fn_80016938 = .text:0x80016938; // type:function size:0x190
-fn_80016AC8 = .text:0x80016AC8; // type:function size:0x3A8
+init__13gfApplicationFv = .text:0x80016AC8; // type:function size:0x3A8
 fn_80016E70 = .text:0x80016E70; // type:function size:0x34
 fn_80016EA4 = .text:0x80016EA4; // type:function size:0x3C
-fn_80016EE0 = .text:0x80016EE0; // type:function size:0xAC
+mainLoop__13gfApplicationFv = .text:0x80016EE0; // type:function size:0xAC
 fn_80016F8C = .text:0x80016F8C; // type:function size:0x580
 fn_8001750C = .text:0x8001750C; // type:function size:0x10C
 fn_80017618 = .text:0x80017618; // type:function size:0x1BC
 fn_800177D4 = .text:0x800177D4; // type:function size:0xC8
 fn_8001789C = .text:0x8001789C; // type:function size:0x134
-fn_800179D0 = .text:0x800179D0; // type:function size:0x4
+exit__13gfApplicationFv = .text:0x800179D0; // type:function size:0x4
 fn_800179D4 = .text:0x800179D4; // type:function size:0x64
 fn_80017A38 = .text:0x80017A38; // type:function size:0x8
 fn_80017A40 = .text:0x80017A40; // type:function size:0x44
@@ -2864,7 +2864,7 @@ fn_8003D154 = .text:0x8003D154; // type:function size:0x78
 fn_8003D1CC = .text:0x8003D1CC; // type:function size:0x238
 fn_8003D404 = .text:0x8003D404; // type:function size:0xE4
 fn_8003D4E8 = .text:0x8003D4E8; // type:function size:0x16C
-fn_8003D654 = .text:0x8003D654; // type:function size:0x140
+init__11vcBootParamFiPPCc = .text:0x8003D654; // type:function size:0x140
 fn_8003D794 = .text:0x8003D794; // type:function size:0xD0
 fn_8003D864 = .text:0x8003D864; // type:function size:0xCC
 fn_8003D930 = .text:0x8003D930; // type:function size:0xCC
diff --git a/configure.py b/configure.py
index 85a7b6b..cb310ae 100755
--- a/configure.py
+++ b/configure.py
@@ -289,6 +289,7 @@ def MatchingFor(*versions):
             Object(Matching, "sora/sr/sr_getappname.cpp"),
             Object(Matching, "sora/sr/sr_common.cpp"),
             Object(Matching, "sora/sr/sr_revision.cpp"),
+            Object(Matching, "sora/main.cpp"),
             Object(Matching, "sora/gf/gf_3d_scene_event.cpp"),
             Object(Matching, "sora/gf/gf_3d_scene_light_resource.cpp"),
             Object(Matching, "sora/gf/gf_archive_load_thread.cpp"),
diff --git a/include/lib/BrawlHeaders b/include/lib/BrawlHeaders
index 92d66f9..361beeb 160000
--- a/include/lib/BrawlHeaders
+++ b/include/lib/BrawlHeaders
@@ -1 +1 @@
-Subproject commit 92d66f9c388931d30627771575db14640378f346
+Subproject commit 361beeb32e92d7dc79c13c63d79aa5dab6a9ea68
diff --git a/src/sora/main.cpp b/src/sora/main.cpp
new file mode 100644
index 0000000..77fa075
--- /dev/null
+++ b/src/sora/main.cpp
@@ -0,0 +1,11 @@
+#include <gf/gf_application.h>
+
+void main(int argc, const char* argv[]) {
+    gfApplication app;
+    app.init();
+    if (argc == 2) {
+        app.m_bootParam.init(argc, argv);
+    }
+    app.mainLoop();
+    app.exit();
+}