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

8
src/script_movement.c
View File

@@ -189,7 +189,7 @@ static void UnfreezeObjects(u8 taskId)
for (i = 0; i < 16; i++, pEventObjId++)
{
if (*pEventObjId != 0xFF)
npc_sync_anim_pause_bits(&gEventObjects[*pEventObjId]);
UnfreezeEventObject(&gEventObjects[*pEventObjId]);
}
}
@@ -210,8 +210,8 @@ static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d)
{
u8 var;
if (EventObjectIsSpecialAnimActive(&gEventObjects[eventObjId])
&& !EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[eventObjId]))
if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId])
&& !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]))
return;
var = *d;
@@ -222,7 +222,7 @@ static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d)
}
else
{
if (!EventObjectSetSpecialAnim(&gEventObjects[eventObjId], var))
if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], var))
{
d++;
npc_obj_offscreen_culling_and_flag_update(b, d);