Merge branch 'master' into flatten_sprite_pos

This commit is contained in:
GriffinR authored and GitHub committed 2021-07-12 01:39:28 -04:00
commit a274cc6a76
44 files changed
+775 -893

No files matched your search

+3 -1
View File
@@ -327,7 +327,9 @@ static u32 LoopedTask_OpenRegionMap(s32 taskState)
}
else
{
sub_8123030(RGB_BLACK, 6);
// Dim the region map when zoom is disabled
// (when the player is off the map)
BlendRegionMap(RGB_BLACK, 6);
}
return LT_INC_AND_PAUSE;
case 2: