diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 16:58:54 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 16:58:54 -0500 |
commit | 2879fe7fe05166f16b21223c2d4d24f5855c2788 (patch) | |
tree | 3e5525a118c249ab2419a61d7a61b4cb1985462b /src/trader.c | |
parent | 63e700af6c735dc40f8ddb2b46cad9c0c43ad6b3 (diff) | |
parent | 1e7f4a80c77832d952688206bd7c98e11dba25ba (diff) |
Merge branch 'master' into summary-screen-macros
Diffstat (limited to 'src/trader.c')
-rw-r--r-- | src/trader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trader.c b/src/trader.c index b5c159fb9..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); |