diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-01-04 17:31:44 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-04 14:31:44 -0800 |
| commit | 370c7f78539698902907f262721fe60e606c774d (patch) | |
| tree | ca842638903ee4d3badfabd73d1d761e87281d77 /src/field_player_avatar.c | |
| parent | 3c1109d03f5e4581336ee870ed710567498e256f (diff) | |
more labels (#159)
* labels for tv.c and tv.s
* match function prologue a little bit better
* whoops
* label and document lottery_corner.c
* gSoftResetDisabled
* add labels for main_menu.c
* labels for metatile_behavior.c
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 97c04f8e5..7e4e5aed6 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -467,7 +467,7 @@ static u8 sub_8058F6C(s16 a, s16 b, u8 c) b = gMapObjects[mapObjectId].coords2.y; MoveCoords(c, &a, &b); if (npc_block_way(&gMapObjects[mapObjectId], a, b, c) == 0 - && sub_8056F08(MapGridGetMetatileBehaviorAt(a, b)) == 0) + && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(a, b)) == 0) { StartStrengthAnim(mapObjectId, c); return 1; @@ -787,7 +787,7 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) { PlayerGetDestCoords(&x, &y); MoveCoords(2, &x, &y); - if (is_tile_x69_2_warp_door(MapGridGetMetatileBehaviorAt(x, y))) + if (MetatileBehavior_IsWarpDoor(MapGridGetMetatileBehaviorAt(x, y))) return; } PlaySE(SE_WALL_HIT); |