1 files changed, 2 insertions, 19 deletions
diff --git a/arm9/source/main.c b/arm9/source/main.c
index 8be7837..095e089 100644
--- a/arm9/source/main.c
+++ b/arm9/source/main.c
@@ -37,23 +37,6 @@ void receive_input(void) {
 }
 
 
-Screen scr_main = {
-    .bgv = BG_TILE_RAM(BG_SLOT_VIS),
-    .fgv = BG_TILE_RAM(FG_SLOT_VIS),
-    .bg  = BG_TILE_RAM(BG_SLOT),
-    .fg  = BG_TILE_RAM(FG_SLOT),
-    .map = BG_MAP_RAM(MAP_SLOT),
-    .pal = BG_PALETTE,
-};
-Screen scr_sub = {
-    .bgv = BG_TILE_RAM_SUB(BG_SLOT_VIS),
-    .fgv = BG_TILE_RAM_SUB(FG_SLOT_VIS),
-    .bg  = BG_TILE_RAM_SUB(BG_SLOT),
-    .fg  = BG_TILE_RAM_SUB(FG_SLOT),
-    .map = BG_MAP_RAM_SUB(MAP_SLOT),
-    .pal = BG_PALETTE_SUB,
-};
-
 int main(void) {
     #define ALIVE(br)  (br && br->alive)
     #define AWAKE(br)  (br && br->alive &&  br->awake)
@@ -79,8 +62,8 @@ int main(void) {
     start_br(&br[1], keyboard_program, sizeof(keyboard_program));
     br_main = &br[0];
     br_sub = &br[1];
-    br_main->scr.nds = &scr_main;
-    br_sub->scr.nds = &scr_sub;
+    scr_make_main(&br_main->scr);
+    scr_make_sub(&br_sub->scr);
 
     while (1) {
         if (AWAKE(br_main)) run_br(br_main);