From 6d16dba22e9ea2b40bf684f7549b73a583d143f6 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Mon, 8 Jan 2018 23:16:13 -0600
Subject: re-label some window and text code

---
 src/field/trader.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/field/trader.c')

diff --git a/src/field/trader.c b/src/field/trader.c
index 61cb0b4a2..eb0c8a934 100644
--- a/src/field/trader.c
+++ b/src/field/trader.c
@@ -100,7 +100,7 @@ void CreateAvailableDecorationsMenu(u8 taskId)
         }
     }
 
-    MenuDrawTextWindow(0, 1, 12, numChoices * 2 + 2);
+    Menu_DrawStdWindowFrame(0, 1, 12, numChoices * 2 + 2);
 
     for (i = 0; i < 4; i++)
     {
@@ -108,18 +108,18 @@ void CreateAvailableDecorationsMenu(u8 taskId)
         {
             if (trader->unk1[i] > DECOR_REGISTEEL_DOLL)
             {
-                MenuPrint(gOtherText_FiveQuestionsAndSlash, 1, numDecorations * 2 + 2);
+                Menu_PrintText(gOtherText_FiveQuestionsAndSlash, 1, numDecorations * 2 + 2);
             }
             else
             {
-                MenuPrint(gDecorations[trader->unk1[i]].name, 1, numDecorations * 2 + 2);
+                Menu_PrintText(gDecorations[trader->unk1[i]].name, 1, numDecorations * 2 + 2);
             }
 
             numDecorations++;
         }
     }
 
-    MenuPrint(gOtherText_CancelNoTerminator, 1, numDecorations * 2 + 2);
+    Menu_PrintText(gOtherText_CancelNoTerminator, 1, numDecorations * 2 + 2);
     InitMenu(0, 1, 2, numChoices, 0, 11);
     gTasks[taskId].data[1] = numDecorations;
 }
@@ -136,7 +136,7 @@ void sub_8109B34(u8 taskId, u8 decorationId)
     }
 
     HandleDestroyMenuCursors();
-    MenuZeroFillWindowRect(0, 1, 12, 12);
+    Menu_EraseWindowRect(0, 1, 12, 12);
     DestroyTask(taskId);
     EnableBothScriptContexts();
 }
@@ -148,17 +148,17 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
     if (gMain.newKeys & DPAD_UP)
     {
         PlaySE(SE_SELECT);
-        MoveMenuCursor(-1);
+        Menu_MoveCursor(-1);
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
-        MoveMenuCursor(1);
+        Menu_MoveCursor(1);
     }
     else if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
-        gSpecialVar_0x8005 = GetMenuCursorPos();
+        gSpecialVar_0x8005 = Menu_GetCursorPos();
         if (gTasks[taskId].data[1] == gSpecialVar_0x8005)
         {
             sub_8109B34(taskId, 0);
@@ -216,7 +216,7 @@ void ScrSpecial_TraderMenuGiveDecoration(void)
 void sub_8109D04(u8 taskId)
 {
     HandleDestroyMenuCursors();
-    MenuZeroFillWindowRect(0, 0, 29, 19);
+    Menu_EraseWindowRect(0, 0, 29, 19);
     DestroyVerticalScrollIndicator(0);
     DestroyVerticalScrollIndicator(1);
     sub_80F9520(gUnknown_020388F7, 8);
@@ -238,7 +238,7 @@ void sub_8109D04(u8 taskId)
 void sub_8109DAC(u8 taskId)
 {
     HandleDestroyMenuCursors();
-    MenuZeroFillWindowRect(0, 0, 29, 19);
+    Menu_EraseWindowRect(0, 0, 29, 19);
     gSpecialVar_0x8006 = 0;
     DestroyTask(taskId);
     EnableBothScriptContexts();
-- 
cgit v1.2.3


From 03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 9 Jan 2018 14:26:15 -0600
Subject: more text/menu renaming

---
 src/field/trader.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/field/trader.c')

diff --git a/src/field/trader.c b/src/field/trader.c
index eb0c8a934..b4732ab15 100644
--- a/src/field/trader.c
+++ b/src/field/trader.c
@@ -135,7 +135,7 @@ void sub_8109B34(u8 taskId, u8 decorationId)
         gSpecialVar_0x8004 = decorationId;
     }
 
-    HandleDestroyMenuCursors();
+    Menu_DestroyCursor();
     Menu_EraseWindowRect(0, 1, 12, 12);
     DestroyTask(taskId);
     EnableBothScriptContexts();
@@ -215,7 +215,7 @@ void ScrSpecial_TraderMenuGiveDecoration(void)
 
 void sub_8109D04(u8 taskId)
 {
-    HandleDestroyMenuCursors();
+    Menu_DestroyCursor();
     Menu_EraseWindowRect(0, 0, 29, 19);
     DestroyVerticalScrollIndicator(0);
     DestroyVerticalScrollIndicator(1);
@@ -237,7 +237,7 @@ void sub_8109D04(u8 taskId)
 
 void sub_8109DAC(u8 taskId)
 {
-    HandleDestroyMenuCursors();
+    Menu_DestroyCursor();
     Menu_EraseWindowRect(0, 0, 29, 19);
     gSpecialVar_0x8006 = 0;
     DestroyTask(taskId);
-- 
cgit v1.2.3