diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /src/link.c | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'src/link.c')
| -rw-r--r-- | src/link.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/link.c b/src/link.c index a5d848b83..13fcf8c05 100644 --- a/src/link.c +++ b/src/link.c @@ -27,7 +27,7 @@ struct LinkTestBGInfo u32 dummy_C; }; -extern void sub_8071C4C(const struct WindowConfig *); +extern void InitMenuWindow(const struct WindowConfig *); extern void sub_80516C4(u8, u16); extern u8 unk_2000000[]; @@ -237,7 +237,7 @@ static void LinkTestScreen(void) ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); SetUpWindowConfig(&gWindowConfig_81E6CE4); - sub_8071C4C(&gWindowConfig_81E6CE4); + InitMenuWindow(&gWindowConfig_81E6CE4); ResetBlockSend(); gLinkType = 0x1111; OpenLink(); @@ -1224,8 +1224,8 @@ void CB2_LinkError(void) ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); SetUpWindowConfig(&gWindowConfig_81E7198); - sub_8071C4C(&gWindowConfig_81E7198); - sub_8071EF4(); + InitMenuWindow(&gWindowConfig_81E7198); + MenuZeroFillScreen(); REG_BLDALPHA = 0; REG_BG0VOFS = 0; REG_BG0HOFS = 0; |