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/field_control_avatar.c | |
| parent | ab802649218507237cd2c07e318ef65e1caca5fe (diff) | |
| parent | 24b4e898ada55c79a0575684722b9d42e63017e9 (diff) | |
Merge pull request #1520 from GriffinRichards/doc-random
Document random remaining symbols
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 10f8d49bb..e58fb783b 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -729,9 +729,9 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB DoTeleportTileWarp(); return TRUE; } - if (MetatileBehavior_IsWarpOrBridge(metatileBehavior) == TRUE) + if (MetatileBehavior_IsBridgeOverOcean(metatileBehavior) == TRUE) { - // Maybe unused? This MB is used by log bridges, but there's never a warp event on them + // Maybe unused? This MB is used by log bridges, but there's never a warp event on them. DoSpinExitWarp(); return TRUE; } @@ -762,7 +762,7 @@ static bool8 IsWarpMetatileBehavior(u16 metatileBehavior) && MetatileBehavior_IsAquaHideoutWarp(metatileBehavior) != TRUE && MetatileBehavior_IsMtPyreHole(metatileBehavior) != TRUE && MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) != TRUE - && MetatileBehavior_IsWarpOrBridge(metatileBehavior) != TRUE) + && MetatileBehavior_IsBridgeOverOcean(metatileBehavior) != TRUE) return FALSE; return TRUE; } |