diff options
| author | huderlem <huderlem@gmail.com> | 2019-03-03 09:28:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 09:28:35 -0600 |
| commit | c9d2fcabefb149f259f97b59e15b4d635c52d2c6 (patch) | |
| tree | 3122377a548140355ae1a3350212cc52827bc9ac /src/field_region_map.c | |
| parent | 043071ae12aa6854119a44304a5facbd58fa3624 (diff) | |
| parent | 9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (diff) | |
Merge pull request #553 from Phlosioneer/main-menu-state-machine
Document main_menu state machine, name window constants
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); } } |