diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-18 12:20:35 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-10-18 12:54:29 -0400 |
| commit | b31bddddca327bd15cc022717d19ace43b435ac2 (patch) | |
| tree | 458aad0ac09d04c69f50f3f9993bb286feb47fab /src/battle_setup.c | |
| parent | 7590bacec1362cd3d339aa422ced50bb57f6cca0 (diff) | |
Clean up metatile_behavior
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 4337ec29c..28e80545f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -674,9 +674,11 @@ u8 BattleSetup_GetTerrainId(void) return BATTLE_TERRAIN_MOUNTAIN; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) { - if (MetatileBehavior_GetBridgeType(tileBehavior)) + // Is BRIDGE_TYPE_POND_*? + if (MetatileBehavior_GetBridgeType(tileBehavior) != BRIDGE_TYPE_OCEAN) return BATTLE_TERRAIN_POND; - if (MetatileBehavior_IsBridge(tileBehavior) == TRUE) + + if (MetatileBehavior_IsBridgeOverWater(tileBehavior) == TRUE) return BATTLE_TERRAIN_WATER; } if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE113)) |