summaryrefslogtreecommitdiff
path: root/src/field_screen_effect.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-12-27 16:30:47 -0600
committerMarcus Huderle <huderlem@gmail.com>2018-12-27 16:52:13 -0600
commitd59f5a8e5649ad09a41b65edcc68f701320ca52e (patch)
treeb05721bd6ec8578fb3ac04fb30fbd65cec4cc335 /src/field_screen_effect.c
parent2c0f5f58e9234f34f5f4aa2ffae931a57c6cf19e (diff)
Misc overworld documentation
Diffstat (limited to 'src/field_screen_effect.c')
-rw-r--r--src/field_screen_effect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index a6b7e7c24..62a3d0335 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -89,7 +89,7 @@ static void palette_bg_faded_fill_black(void)
void pal_fill_for_maplights(void)
{
u8 previousMapType = GetLastUsedWarpMapType();
- switch (GetMapPairFadeFromType(previousMapType, Overworld_GetMapTypeOfSaveblockLocation()))
+ switch (GetMapPairFadeFromType(previousMapType, GetCurrentMapType()))
{
case 0:
palette_bg_faded_fill_black();
@@ -115,7 +115,7 @@ void pal_fill_black(void)
void WarpFadeScreen(void)
{
- u8 currentMapType = Overworld_GetMapTypeOfSaveblockLocation();
+ u8 currentMapType = GetCurrentMapType();
switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType))
{
case 0: