ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify GetBattleTransitionTypeByMap

Browse Source
This commit is contained in:
Martin Griffin 2022-07-05 14:17:46 +01:00
parent 8231ea2b68
commit c9958e3087
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle_setup.c
View File

@ -699,10 +699,13 @@ static u8 GetBattleTransitionTypeByMap(void)
PlayerGetDestCoords(&x, &y); PlayerGetDestCoords(&x, &y);
tileBehavior = MapGridGetMetatileBehaviorAt(x, y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
if (GetFlashLevel()) if (GetFlashLevel())
return TRANSITION_TYPE_FLASH; return TRANSITION_TYPE_FLASH;
if (!MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
{ if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
return TRANSITION_TYPE_WATER;
switch (gMapHeader.mapType) switch (gMapHeader.mapType)
{ {
case MAP_TYPE_UNDERGROUND: case MAP_TYPE_UNDERGROUND:
@ -712,8 +715,6 @@ static u8 GetBattleTransitionTypeByMap(void)
default: default:
return TRANSITION_TYPE_NORMAL; return TRANSITION_TYPE_NORMAL;
} }
}
return TRANSITION_TYPE_WATER;
} }
static u16 GetSumOfPlayerPartyLevel(u8 numMons) static u16 GetSumOfPlayerPartyLevel(u8 numMons)