use macros to set DISPCNT and BG*CNT registers (#286)

* use macros to set DISPCNT and BG*CNT registers

* add a few more

17 files changed, 60 insertions, 59 deletions

diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 103f0a85e..511b88c5a 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -178,9 +178,9 @@ void BerryTagScreen_814625C(u8 taskId)
 
 static void sub_8146288(void)
 {
-    REG_BG1CNT = 0x502;
-    REG_BG2CNT = 0x600;
-    REG_BG3CNT = 0x703;
+    REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5) | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG2CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6) | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
     gUnknown_030041B4 = 0;
 }
 
diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c
index 6b0cc821a..21cd643ef 100644
--- a/src/clear_save_data_menu.c
+++ b/src/clear_save_data_menu.c
@@ -41,7 +41,7 @@ static void Task_InitMenu(u8 taskId)
 {
     ResetSpriteData();
 
-    REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
+    REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
 
     SetVBlankCallback(VBlankCB_ClearSaveDataScreen);
     MenuDrawTextWindow(2, 14, 27, 19);
@@ -148,8 +148,8 @@ static u8 InitClearSaveDataScreen(void)
 
             SetVBlankCallback(VBlankCB_InitClearSaveDataScreen);
 
-            REG_BG3CNT = 0x0703;
-            REG_DISPCNT = 0x0900;
+            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON | DISPCNT_BG3_ON;
             gMain.state = 1;
             return 0;
         case 1:
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 08244597e..2ef50ee17 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -336,8 +336,8 @@ static void ContestPaintingInitBG(void)
 {
     REG_DISPCNT = 0;
     REG_IE |= INTR_FLAG_VBLANK;
-    REG_BG0CNT = 0x0C42;
-    REG_BG1CNT = 0x0A45;
+    REG_BG0CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(12) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(10) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
     REG_BLDY = 0;
@@ -367,7 +367,7 @@ static void ContestPaintingMosaic(void)
         return;
     }
 
-    REG_BG1CNT = 0xA45;
+    REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(10) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256;
     gUnknown_03000752 = gUnknown_03000754 / 2;
 
     REG_MOSAIC = (gUnknown_03000752 << 12) | (gUnknown_03000752 << 8) | (gUnknown_03000752 << 4) | (gUnknown_03000752 << 0);
diff --git a/src/credits.c b/src/credits.c
index 17d3507aa..01af78bce 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -474,8 +474,8 @@ void task_a_8143D04(u8 taskIdA)
         BeginNormalPaletteFade(-1, 0, 16, 0, 0);
         REG_BG3HOFS = 0;
         REG_BG3VOFS = 32;
-        REG_BG3CNT = 0x703;
-        REG_DISPCNT = 0x1940;
+        REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
 
         gMain.state = 0;
         gUnknown_0203935C = 0;
@@ -518,13 +518,13 @@ static void task_a_8143F3C(u8 taskIdA)
     FreeAllSpritePalettes();
     BeginNormalPaletteFade(-1, 8, 16, 0, 0);
 
-    REG_BG0CNT = 0x700;
+    REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
     backup = REG_IME;
     REG_IME = 0;
     REG_IE |= INTR_FLAG_VBLANK;
     REG_IME = backup;
     REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
-    REG_DISPCNT = 0x140;
+    REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON;
 
     gTasks[taskIdA].data[TDA_0] = 0x100;
     gTasks[taskIdA].func = task_a_8143FDC;
diff --git a/src/diploma.c b/src/diploma.c
index 112647956..c32b72a70 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -87,7 +87,7 @@ void sub_8145D88(void)
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
     REG_BLDY = 0;
-    REG_BG3CNT = 0x4603;
+    REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6) | BGCNT_16COLOR | BGCNT_TXT512x256;
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
 
     CreateTask(Task_DiplomaFadeIn, 0);
diff --git a/src/field_region_map.c b/src/field_region_map.c
index db12eb6a5..ec630ad00 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -64,7 +64,7 @@ void CB2_FieldInitRegionMap(void)
     SetUpWindowConfig(&gWindowConfig_81E709C);
     InitMenuWindow(&gWindowConfig_81E709C);
     MenuZeroFillScreen();
-    REG_BG0CNT = 7936;
+    REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
     MenuDrawTextWindow(21, 0, 29, 3);
     sub_8072BD8(gOtherText_Hoenn, 0x16, 1, 0x38);
     MenuDrawTextWindow(16, 16, 29, 19);
@@ -94,7 +94,7 @@ void sub_813EFDC(void)
     switch (unk_2000000.unk888)
     {
     case 0:
-        REG_DISPCNT = 5441;
+        REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
         unk_2000000.unk888++;
         break;
     case 1:
diff --git a/src/link.c b/src/link.c
index 336616f1a..224c0ae1c 100644
--- a/src/link.c
+++ b/src/link.c
@@ -207,13 +207,13 @@ static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charB
     switch (bgNum)
     {
     case 1:
-        REG_BG1CNT = 1 | (screenBaseBlock << 8) | (charBaseBlock << 2);
+        REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(screenBaseBlock) | BGCNT_CHARBASE(charBaseBlock);
         break;
     case 2:
-        REG_BG2CNT = 1 | (screenBaseBlock << 8) | (charBaseBlock << 2);
+        REG_BG2CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(screenBaseBlock) | BGCNT_CHARBASE(charBaseBlock);
         break;
     case 3:
-        REG_BG3CNT = 1 | (screenBaseBlock << 8) | (charBaseBlock << 2);
+        REG_BG3CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(screenBaseBlock) | BGCNT_CHARBASE(charBaseBlock);
         break;
     }
 }
@@ -255,7 +255,7 @@ void LinkTestScreen(void)
     }
 
     InitLinkTestBG(0, 2, 4, 0);
-    REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP;
+    REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP;
     CreateTask(Task_DestroySelf, 0);
     RunTasks();
     AnimateSprites();
diff --git a/src/mail.c b/src/mail.c
index 9964f2a79..807864332 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -273,11 +273,11 @@ static u8 sub_80F8A28(void)
         RETURN_SKIP_STATE;
 
     case 18:
-        REG_BG0CNT = 0x9F08;
-        REG_BG1CNT = 0x0801;
-        REG_BG2CNT = 0x0902;
+        REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x512;
+        REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(8)  | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(9)  | BGCNT_16COLOR | BGCNT_TXT256x256;
         REG_BLDCNT = 0;
-        REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
         BeginNormalPaletteFade(-1, 0, 16, 0, 0);
         gPaletteFade.bufferTransferDisabled = 0;
         ewram0.varF0 = sub_80F8F58;
diff --git a/src/main_menu.c b/src/main_menu.c
index 294d33620..50fefc471 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -250,7 +250,8 @@ u32 InitMainMenu(u8 a1)
     SetVBlankCallback(VBlankCB_MainMenu);
     SetMainCallback2(CB2_MainMenu);
 
-    REG_DISPCNT = DISPCNT_OBJ_1D_MAP
+    REG_DISPCNT = DISPCNT_MODE_0
+                | DISPCNT_OBJ_1D_MAP
                 | DISPCNT_BG0_ON
                 | DISPCNT_OBJ_ON
                 | DISPCNT_WIN0_ON;
@@ -747,8 +748,8 @@ static void Task_NewGameSpeech1(u8 taskId)
     FreeAllSpritePalettes();
     AddBirchSpeechObjects(taskId);
     BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-    REG_BG1CNT = 0x00000703;
-    REG_DISPCNT = DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP;
+    REG_BG1CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP;
     gTasks[taskId].data[TD_BGHOFS] = 0;
     gTasks[taskId].func = Task_NewGameSpeech2;
     gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = 0xFF;
@@ -1391,7 +1392,7 @@ void CB_ContinueNewGameSpeechPart2()
 
     SetVBlankCallback(VBlankCB_MainMenu);
     SetMainCallback2(CB2_MainMenu);
-    REG_BG1CNT = 1795;
+    REG_BG1CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP |
       DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
 }
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c
index 39c338658..57769db23 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/matsuda_debug_menu.c
@@ -290,7 +290,7 @@ static void sub_80A9F10(u8 taskId)
 
 static void sub_80A9F50(void)
 {
-    REG_DISPCNT = DISPCNT_OBJ_1D_MAP;
+    REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP;
     REG_DISPCNT |= DISPCNT_OBJ_ON | DISPCNT_BG0_ON;
     SetUpWindowConfig(&gWindowConfig_81E6C3C);
     InitWindowFromConfig(&gMenuWindow, &gWindowConfig_81E6C3C);
@@ -1073,7 +1073,7 @@ void unref_sub_80AB084(u8 *text)
     REG_WIN0V = 0;
     REG_WIN1H = 0;
     REG_WIN1V = 0;
-    REG_DISPCNT = 0x1F40;
+    REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
 
     savedIme = REG_IME;
     REG_IME = 0;
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 693b28948..97deb348c 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -54,7 +54,7 @@ void CB2_InitMysteryEventMenu(void)
     SetUpWindowConfig(&gWindowConfig_81E6CE4);
     InitMenuWindow(&gWindowConfig_81E6CE4);
     MenuZeroFillScreen();
-    REG_DISPCNT = 320;
+    REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON;
     REG_BLDCNT = 0;
     CreateTask(Task_DestroySelf, 0);
     StopMapMusic();
diff --git a/src/naming_screen.c b/src/naming_screen.c
index f00a9bd3e..b14c690e2 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -298,10 +298,10 @@ static void NamingScreen_SetUpVideoRegs(void)
     REG_BG2VOFS = 0;
     REG_BG3HOFS = 0;
     REG_BG3VOFS = 0;
-    REG_BG0CNT = 0x1F00;
-    REG_BG1CNT = 0x1C01;
-    REG_BG2CNT = 0x1D0A;
-    REG_BG3CNT = 0x1E03;
+    REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(28) | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(29) | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_BLDCNT = 0x640;
     REG_BLDALPHA = 0x80C;
 }
diff --git a/src/pokedex.c b/src/pokedex.c
index d31d649e0..5ea1f9938 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -789,10 +789,10 @@ bool8 sub_808D344(u8 a)
             REG_BLDCNT = 0;
             REG_BLDALPHA = 0;
             REG_BLDY = 0;
-            REG_BG3CNT = 0xF03;
-            REG_BG1CNT = 0xD01;
-            REG_BG0CNT = 0xC00;
-            REG_DISPCNT = 0x9F40;
+            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(12) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON | DISPCNT_OBJWIN_ON;
             gMain.state++;
             break;
         case 6:
@@ -2296,8 +2296,8 @@ void Task_InitPageScreenMultistep(u8 taskId)
             REG_BLDCNT = 0;
             REG_BLDALPHA = 0;
             REG_BLDY = 0;
-            REG_BG3CNT = 0xF03;
-            REG_BG1CNT = 0xD00;
+            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_BG1CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
             REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
             gMain.state++;
             break;
@@ -2422,7 +2422,7 @@ void Task_InitAreaScreenMultistep(u8 taskId)
         sub_8090540(0xD);
         sub_8090644(1, 0xD);
         sub_808D640();
-        REG_BG1CNT = 0xD00;
+        REG_BG1CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
         gMain.state++;
         break;
     case 2:
@@ -2544,10 +2544,10 @@ void Task_InitCryScreenMultistep(u8 taskId)
             REG_BLDCNT = 0;
             REG_BLDALPHA = 0;
             REG_BLDY = 0;
-            REG_BG2CNT = 0xE02;
-            REG_BG0CNT = 0x1F07;
-            REG_BG1CNT = 0xD00;
-            REG_DISPCNT = 0x1F07 + 0x39;
+            REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(14) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_BG0CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_BG1CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
             gMain.state++;
             break;
         case 10:
@@ -2715,8 +2715,8 @@ void Task_InitSizeScreenMultistep(u8 taskId)
             REG_BLDCNT = 0;
             REG_BLDALPHA = 0;
             REG_BLDY = 0;
-            REG_BG2CNT = 0xE03;
-            REG_DISPCNT = 0x1E40;
+            REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(14) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
             gMain.state++;
             break;
         case 9:
@@ -3156,8 +3156,8 @@ void sub_8090750(u8 taskId)
             REG_BLDCNT = 0;
             REG_BLDALPHA = 0;
             REG_BLDY = 0;
-            REG_BG3CNT = 0xF07;
-            REG_DISPCNT = 0x1C40;
+            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
             gTasks[taskId].data[0]++;
             break;
         case 6:
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 102909779..d46abc74d 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -150,9 +150,9 @@ static void CB2_SaveFailedScreen(void)
             REG_IME = ime;
             REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
             SetVBlankCallback(VBlankCB);
-            REG_BG3CNT = 0x703;
-            REG_BG2CNT = 0x602;
-            REG_BG0CNT = 0x1f08;
+            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7)  | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6)  | BGCNT_16COLOR | BGCNT_TXT256x256;
+            REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
             REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG2_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_0;
             gMain.state++;
             break;
diff --git a/src/start_menu.c b/src/start_menu.c
index 4a3bcbbd3..37d361c0b 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -782,7 +782,7 @@ static bool32 sub_80719FC(u8 *step)
         case 2:
             SetUpWindowConfig(&gWindowConfig_81E6CE4);
             InitMenuWindow(&gWindowConfig_81E6CE4);
-            REG_DISPCNT = 0x100;
+            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON;
             break;
         case 3:
         {
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 63d153ebd..6ef410d21 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -325,9 +325,9 @@ void CB2_ChooseStarter(void)
     REG_BLDCNT = 0xFE;
     REG_BLDALPHA = 0;
     REG_BLDY = 0x7;
-    REG_BG3CNT = 0x703;
-    REG_BG2CNT = 0x602;
-    REG_BG0CNT = 0x1F08;
+    REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7)  | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6)  | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON;
 
     taskId = CreateTask(Task_StarterChoose1, 0);
diff --git a/src/wallclock.c b/src/wallclock.c
index 2f4d694a6..0f3665c65 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -256,8 +256,8 @@ static void WallClockInit(void)
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
     REG_BLDY = 0;
-    REG_BG3CNT = 0x701;
-    REG_BG0CNT = 0x1F08;
+    REG_BG3CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7)  | BGCNT_16COLOR | BGCNT_TXT256x256;
+    REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON |
       DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
 }