diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-25 00:05:39 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-25 00:05:39 -0500 |
| commit | 7dd75f453dbf67c3b594c85ae34dcd31e895bf67 (patch) | |
| tree | a6b4c82e165d1f6315356dca0c74017d5bff41fc /src/field_map_obj.c | |
| parent | 2c7112ce8fea1d94c624dbd164892009d4c455c2 (diff) | |
| parent | 87958f2f87b9f7f6e5548d9cb2ac53c3339b78d5 (diff) | |
merge
Diffstat (limited to 'src/field_map_obj.c')
| -rwxr-xr-x | src/field_map_obj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index fc23a6e37..df80494b3 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -3231,7 +3231,7 @@ bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Spr bool8 sub_8091EC0(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 == 2) { return FALSE; } @@ -3410,7 +3410,7 @@ field_object_step(CopyPlayer2, gUnknown_0850DA90) bool8 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 == 2) { return FALSE; } |