From eaddf396b2b19e342a03585f0527906aa7dcecd5 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Fri, 8 Mar 2019 02:35:19 -0500
Subject: I was dumb and forgot to add merge fixes

---
 src/menu_specialized.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index d9b2270f4..bf5d2ec56 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -246,7 +246,7 @@ u8 sub_81D1C84(u8 a0)
 
 void sub_81D1D04(u8 a0)
 {
-    sub_8198070(sUnknown_0203CF48[a0], 0);
+    ClearStdWindowAndFrameToTransparent(sUnknown_0203CF48[a0], 0);
     ClearWindowTilemap(sUnknown_0203CF48[a0]);
     RemoveWindow(sUnknown_0203CF48[a0]);
     sUnknown_0203CF48[a0] = 0xFF;
@@ -1587,17 +1587,17 @@ void InitMoveRelearnerWindows(bool8 useContextWindow)
     if (!useContextWindow)
     {
         PutWindowTilemap(0);
-        SetWindowBorderStyle(0, 0, 0x1, 0xE);
+        DrawStdFrameWithCustomTileAndPalette(0, 0, 0x1, 0xE);
     }
     else
     {
         PutWindowTilemap(1);
-        SetWindowBorderStyle(1, 0, 1, 0xE);
+        DrawStdFrameWithCustomTileAndPalette(1, 0, 1, 0xE);
     }
     PutWindowTilemap(2);
     PutWindowTilemap(3);
-    SetWindowBorderStyle(2, 0, 1, 0xE);
-    SetWindowBorderStyle(3, 0, 1, 0xE);
+    DrawStdFrameWithCustomTileAndPalette(2, 0, 1, 0xE);
+    DrawStdFrameWithCustomTileAndPalette(3, 0, 1, 0xE);
     nullsub_79();
     schedule_bg_copy_tilemap_to_vram(1);
 }
-- 
cgit v1.2.3