diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-18 12:17:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 12:17:38 -0700 |
| commit | c1774eb429a99f0252fd449c174c963c036e4e03 (patch) | |
| tree | 62d071743f4abea54cbd8edbca949d9f47954000 /src/field/field_map_obj.c | |
| parent | a335716a41ebed9b221a7569ab426a2efdd5d719 (diff) | |
| parent | 17bb6dc21f3b5ab3cf1a694bb966928d1c24482f (diff) | |
Merge pull request #448 from ProjectRevoTPP/clean_bike
document bike.c.
Diffstat (limited to 'src/field/field_map_obj.c')
| -rw-r--r-- | src/field/field_map_obj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index 0cba448a9..9d37d90ad 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -5010,7 +5010,7 @@ u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite u8 sub_805F364(struct MapObject *mapObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.running1 == 2) + if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return 0; } @@ -5172,7 +5172,7 @@ fieldmap_object_cb(sub_805F8E0, sub_805F904, gUnknown_083755C0); u8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.running1 == 2) + if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return 0; } |