diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:27:20 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:27:20 -0500 |
commit | b93d9238261edc6250f5f7bebe8b54643359729a (patch) | |
tree | 7f7a15f04f40a5c811dac3546a98d3ecd7858c81 /src/field_region_map.c | |
parent | eac70acab65dea005da2299e4bb209aff1ded60f (diff) | |
parent | bd157b301dea3526a4c373737dc8167d9a02b168 (diff) |
Merge branch 'master' into move-tutor
Diffstat (limited to 'src/field_region_map.c')
-rw-r--r-- | src/field_region_map.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_region_map.c b/src/field_region_map.c index d49ce3a4e..1d54333fb 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -139,11 +139,11 @@ static void FieldUpdateRegionMap(void) sFieldRegionMapHandler->state++; break; case 1: - SetWindowBorderStyle(1, 0, 0x27, 0xd); + DrawStdFrameWithCustomTileAndPalette(1, 0, 0x27, 0xd); offset = GetStringCenterAlignXOffset(1, gText_Hoenn, 0x38); AddTextPrinterParameterized(1, 1, gText_Hoenn, offset, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); - SetWindowBorderStyle(0, 0, 0x27, 0xd); + DrawStdFrameWithCustomTileAndPalette(0, 0, 0x27, 0xd); PrintRegionMapSecName(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); sFieldRegionMapHandler->state++; @@ -196,13 +196,13 @@ static void PrintRegionMapSecName(void) { if (sFieldRegionMapHandler->regionMap.iconDrawType != MAPSECTYPE_NONE) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(0, 1, sFieldRegionMapHandler->regionMap.mapSecName, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); } else { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); CopyWindowToVram(0, 3); } } |