dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Bring all movement function names up-to-date with pokeruby

Browse Source
This commit is contained in:
Marcus Huderle
2018-06-13 17:51:26 -05:00
parent aa9a45c16f
commit 4d13e3394a
35 changed files with 5867 additions and 4059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_obj_lock.c
+4 -4
View File
@@ -90,7 +90,7 @@ void LockSelectedEventObject(void)
void sub_80984F4(void)
{
u8 objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]);
EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
sub_80D338C();
UnfreezeEventObjects();
}
@@ -100,9 +100,9 @@ void sub_8098524(void)
u8 objectId;
if (gEventObjects[gSelectedEventObject].active)
EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]);
EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]);
EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
sub_80D338C();
UnfreezeEventObjects();
}
@@ -114,7 +114,7 @@ void sub_8098574(void)
void sub_809859C(void)
{
EventObjectClearAnimIfSpecialAnimActive(&gEventObjects[gSelectedEventObject]);
EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]);
}
static void sub_80985BC(u8 taskId)