summaryrefslogtreecommitdiff
path: root/src/field_region_map.c
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-07-15 04:43:03 -0700
committerGitHub <noreply@github.com>2018-07-15 04:43:03 -0700
commit07ef76277021d5cddf14004e37e785c31fcea69b (patch)
tree2ddbc42ed88d41986a5db903ddb06ac5bbed0df3 /src/field_region_map.c
parent24f6484643ed3d7115fd4ebd92f254f224f1ca97 (diff)
parent731d6d59bc624e0350b3396f135a35f6c9bdc4f8 (diff)
Merge pull request #275 from Diegoisawesome/master
Document list_menu.c and main_menu.c
Diffstat (limited to 'src/field_region_map.c')
-rw-r--r--src/field_region_map.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_region_map.c b/src/field_region_map.c
index b7d677c90..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();
- sub_809882C(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: