diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 11:15:00 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 11:15:00 +0100 |
| commit | 43f23b8a78a0111c88d671942a012d8d4b28596c (patch) | |
| tree | 743beb78116eb7f6558e8a6c906873e584cbf8b2 /src/field_map_obj.c | |
| parent | 3a3772c74ff76a258ffa4b6515fa07d5c96a2979 (diff) | |
| parent | f209cbd7a0519b49fcf3f1b7a3fca27d6dcaacd8 (diff) | |
Merge branch 'master' into dump_pointers
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; } |