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_recorded_opponent.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_recorded_opponent.c')
| -rw-r--r-- | src/battle_controller_recorded_opponent.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 25e59172d..79065c2e2 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -34,7 +34,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern u16 sub_8068B48(void); // this file's functions static void RecordedOpponentHandleGetMonData(void); @@ -93,7 +92,7 @@ static void RecordedOpponentHandleBattleAnimation(void); static void RecordedOpponentHandleLinkStandbyMsg(void); static void RecordedOpponentHandleResetActionMoveSelection(void); static void RecordedOpponentHandleCmd55(void); -static void SpriteCB_Null9(void); +static void RecordedOpponentCmdEnd(void); static void RecordedOpponentBufferRunCommand(void); static void RecordedOpponentBufferExecCompleted(void); @@ -165,7 +164,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleLinkStandbyMsg, RecordedOpponentHandleResetActionMoveSelection, RecordedOpponentHandleCmd55, - SpriteCB_Null9 + RecordedOpponentCmdEnd }; static void nullsub_70(void) @@ -1791,6 +1790,6 @@ static void RecordedOpponentHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void SpriteCB_Null9(void) +static void RecordedOpponentCmdEnd(void) { } |