diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 19:08:23 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 19:08:23 -0400 |
| commit | c10de4945141a6cca8c1b7328f4102bfc2c8ae28 (patch) | |
| tree | 6ae5a6428c1ac5f33004e5bf57af3bb31e2338fd /src/matsuda_debug_menu.c | |
| parent | fc761599b412206f80d961a6052dce49b9998689 (diff) | |
| parent | c0c3d2c52ad839450041d1ca6a29691efc5c5d35 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'src/matsuda_debug_menu.c')
| -rw-r--r-- | src/matsuda_debug_menu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c index 39c338658..d2ca754bb 100644 --- a/src/matsuda_debug_menu.c +++ b/src/matsuda_debug_menu.c @@ -64,7 +64,6 @@ extern u8* gMatsudaDebugMenuTextList3[]; extern u8 gMatsudaDebugMenuContestTopLeft[][2]; extern bool8 gReceivedRemoteLinkPlayers; -extern u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2]; extern struct MenuAction gMatsudaDebugMenuActions[]; @@ -290,7 +289,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 +1072,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; |