ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-31 00:13:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove movementAction fakematch

Browse Source
This commit is contained in:
PokeCodec 2020-09-05 14:51:17 -04:00
parent 0039542e19
commit ac9a86d7ce
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/event_object_movement.c
View File

@ -8835,20 +8835,19 @@ u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *
u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
u32 one; bool8 ableToStore = FALSE;
bool32 ableToStore = FALSE;
if (gLockedAnimObjectEvents == NULL) if (gLockedAnimObjectEvents == NULL)
{ {
gLockedAnimObjectEvents = AllocZeroed(sizeof(struct LockedAnimObjectEvents)); gLockedAnimObjectEvents = AllocZeroed(sizeof(struct LockedAnimObjectEvents));
gLockedAnimObjectEvents->objectEventIds[0] = objectEvent->localId; gLockedAnimObjectEvents->objectEventIds[0] = objectEvent->localId;
// needed to match // needed to match
gLockedAnimObjectEvents->count = (one = 1); gLockedAnimObjectEvents->count = 1;
ableToStore = one; ableToStore = TRUE;
} }
else else
{ {
u8 i, firstFreeSlot; u8 i, firstFreeSlot;
bool32 found; bool8 found;
for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++) for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++)
{ {
if (firstFreeSlot == 16 && gLockedAnimObjectEvents->objectEventIds[i] == 0) 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) u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
bool32 ableToStore; bool8 ableToStore;
u8 index; u8 index;
sprite->data[2] = 1; sprite->data[2] = 1;