diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-07 09:34:32 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-07 09:34:32 -0600 |
commit | db97098b916716bc536465d961acefcc5af2b2e3 (patch) | |
tree | d7ab50dce1f5a9c17cb70f252d7302d3dda61ff6 /src/field_map_obj_helpers.c | |
parent | c9ef0be15d79068f5df9f7360f35346dd1ee6b54 (diff) | |
parent | b3a94a359f3412503d8bab5ef99e91d2bdd92ebb (diff) |
Merge pull request #204 from DizzyEggg/match_nonmatchings
Match a couple of nonmatching functions
Diffstat (limited to 'src/field_map_obj_helpers.c')
-rwxr-xr-x | src/field_map_obj_helpers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c index 1e0e9b66b..de26cb034 100755 --- a/src/field_map_obj_helpers.c +++ b/src/field_map_obj_helpers.c @@ -549,14 +549,14 @@ bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) { if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0) firstFreeSlot = i; - + if (gUnknown_020375B8[i] == mapObject->localId) { found = TRUE; break; } } - + if (!found && firstFreeSlot != 16) { gUnknown_020375B8[firstFreeSlot] = mapObject->localId; @@ -564,13 +564,13 @@ bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) ableToStore = TRUE; // the nonmatching problem is that ableToStore == TRUE isnt being merged with the above ableToStore = TRUE assignment. } } - + if (ableToStore == TRUE) { mapObject->mapobj_bit_12 = TRUE; mapObject->mapobj_bit_9 = TRUE; } - + sprite->data[2] = 1; return TRUE; } |