diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
commit | b65da491a97e77ed2aa122ab7342c7fb94d35606 (patch) | |
tree | 02e7c17f29426d6bca7bae4d133e1462dc81c355 /include/battle_controller_player.h | |
parent | 9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff) | |
parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) |
merge with master, fix 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 |