summaryrefslogtreecommitdiff
path: root/src/pokemon/learn_move.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-09 14:26:15 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-09 14:26:15 -0600
commit03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 (patch)
tree502c26ec51aa55df4eb1ff4324ab90c3b0a0610a /src/pokemon/learn_move.c
parent8869cbc98e2f8e761e9ff89182933643992e2bd7 (diff)
more text/menu renaming
Diffstat (limited to 'src/pokemon/learn_move.c')
-rw-r--r--src/pokemon/learn_move.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c
index eae1c0b4e..356a31b00 100644
--- a/src/pokemon/learn_move.c
+++ b/src/pokemon/learn_move.c
@@ -268,11 +268,11 @@ void CB2_InitLearnMove(void)
sub_8133558();
SetVBlankCallback(VBlankCB_LearnMove);
- SetUpWindowConfig(&gWindowTemplate_81E7240);
+ Text_LoadWindowTemplate(&gWindowTemplate_81E7240);
InitMenuWindow(&gWindowTemplate_81E7240);
Menu_EraseScreen();
- SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+ Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4);
InitMenuWindow(&gWindowTemplate_81E6CE4);
Menu_EraseScreen();
@@ -302,11 +302,11 @@ void sub_81327A4(void)
sLearnMoveStruct->unk2C6 = gSpecialVar_0x8005;
SetVBlankCallback(VBlankCB_LearnMove);
- SetUpWindowConfig(&gWindowTemplate_81E7240);
+ Text_LoadWindowTemplate(&gWindowTemplate_81E7240);
InitMenuWindow(&gWindowTemplate_81E7240);
Menu_EraseScreen();
- SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+ Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4);
InitMenuWindow(&gWindowTemplate_81E6CE4);
Menu_EraseScreen();
@@ -333,7 +333,7 @@ void CB2_LearnMove(void)
if (sLearnMoveStruct->unk1D)
{
sLearnMoveStruct->unk1D = FALSE;
- sub_814AD7C(0x58, (sLearnMoveStruct->unk18 * 2 + 1) * 8);
+ MenuCursor_SetPos814AD7C(0x58, (sLearnMoveStruct->unk18 * 2 + 1) * 8);
}
if (sLearnMoveStruct->unk1E != 0)
{
@@ -409,7 +409,7 @@ void LearnMoveMain(void)
break;
case 9:
{
- s8 selection = ProcessMenuInputNoWrap_();
+ s8 selection = Menu_ProcessInputNoWrap_();
if (selection == 0)
{
@@ -444,7 +444,7 @@ void LearnMoveMain(void)
break;
case 13:
{
- s8 selection = ProcessMenuInputNoWrap_();
+ s8 selection = Menu_ProcessInputNoWrap_();
if (selection == 0)
{
@@ -475,7 +475,7 @@ void LearnMoveMain(void)
break;
case 18:
{
- s8 var = ProcessMenuInputNoWrap_();
+ s8 var = Menu_ProcessInputNoWrap_();
if (var == 0)
{
@@ -503,7 +503,7 @@ void LearnMoveMain(void)
break;
case 26:
{
- s8 var = ProcessMenuInputNoWrap_();
+ s8 var = Menu_ProcessInputNoWrap_();
if (var == 0)
{