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_link_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_link_opponent.c')
| -rw-r--r-- | src/battle_controller_link_opponent.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 05da72e16..28ab4c279 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -16,6 +16,7 @@ #include "palette.h" #include "pokeball.h" #include "pokemon.h" +#include "recorded_battle.h" #include "reshow_battle_screen.h" #include "sound.h" #include "string_util.h" @@ -32,8 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81851A8(u8 *); -extern u16 sub_8068B48(void); // this file's functions static void LinkOpponentHandleGetMonData(void); @@ -92,7 +91,7 @@ static void LinkOpponentHandleBattleAnimation(void); static void LinkOpponentHandleLinkStandbyMsg(void); static void LinkOpponentHandleResetActionMoveSelection(void); static void LinkOpponentHandleCmd55(void); -static void nullsub_92(void); +static void LinkOpponentCmdEnd(void); static void LinkOpponentBufferRunCommand(void); static void LinkOpponentBufferExecCompleted(void); @@ -164,7 +163,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkOpponentHandleLinkStandbyMsg, LinkOpponentHandleResetActionMoveSelection, LinkOpponentHandleCmd55, - nullsub_92 + LinkOpponentCmdEnd }; static void nullsub_28(void) @@ -1857,6 +1856,6 @@ static void LinkOpponentHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_92(void) +static void LinkOpponentCmdEnd(void) { } |