Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

1 files changed, 4 insertions, 4 deletions

diff --git a/src/trader.c b/src/trader.c
index e23efb4ce..97bc4626f 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -73,7 +73,7 @@ void CreateAvailableDecorationsMenu(u8 taskId)
     }
     windowTemplate.width = convert_pixel_width_to_tile_width(windowWidth);
     data[3] = AddWindow(&windowTemplate);
-    SetWindowBorderStyle(data[3], FALSE, 0x214, 14);
+    DrawStdFrameWithCustomTileAndPalette(data[3], FALSE, 0x214, 14);
     for (i = 0; i < 4; i++)
     {
         if (trader->decorIds[i] > NUM_DECORATIONS)
@@ -98,7 +98,7 @@ void sub_8133BE4(u8 taskId, u8 decorationId)
         gSpecialVar_0x8004 = decorationId;
     }
 
-    sub_8198070(data[3], FALSE);
+    ClearStdWindowAndFrameToTransparent(data[3], FALSE);
     ClearWindowTilemap(data[3]);
     RemoveWindow(data[3]);
     schedule_bg_copy_tilemap_to_vram(0);
@@ -113,9 +113,9 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
 
     switch (input)
     {
-        case -2:
+        case MENU_NOTHING_CHOSEN:
             break;
-        case -1:
+        case MENU_B_PRESSED:
         case 4:
             PlaySE(SE_SELECT);
             sub_8133BE4(taskId, 0);