diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-07 19:46:44 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-07 20:54:44 -0500 |
| commit | 0a2c709535bd79d8b62f3e8aafda9171670c1ecf (patch) | |
| tree | f5a49a53a3813152e41ee8db4f250a3d61b0d660 /src/battle/battle_setup.c | |
| parent | f73ea3d931cad4d4e99bbeb664aca6a0344ea1c7 (diff) | |
Label all metatile behaviors and functions
Diffstat (limited to 'src/battle/battle_setup.c')
| -rw-r--r-- | src/battle/battle_setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 47211b718..f53959cc2 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -663,7 +663,7 @@ s8 BattleSetup_GetTerrain(void) case MAP_TYPE_ROUTE: break; case MAP_TYPE_UNDERGROUND: - if (sub_80574C4(tileBehavior)) + if (MetatileBehavior_IsIndoorEncounter(tileBehavior)) return BATTLE_TERRAIN_BUILDING; if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) return BATTLE_TERRAIN_POND; @@ -678,15 +678,15 @@ s8 BattleSetup_GetTerrain(void) return BATTLE_TERRAIN_WATER; return BATTLE_TERRAIN_PLAIN; } - if (sub_8057568(tileBehavior)) + if (MetatileBehavior_IsOceanWater(tileBehavior)) return BATTLE_TERRAIN_WATER; if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) return BATTLE_TERRAIN_POND; - if (sub_80574D8(tileBehavior)) + if (MetatileBehavior_IsMountainTop(tileBehavior)) return BATTLE_TERRAIN_MOUNTAIN; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) { - if (sub_8057450(tileBehavior)) + if (MetatileBehavior_GetBridgeType(tileBehavior)) return BATTLE_TERRAIN_POND; if (MetatileBehavior_IsBridge(tileBehavior) == TRUE) return BATTLE_TERRAIN_WATER; |