dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use MPS_TYPE_ defines in field_fadetransition and fldeff_flash

Browse Source
This commit is contained in:
PikalaxALT
2020-03-09 09:32:17 -04:00
parent 1a8023c465
commit 8955f1fa5f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_fadetransition.c
+1 -1
View File
@@ -94,7 +94,7 @@ void FadeInFromBlack(void)
void WarpFadeOutScreen(void) void WarpFadeOutScreen(void)
{ {
const struct MapHeader *header = warp1_get_mapheader(); const struct MapHeader *header = warp1_get_mapheader();
if (header->regionMapSectionId != gMapHeader.regionMapSectionId && MapHasPreviewScreen(header->regionMapSectionId, FALSE)) if (header->regionMapSectionId != gMapHeader.regionMapSectionId && MapHasPreviewScreen(header->regionMapSectionId, MPS_TYPE_CAVE))
FadeScreen(1, 0); FadeScreen(1, 0);
else else
{ {
src/fldeff_flash.c
+1 -1
View File
@@ -238,7 +238,7 @@ static bool8 TryDoMapTransition(void)
u8 fromType = GetLastUsedWarpMapType(); u8 fromType = GetLastUsedWarpMapType();
u8 toType = GetCurrentMapType(); u8 toType = GetCurrentMapType();
u8 i = 0; u8 i = 0;
if (GetLastUsedWarpMapSectionId() != gMapHeader.regionMapSectionId && MapHasPreviewScreen_HandleQLState2(gMapHeader.regionMapSectionId, FALSE) == TRUE) if (GetLastUsedWarpMapSectionId() != gMapHeader.regionMapSectionId && MapHasPreviewScreen_HandleQLState2(gMapHeader.regionMapSectionId, MPS_TYPE_CAVE) == TRUE)
{ {
RunMapPreviewScreen(gMapHeader.regionMapSectionId); RunMapPreviewScreen(gMapHeader.regionMapSectionId);
return TRUE; return TRUE;