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/field_control_avatar.c | |
parent | 7590bacec1362cd3d339aa422ced50bb57f6cca0 (diff) |
Clean up metatile_behavior
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; } |