diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
commit | dee61330769b3e3a93844c9a0ef609500fe399d3 (patch) | |
tree | 1f36102b4133fdfe5fe2fd8a062d085e9673b062 /include/battle_controller_player.h | |
parent | dd0f19476c3a15514e3d08855cee3266fdbdf2ed (diff) | |
parent | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff) |
fix merge conflicts
Diffstat (limited to 'include/battle_controller_player.h')
-rw-r--r-- | include/battle_controller_player.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/battle_controller_player.h b/include/battle_controller_player.h deleted file mode 100644 index 6d095efe7..000000000 --- a/include/battle_controller_player.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_BATTLE_CONTROLLER_PLAYER_H -#define GUARD_BATTLE_CONTROLLER_PLAYER_H - -void ActionSelectionCreateCursorAt(u8 cursorPos, u8 unused); -void ActionSelectionDestroyCursorAt(u8 cursorPos); - -#endif // GUARD_BATTLE_CONTROLLER_PLAYER_H |