summaryrefslogtreecommitdiff
path: root/src/battle_setup.c
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-10-16 14:31:45 -0400
committergarak <garakmon@gmail.com>2018-10-16 14:31:45 -0400
commit0051947414df4656826a5ba0b252fdbb5fb0e065 (patch)
tree4ac69544094baaa620b1e8556ddf79715db4fde3 /src/battle_setup.c
parent72f9afcbf4a81909019f21acad0484b72ed217f6 (diff)
parented1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff)
Merge remote-tracking branch 'upstream/master' into event-flags
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r--src/battle_setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 89a3d9a2c..f9fab3d17 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -642,7 +642,7 @@ u8 BattleSetup_GetTerrainId(void)
case MAP_TYPE_ROUTE:
break;
case MAP_TYPE_UNDERGROUND:
- if (MetatileBehavior_IsMB_0B(tileBehavior))
+ if (MetatileBehavior_IsIndoorEncounter(tileBehavior))
return BATTLE_TERRAIN_BUILDING;
if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
return BATTLE_TERRAIN_POND;