summaryrefslogtreecommitdiff
path: root/src/berry_powder.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/berry_powder.c')
-rw-r--r--src/berry_powder.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/berry_powder.c b/src/berry_powder.c
index b3069d697..9b3bbc17f 100644
--- a/src/berry_powder.c
+++ b/src/berry_powder.c
@@ -97,7 +97,7 @@ void sub_815EFBC(u8 windowId, u32 powder, u8 x, u8 y, u8 speed)
void sub_815F014(u8 windowId, u16 baseBlock, u8 palette, u32 powder)
{
- SetWindowBorderStyle(windowId, FALSE, baseBlock, palette);
+ DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, baseBlock, palette);
AddTextPrinterParameterized(windowId, 0, gOtherText_Powder, 0, 0, -1, NULL);
sub_815EFBC(windowId, powder, 39, 12, 0);
}
@@ -110,13 +110,11 @@ void sub_815F070(void)
void sub_815F094(void)
{
struct WindowTemplate template;
- struct WindowTemplate template2;
if (sub_81119D4(sub_809D6D4) != TRUE)
{
- SetWindowTemplateFields(&template, 0, 1, 1, 8, 3, 15, 32);
- template2 = template;
- gUnknown_203F464 = AddWindow(&template2);
+ template = SetWindowTemplateFields(0, 1, 1, 8, 3, 15, 32);
+ gUnknown_203F464 = AddWindow(&template);
FillWindowPixelBuffer(gUnknown_203F464, 0);
PutWindowTilemap(gUnknown_203F464);
TextWindow_SetStdFrame0_WithPal(gUnknown_203F464, 0x21D, 0xD0);
@@ -127,6 +125,6 @@ void sub_815F094(void)
void sub_815F114(void)
{
ClearWindowTilemap(gUnknown_203F464);
- ClearMenuWindow(gUnknown_203F464, 1);
+ ClearStdWindowAndFrameToTransparent(gUnknown_203F464, 1);
RemoveWindow(gUnknown_203F464);
}