diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
|---|---|---|
| committer | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
| commit | 2c254082de042dde46cee9d2da2d9bb1bc340905 (patch) | |
| tree | af99bcac2c6fece9523b12dbabe4128ec26f6fc9 /src/map_preview_screen.c | |
| parent | 78558b07b0983b6b8b06085933fdf66b801658e9 (diff) | |
| parent | 2a7205dec677c98d087cb8ba191370de464c8bf0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'src/map_preview_screen.c')
| -rw-r--r-- | src/map_preview_screen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c index b913d5fe8..7d9fa935e 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -447,21 +447,21 @@ u16 sub_80F8318(u8 mapsec) { u16 windowId; u32 xctr; - struct TextColor color[0]; + u8 color[0]; windowId = AddWindow(&sMapNameWindow); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); - color->fgColor = 1; // Access violation - color->bgColor = 4; // Access violation - color->shadowColor = 3; // Access violation + color[0] = 1; // Access violation + color[1] = 4; // Access violation + color[2] = 3; // Access violation GetMapName(gStringVar4, mapsec, 0); xctr = 104 - GetStringWidth(2, gStringVar4, 0); AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4); return windowId; } -bool8 sub_80F83B0(void) +bool32 sub_80F83B0(void) { if (FuncIsActiveTask(sub_80F83D0) == TRUE) { |