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

Match TryInterruptEventObjectSpecialAnim without asm hack.

Browse Source
This commit is contained in:
ultima-soul 2019-07-29 17:52:01 -07:00
parent 136da953d6
commit c77dc74410
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/field_player_avatar.c
View File

@ -336,14 +336,9 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys)
static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventObj, u8 direction) static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventObj, u8 direction)
{ {
#ifdef NONMATCHING
u8 r5 = direction; u8 r5 = direction;
u8 r6 = direction; u8 r6 = direction;
#else r6++; r6--;
u8 r5 = direction;
register u8 r6 asm("r6") = direction;
#endif
//a very bad HACK
if (EventObjectIsMovementOverridden(playerEventObj) if (EventObjectIsMovementOverridden(playerEventObj)
&& !EventObjectClearHeldMovementIfFinished(playerEventObj)) && !EventObjectClearHeldMovementIfFinished(playerEventObj))