diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-03 18:29:18 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-03 19:54:20 -0400 |
| commit | 50d3003a0d66b30fa1bf50b33e1a7de6263dca5d (patch) | |
| tree | 977ab84e4c13e1e6bc21c8031737995e1e673348 /src/scrcmd.c | |
| parent | 085f8adec62be6a1ecf7b4389148867408b30bed (diff) | |
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index ce312a563..ffe75b370 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -49,6 +49,7 @@ #include "tv.h" #include "window.h" #include "constants/event_objects.h" +#include "constants/maps.h" typedef u16 (*SpecialFunc)(void); typedef void (*NativeFunc)(void); @@ -790,7 +791,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) u16 y; PlayerGetDestCoords(&x, &y); - if (mapGroup == 0xFF && mapNum == 0xFF) + if (mapGroup == MAP_GROUP(UNDEFINED) && mapNum == MAP_NUM(UNDEFINED)) SetWarpDestinationToFixedHoleWarp(x - MAP_OFFSET, y - MAP_OFFSET); else SetWarpDestination(mapGroup, mapNum, -1, x - MAP_OFFSET, y - MAP_OFFSET); @@ -1532,7 +1533,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) DrawStdWindowFrame(gBrailleWindowId, 0); PutWindowTilemap(gBrailleWindowId); FillWindowPixelBuffer(gBrailleWindowId, PIXEL_FILL(1)); - AddTextPrinterParameterized(gBrailleWindowId, FONT_BRAILLE, gStringVar4, xText, yText, 0xFF, 0x0); + AddTextPrinterParameterized(gBrailleWindowId, FONT_BRAILLE, gStringVar4, xText, yText, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(gBrailleWindowId, COPYWIN_FULL); return FALSE; } |