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_partner.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_partner.c')
| -rw-r--r-- | src/battle_controller_link_partner.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 4eb122d05..06a8d4a6a 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.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" @@ -31,7 +32,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81851A8(u8 *); // this file's functions static void LinkPartnerHandleGetMonData(void); @@ -90,7 +90,7 @@ static void LinkPartnerHandleBattleAnimation(void); static void LinkPartnerHandleLinkStandbyMsg(void); static void LinkPartnerHandleResetActionMoveSelection(void); static void LinkPartnerHandleCmd55(void); -static void SpriteCB_Null3(void); +static void LinkPartnerCmdEnd(void); static void LinkPartnerBufferRunCommand(void); static void LinkPartnerBufferExecCompleted(void); @@ -161,7 +161,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkPartnerHandleLinkStandbyMsg, LinkPartnerHandleResetActionMoveSelection, LinkPartnerHandleCmd55, - SpriteCB_Null3 + LinkPartnerCmdEnd }; static void SpriteCB_Null2(void) @@ -1687,6 +1687,6 @@ static void LinkPartnerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void SpriteCB_Null3(void) +static void LinkPartnerCmdEnd(void) { } |