diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-28 17:54:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 17:54:25 -0400 |
| commit | 7ada56f0395ca6d4d6810c6f3762f8e03dc60cb7 (patch) | |
| tree | acdd4137cef25d027789bc67ab972d49aeb81b50 /src/field_control_avatar.c | |
| parent | c6b27013cc42161636ae345c913a2bd26c5854fd (diff) | |
| parent | e06de33cbdab8ca853bcdd1b4c8909a61aabfcef (diff) | |
Merge pull request #1085 from GriffinRichards/doc-overworld
Document field effects / misc overworld
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 e41b5a69a..3684b53e6 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -545,7 +545,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) UpdateHappinessStepCounter(); UpdateFarawayIslandStepCounter(); - if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED_MOVE) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) { if (UpdatePoisonStepCounter() == TRUE) { @@ -725,7 +725,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB } if (MetatileBehavior_IsAquaHideoutWarp(metatileBehavior) == TRUE) { - DoTeleportWarp(); + DoTeleportTileWarp(); return TRUE; } if (MetatileBehavior_IsWarpOrBridge(metatileBehavior) == TRUE) @@ -938,7 +938,7 @@ static struct BgEvent *GetBackgroundEventAtPosition(struct MapHeader *mapHeader, return NULL; } -bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior) +bool8 TryDoDiveWarp(struct MapPosition *position, u16 metatileBehavior) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && !MetatileBehavior_IsUnableToEmerge(metatileBehavior)) { |