diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-03-05 14:17:44 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-05 14:17:44 -0600 |
commit | 00814740183a670a2b122d9b3d708b97c5d2df4e (patch) | |
tree | 4d344d7e34c55658be30203e2c6d8ddf1bc36cef /src/battle_controller_player.c | |
parent | 842e3c8b424054319cce899f07352bd5f521c156 (diff) | |
parent | e79b6f747b2095bf78336f4b6e6998d818ce8400 (diff) |
Merge pull request #606 from DizzyEggg/angery
Fix Controllers end command function names
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r-- | src/battle_controller_player.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 6bcc97c68..a0d92f23a 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -99,7 +99,7 @@ static void PlayerHandleBattleAnimation(void); static void PlayerHandleLinkStandbyMsg(void); static void PlayerHandleResetActionMoveSelection(void); static void PlayerHandleCmd55(void); -static void nullsub_22(void); +static void PlayerCmdEnd(void); static void PlayerBufferRunCommand(void); static void HandleInputChooseTarget(void); @@ -186,7 +186,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerHandleLinkStandbyMsg, PlayerHandleResetActionMoveSelection, PlayerHandleCmd55, - nullsub_22 + PlayerCmdEnd }; static const u8 sTargetIdentities[] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT}; @@ -3105,6 +3105,6 @@ static void PlayerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_22(void) +static void PlayerCmdEnd(void) { } |