diff options
| author | huderlem <huderlem@gmail.com> | 2019-03-03 09:28:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 09:28:35 -0600 |
| commit | c9d2fcabefb149f259f97b59e15b4d635c52d2c6 (patch) | |
| tree | 3122377a548140355ae1a3350212cc52827bc9ac /src/scrcmd.c | |
| parent | 043071ae12aa6854119a44304a5facbd58fa3624 (diff) | |
| parent | 9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (diff) | |
Merge pull request #553 from Phlosioneer/main-menu-state-machine
Document main_menu state machine, name window constants
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 6df835bad..314504600 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1302,7 +1302,7 @@ bool8 ScrCmd_cmdDB(struct ScriptContext *ctx) if (msg == NULL) msg = (const u8 *)ctx->data[0]; sub_81973A4(); - NewMenuHelpers_DrawDialogueFrame(0, 1); + DrawDialogueFrame(0, 1); AddTextPrinterParameterized(0, 1, msg, 0, 1, 0, 0); return FALSE; } @@ -1517,9 +1517,9 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) winTemplate = CreateWindowTemplate(0, xWindow, yWindow + 1, width, height, 0xF, 0x1); gUnknown_03000F30 = AddWindow(&winTemplate); LoadUserWindowBorderGfx(gUnknown_03000F30, 0x214, 0xE0); - NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0); + DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); - FillWindowPixelBuffer(gUnknown_03000F30, 0x11); + FillWindowPixelBuffer(gUnknown_03000F30, PIXEL_FILL(1)); AddTextPrinterParameterized(gUnknown_03000F30, 6, gStringVar4, xText, yText, 0xFF, 0x0); CopyWindowToVram(gUnknown_03000F30, 3); return FALSE; @@ -2254,7 +2254,7 @@ bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx) void sub_809BDB4(void) { - sub_819746C(gUnknown_03000F30, 1); + ClearStdWindowAndFrame(gUnknown_03000F30, 1); RemoveWindow(gUnknown_03000F30); } |