diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-03 13:56:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 13:56:22 -0400 |
| commit | 3e49ac804b53cdb4d39b4f92de949eb858efcee4 (patch) | |
| tree | f3598d27d0511ad5cd3457edeef60ef96cbb4305 /src/scrcmd.c | |
| parent | afb9ff3a40dcfb2681ef274752bceb726d14b783 (diff) | |
| parent | e14210ce1f9be3ae894490a4e3050832aecbdde7 (diff) | |
Merge branch 'master' into doc-finalmisc
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 96d95da27..57f133d0d 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1310,7 +1310,7 @@ bool8 ScrCmd_messageinstant(struct ScriptContext *ctx) msg = (const u8 *)ctx->data[0]; LoadMessageBoxAndBorderGfx(); DrawDialogueFrame(0, 1); - AddTextPrinterParameterized(0, 1, msg, 0, 1, 0, 0); + AddTextPrinterParameterized(0, FONT_NORMAL, msg, 0, 1, 0, 0); return FALSE; } @@ -1497,7 +1497,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) // in Emerald they are unused and position is calculated below instead StringExpandPlaceholders(gStringVar4, ptr + 6); - width = GetStringWidth(6, gStringVar4, -1) / 8u; + width = GetStringWidth(FONT_BRAILLE, gStringVar4, -1) / 8u; if (width > 28) width = 28; @@ -1532,7 +1532,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) DrawStdWindowFrame(gBrailleWindowId, 0); PutWindowTilemap(gBrailleWindowId); FillWindowPixelBuffer(gBrailleWindowId, PIXEL_FILL(1)); - AddTextPrinterParameterized(gBrailleWindowId, 6, gStringVar4, xText, yText, 0xFF, 0x0); + AddTextPrinterParameterized(gBrailleWindowId, FONT_BRAILLE, gStringVar4, xText, yText, 0xFF, 0x0); CopyWindowToVram(gBrailleWindowId, 3); return FALSE; } |