summaryrefslogtreecommitdiff
path: root/src/main_menu.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2016-10-02 19:04:57 -0500
committerYamaArashi <YamaArashi@users.noreply.github.com>2016-10-02 17:04:57 -0700
commit2f22053052f7659692f304baa63225577ea8707b (patch)
tree65684278dc2b0f37cae102151ea8348d55a28725 /src/main_menu.c
parente7f37732a76d3c30f5f9a09e48bfa09b809aa0fb (diff)
Change some plain numbers to defined constants (#51)
Diffstat (limited to 'src/main_menu.c')
-rw-r--r--src/main_menu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main_menu.c b/src/main_menu.c
index d3481e3cd..2a62e8a09 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1250,7 +1250,7 @@ void sub_800AFC0(u8 taskId)
{
u8 spriteId = gTasks[taskId].data[2];
gSprites[spriteId].callback = nullsub_34;
- REG_DISPCNT = 4160;
+ REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON;
BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0x10, 0xFFFF);
gTasks[taskId].func = sub_800B034;
}
@@ -1347,7 +1347,8 @@ void new_game_prof_birch_speech_part2_start()
SetVBlankCallback(VBlankCB_MainMenu);
SetMainCallback2(CB2_MainMenu);
REG_BG1CNT = 1795;
- REG_DISPCNT = 4928;
+ REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP |
+ DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
}
void nullsub_34(struct Sprite *sprite)