diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:45:26 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:45:26 -0500 |
commit | 5886f82ef5593fda68687c2e44b2feef76028ce3 (patch) | |
tree | 99c243e92cae64a2b60b5c4b86e161db9072a7b0 /src/battle_controller_recorded_opponent.c | |
parent | 80a4ee11457e82092f52a3aef5362f8b59b68633 (diff) | |
parent | bd157b301dea3526a4c373737dc8167d9a02b168 (diff) |
Merge branch 'master' into extern-cleanup
Diffstat (limited to 'src/battle_controller_recorded_opponent.c')
-rw-r--r-- | src/battle_controller_recorded_opponent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index c66a1b49c..e43c5f8ae 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -90,7 +90,7 @@ static void RecordedOpponentHandleBattleAnimation(void); static void RecordedOpponentHandleLinkStandbyMsg(void); static void RecordedOpponentHandleResetActionMoveSelection(void); static void RecordedOpponentHandleCmd55(void); -static void nullsub_119(void); +static void RecordedOpponentCmdEnd(void); static void RecordedOpponentBufferRunCommand(void); static void RecordedOpponentBufferExecCompleted(void); @@ -162,7 +162,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleLinkStandbyMsg, RecordedOpponentHandleResetActionMoveSelection, RecordedOpponentHandleCmd55, - nullsub_119 + RecordedOpponentCmdEnd }; static void nullsub_70(void) @@ -1788,6 +1788,6 @@ static void RecordedOpponentHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_119(void) +static void RecordedOpponentCmdEnd(void) { } |