diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-28 03:00:15 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-28 03:00:15 -0600 |
| commit | 1496ea3a24f188cad26ac40f5bfcc3e571f3311a (patch) | |
| tree | a0b00c058bd7234b9140b4636b08016278f1b049 /src/field_map_obj.c | |
| parent | 2d04eb22abd3f60902ee1f9bc87bd510518709e3 (diff) | |
| parent | 87958f2f87b9f7f6e5548d9cb2ac53c3339b78d5 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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; } |