diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-07-30 00:03:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 00:03:36 -0500 |
| commit | cb4ba655608f4b4eded9d49a11f45c8fa316702a (patch) | |
| tree | 03767293c5be0a79ce78f8b39610693a229e2dc4 | |
| parent | 136da953d6888562e76b0694a98988888adcd6d8 (diff) | |
| parent | c77dc74410be69f550dbf9013b36e6ead3044cb1 (diff) | |
Merge pull request #758 from ultima-soul/nonmatching
Match TryInterruptEventObjectSpecialAnim without asm hack.
| -rw-r--r-- | src/field_player_avatar.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index b322fc1c7..6d62cdc4a 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -336,14 +336,9 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys) static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventObj, u8 direction) { - #ifdef NONMATCHING - u8 r5 = direction; - u8 r6 = direction; - #else - u8 r5 = direction; - register u8 r6 asm("r6") = direction; - #endif - //a very bad HACK + u8 r5 = direction; + u8 r6 = direction; + r6++; r6--; if (EventObjectIsMovementOverridden(playerEventObj) && !EventObjectClearHeldMovementIfFinished(playerEventObj)) |