diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
| commit | ea5ffa3375f58c3d859f48d220a8a67fcb56fa61 (patch) | |
| tree | e04cbfe52909f094f9b7a0b20e927d0f5851b201 /src/field_region_map.c | |
| parent | ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a (diff) | |
| parent | 07ef76277021d5cddf14004e37e785c31fcea69b (diff) | |
Merge with master
Diffstat (limited to 'src/field_region_map.c')
| -rw-r--r-- | src/field_region_map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_region_map.c b/src/field_region_map.c index 1edf1ab51..34b6089df 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -89,7 +89,7 @@ static void MCB2_InitRegionMapRegisters(void) InitBgsFromTemplates(1, gUnknown_085E5068, 2); InitWindows(gUnknown_085E5070); DeactivateAllTextPrinters(); - LoadSav2WindowGfx(0, 0x27, 0xd0); + LoadUserWindowBorderGfx(0, 0x27, 0xd0); clear_scheduled_bg_copies_to_vram(); SetMainCallback2(MCB2_FieldUpdateRegionMap); SetVBlankCallback(VBCB_FieldUpdateRegionMap); @@ -130,7 +130,7 @@ static void FieldUpdateRegionMap(void) schedule_bg_copy_tilemap_to_vram(0); SetWindowBorderStyle(0, 0, 0x27, 0xd); PrintRegionMapSecName(); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); sFieldRegionMapHandler->state++; break; case 2: @@ -158,7 +158,7 @@ static void FieldUpdateRegionMap(void) } break; case 5: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); sFieldRegionMapHandler->state++; break; case 6: |