summaryrefslogtreecommitdiff
path: root/src/apprentice.c
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-03-15 01:19:00 -0400
committerPhlosioneer <mattmdrr2@gmail.com>2019-03-15 01:19:00 -0400
commit31ded7cc6f40876421c7186e15f8a9fa606ff569 (patch)
tree831d96edb6d2b4d239affc57ef98d6ccb2f1bccb /src/apprentice.c
parent2e789dbbdc18f56cba62aef51156d44136b20632 (diff)
parent8e1537fb57dc7ed17079b30f7a3851132cf462bd (diff)
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'src/apprentice.c')
-rw-r--r--src/apprentice.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/apprentice.c b/src/apprentice.c
index 9cf8cd4b4..27ff8e36e 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -1619,7 +1619,7 @@ static u8 CreateAndShowWindow(u8 left, u8 top, u8 width, u8 height)
static void RemoveAndHideWindow(u8 windowId)
{
- sub_8198070(windowId, TRUE);
+ ClearStdWindowAndFrameToTransparent(windowId, TRUE);
RemoveWindow(windowId);
}
@@ -1826,7 +1826,7 @@ static void Script_PrintMessage(void)
FreezeEventObjects();
sub_808B864();
sub_808BCF4();
- NewMenuHelpers_DrawDialogueFrame(0, 1);
+ DrawDialogueFrame(0, 1);
PrintMessage();
}