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

Merge pull request #1700 from mrgriffin/battle-setup-water-transition

Browse Source 
Simplify GetBattleTransitionTypeByMap
This commit is contained in:
GriffinR
2022-07-05 11:10:16 -04:00
committed by GitHub
parent 8231ea2b68 c9958e3087
commit 76659a4091
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/battle_setup.c
View File

@@ -699,21 +699,22 @@ 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:
{ return TRANSITION_TYPE_CAVE;
case MAP_TYPE_UNDERGROUND: case MAP_TYPE_UNDERWATER:
return TRANSITION_TYPE_CAVE; return TRANSITION_TYPE_WATER;
case MAP_TYPE_UNDERWATER: default:
return TRANSITION_TYPE_WATER; return TRANSITION_TYPE_NORMAL;
default:
return TRANSITION_TYPE_NORMAL;
}
} }
return TRANSITION_TYPE_WATER;
} }
static u16 GetSumOfPlayerPartyLevel(u8 numMons) static u16 GetSumOfPlayerPartyLevel(u8 numMons)