ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/scripts/tv.inc
View File

@ -42,9 +42,9 @@ EventScript_27EE9A:: @ 827EE9A
EventScript_27EEA4:: @ 827EEA4 EventScript_27EEA4:: @ 827EEA4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
@ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and
@ It's called again when Mom actually asks for the color, overwriting @ It's called again when Mom actually asks for the color, overwriting
@ whatever it does here. @ whatever it does here.
special InitRoamer special InitRoamer
clearflag FLAG_SYS_TV_LATIAS_LATIOS clearflag FLAG_SYS_TV_LATIAS_LATIOS
setflag FLAG_LATIOS_OR_LATIAS_ROAMING setflag FLAG_LATIOS_OR_LATIAS_ROAMING

2
include/overworld.h
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);

6
src/overworld.c
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)