diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-24 23:43:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-24 23:43:17 -0400 |
| commit | 6dc3c9864c80557a81c080e0a5893d9d8765c635 (patch) | |
| tree | 2bbe4199571af512cd88f0bd2dcbdf6da390d5e5 /src/battle_setup.c | |
| parent | ab802649218507237cd2c07e318ef65e1caca5fe (diff) | |
| parent | 24b4e898ada55c79a0575684722b9d42e63017e9 (diff) | |
Merge pull request #1520 from GriffinRichards/doc-random
Document random remaining symbols
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 172bfc5be..2a716e08c 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)) |