dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tabs, do suggested rename

Browse Source
This commit is contained in:
Phlosioneer
2019-03-02 04:13:27 -05:00
parent a7e5852f1d
commit 25050b9944
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/overworld.h
+1 -1
View File
@@ -98,7 +98,7 @@ u8 GetCurrentMapType(void);
u8 GetLastUsedWarpMapType(void); u8 GetLastUsedWarpMapType(void);
bool8 IsMapTypeOutdoors(u8 mapType); bool8 IsMapTypeOutdoors(u8 mapType);
bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
bool8 Overworld_MapTypeIsIndoors(u8 mapType); bool8 IsMapTypeIndoors(u8 mapType);
u8 GetSavedWarpRegionMapSectionId(void); u8 GetSavedWarpRegionMapSectionId(void);
u8 GetCurrentRegionMapSectionId(void); u8 GetCurrentRegionMapSectionId(void);
u8 GetCurrentMapBattleScene(void); u8 GetCurrentMapBattleScene(void);
src/overworld.c
+3 -3
View File
@@ -838,7 +838,7 @@ static void mli0_load_map(u32 a1)
} }
isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType); isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType);
isIndoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType); isIndoors = IsMapTypeIndoors(gMapHeader.mapType);
sub_80EB218(); sub_80EB218();
TrySetMapSaveWarpStatus(); TrySetMapSaveWarpStatus();
@@ -1199,7 +1199,7 @@ void Overworld_ChangeMusicTo(u16 newMusic)
u8 GetMapMusicFadeoutSpeed(void) u8 GetMapMusicFadeoutSpeed(void)
{ {
const struct MapHeader *mapHeader = GetDestinationWarpMapHeader(); const struct MapHeader *mapHeader = GetDestinationWarpMapHeader();
if (Overworld_MapTypeIsIndoors(mapHeader->mapType) == TRUE) if (IsMapTypeIndoors(mapHeader->mapType) == TRUE)
return 2; return 2;
else else
return 4; return 4;
@@ -1353,7 +1353,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType)
return FALSE; return FALSE;
} }
bool8 Overworld_MapTypeIsIndoors(u8 mapType) bool8 IsMapTypeIndoors(u8 mapType)
{ {
if (mapType == MAP_TYPE_INDOOR if (mapType == MAP_TYPE_INDOOR
|| mapType == MAP_TYPE_SECRET_BASE) || mapType == MAP_TYPE_SECRET_BASE)