summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/field_player_avatar.c11
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))