summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPokeCodec <67983839+PokeCodec@users.noreply.github.com>2020-09-05 14:51:17 -0400
committerPokeCodec <67983839+PokeCodec@users.noreply.github.com>2020-09-05 14:51:45 -0400
commitac9a86d7ce96731c7a9f2561e69ad05955a012ec (patch)
treeb4c0f56b22fee5d09343d6516b85d939e6056366 /src
parent0039542e19112ab9c31216cc087e3863cdeabb1e (diff)
Remove movementAction fakematch
Diffstat (limited to 'src')
-rw-r--r--src/event_object_movement.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 72de880c8..1b97b955f 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -8835,20 +8835,19 @@ u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *
u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- u32 one;
- bool32 ableToStore = FALSE;
+ bool8 ableToStore = FALSE;
if (gLockedAnimObjectEvents == NULL)
{
gLockedAnimObjectEvents = AllocZeroed(sizeof(struct LockedAnimObjectEvents));
gLockedAnimObjectEvents->objectEventIds[0] = objectEvent->localId;
// needed to match
- gLockedAnimObjectEvents->count = (one = 1);
- ableToStore = one;
+ gLockedAnimObjectEvents->count = 1;
+ ableToStore = TRUE;
}
else
{
u8 i, firstFreeSlot;
- bool32 found;
+ bool8 found;
for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++)
{
if (firstFreeSlot == 16 && gLockedAnimObjectEvents->objectEventIds[i] == 0)
@@ -8881,7 +8880,7 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct
u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- bool32 ableToStore;
+ bool8 ableToStore;
u8 index;
sprite->data[2] = 1;