diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-09 00:43:07 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-09 00:43:07 +0100 |
| commit | bce01bc518b3a5f36841f1d9d6649cc15d4a94b6 (patch) | |
| tree | 8c398bf570547e3c43db6ba6930e5b38fefee177 /src/scrcmd.c | |
| parent | 9df5e16343a7540a18607d13e098cf8ff8e252e3 (diff) | |
| parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) | |
battle labels merge with master
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index b73ea2125..d2e9c13c9 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -29,7 +29,6 @@ #include "menu.h" #include "money.h" #include "mystery_event_script.h" -#include "new_menu_helpers.h" #include "palette.h" #include "party_menu.h" #include "pokemon_3.h" @@ -1306,7 +1305,7 @@ bool8 ScrCmd_cmdDB(struct ScriptContext *ctx) if (msg == NULL) msg = (const u8 *)ctx->data[0]; sub_81973A4(); - sub_81973C4(0, 1); + NewMenuHelpers_DrawDialogueFrame(0, 1); PrintTextOnWindow(0, 1, msg, 0, 1, 0, 0); return FALSE; } @@ -1523,7 +1522,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) template2 = template1; gUnknown_03000F30 = AddWindow(&template2); sub_809882C(gUnknown_03000F30, 0x214, 0xE0); - sub_81973FC(gUnknown_03000F30, 0); + NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); FillWindowPixelBuffer(gUnknown_03000F30, 0x11); PrintTextOnWindow(gUnknown_03000F30, 6, gStringVar4, temp1, temp2, 0xFF, 0x0); @@ -1644,7 +1643,7 @@ _0809AEC6:\n\ bl sub_809882C\n\ ldrb r0, [r5]\n\ mov r1, #0\n\ - bl sub_81973FC\n\ + bl NewMenuHelpers_DrawStdWindowFrame\n\ ldrb r0, [r5]\n\ bl PutWindowTilemap\n\ ldrb r0, [r5]\n\ |