diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-21 23:12:36 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-21 23:12:36 +0100 |
commit | bcffcb0c1cd1d9b9a223fa8029f33b4c3c926575 (patch) | |
tree | cd9e57cb761cad0ad93d5024d3f8c84e49e2bd9d /include/field_player_avatar.h | |
parent | df479661ffd0c270e4a8c35f37285d5d3988f592 (diff) | |
parent | a705a863d1f59411a6f18fdd95e81de76f66fd66 (diff) |
pokeblock merge conflicts
Diffstat (limited to 'include/field_player_avatar.h')
-rw-r--r-- | include/field_player_avatar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 25b7f2d71..a3c40bc42 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -9,6 +9,7 @@ void PlayerGetDestCoords(s16 *, s16 *); u8 player_get_direction_lower_nybble(void); u8 player_get_direction_upper_nybble(void); u8 player_get_x22(void); +void sub_808BCE8(void); void sub_808D074(u8); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); |