From 6d16dba22e9ea2b40bf684f7549b73a583d143f6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 8 Jan 2018 23:16:13 -0600 Subject: re-label some window and text code --- src/engine/link.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index 28323207c..a2df02b5f 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -239,7 +239,7 @@ void LinkTestScreen(void) ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E6CE4); + InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); ResetBlockSend(); gLinkType = 0x1111; OpenLink(); @@ -1237,8 +1237,8 @@ void CB2_LinkError(void) ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); SetUpWindowConfig(&gWindowConfig_81E7198); - InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E7198); - MenuZeroFillScreen(); + InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E7198); + Menu_EraseScreen(); REG_BLDALPHA = 0; REG_BG0VOFS = 0; REG_BG0HOFS = 0; -- cgit v1.2.3 From 8869cbc98e2f8e761e9ff89182933643992e2bd7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 00:16:15 -0600 Subject: s/gWindowConfig/gWindowTemplate/g --- src/engine/link.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index a2df02b5f..d52d0bb7a 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -238,8 +238,8 @@ void LinkTestScreen(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); ResetBlockSend(); gLinkType = 0x1111; OpenLink(); @@ -1236,8 +1236,8 @@ void CB2_LinkError(void) FillPalette(0, 0, 2); ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); - SetUpWindowConfig(&gWindowConfig_81E7198); - InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E7198); + SetUpWindowConfig(&gWindowTemplate_81E7198); + InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E7198); Menu_EraseScreen(); REG_BLDALPHA = 0; REG_BG0VOFS = 0; -- cgit v1.2.3 From 03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 14:26:15 -0600 Subject: more text/menu renaming --- src/engine/link.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index d52d0bb7a..34016d607 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -238,7 +238,7 @@ void LinkTestScreen(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); ResetBlockSend(); gLinkType = 0x1111; @@ -1236,7 +1236,7 @@ void CB2_LinkError(void) FillPalette(0, 0, 2); ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); - SetUpWindowConfig(&gWindowTemplate_81E7198); + Text_LoadWindowTemplate(&gWindowTemplate_81E7198); InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E7198); Menu_EraseScreen(); REG_BLDALPHA = 0; @@ -1260,7 +1260,7 @@ static void CB2_PrintErrorMessage(void) switch (gMain.state) { case 0: - MenuPrint_PixelCoords(gMultiText_LinkError, 20, 56, 1); + Menu_PrintTextPixelCoords(gMultiText_LinkError, 20, 56, 1); break; case 30: case 60: -- cgit v1.2.3