diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
| commit | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /src/field_control_avatar.c | |
| parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
Fix conflicts
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 738826020..3451ad22d 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -179,7 +179,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) input->dpadDirection = DIR_EAST; } -int sub_809C014(struct FieldInput *input) +int ProcessPlayerFieldInput(struct FieldInput *input) { struct MapPosition position; u8 playerDirection; |