diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
| commit | cd876292d126c339bfc31c717d5bec6fe1b63f80 (patch) | |
| tree | e7e3666bc80640d9b946f79c07e8d0858600598b /src/field_player_avatar.c | |
| parent | a08cbaee0a5f06f2e6d11ceb958e36430175f220 (diff) | |
| parent | fa5bfc16279fe6c8c38392612796448495da896f (diff) | |
Merge branch 'master' into pokenav_unk_2
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index ab2667c8c..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)) @@ -1337,13 +1332,13 @@ void SetPlayerAvatarStateMask(u8 flags) gPlayerAvatar.flags |= flags; } -static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 a, u8 gender) +static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender) { u8 i; for (i = 0; i < 5; i++) { - if (gUnknown_0849750C[gender][i][0] == a) + if (gUnknown_0849750C[gender][i][0] == graphicsId) return gUnknown_0849750C[gender][i][1]; } return 1; @@ -1362,9 +1357,9 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void) return 0; } -void SetPlayerAvatarExtraStateTransition(u8 a, u8 b) +void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b) { - u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(a, gPlayerAvatar.gender); + u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender); gPlayerAvatar.unk1 |= unk | b; DoPlayerAvatarTransition(); |