atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #606 from DizzyEggg/angery

Browse source 
Fix Controllers end command function names
This commit is contained in:
Diegoisawesome 2019-03-05 14:17:44 -06:00 committed by GitHub
commit 0081474018
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/battle_controller_link_opponent.c
View file

@ -16,6 +16,7 @@
#include "palette.h" #include "palette.h"
#include "pokeball.h" #include "pokeball.h"
#include "pokemon.h" #include "pokemon.h"
#include "recorded_battle.h"
#include "reshow_battle_screen.h" #include "reshow_battle_screen.h"
#include "sound.h" #include "sound.h"
#include "string_util.h" #include "string_util.h"
@ -32,8 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern void sub_81851A8(u8 *);
extern u16 sub_8068B48(void);
// this file's functions // this file's functions
static void LinkOpponentHandleGetMonData(void); static void LinkOpponentHandleGetMonData(void);
@ -92,7 +91,7 @@ static void LinkOpponentHandleBattleAnimation(void);
static void LinkOpponentHandleLinkStandbyMsg(void); static void LinkOpponentHandleLinkStandbyMsg(void);
static void LinkOpponentHandleResetActionMoveSelection(void); static void LinkOpponentHandleResetActionMoveSelection(void);
static void LinkOpponentHandleCmd55(void); static void LinkOpponentHandleCmd55(void);
static void nullsub_92(void); static void LinkOpponentCmdEnd(void);
static void LinkOpponentBufferRunCommand(void); static void LinkOpponentBufferRunCommand(void);
static void LinkOpponentBufferExecCompleted(void); static void LinkOpponentBufferExecCompleted(void);
@ -164,7 +163,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
LinkOpponentHandleLinkStandbyMsg, LinkOpponentHandleLinkStandbyMsg,
LinkOpponentHandleResetActionMoveSelection, LinkOpponentHandleResetActionMoveSelection,
LinkOpponentHandleCmd55, LinkOpponentHandleCmd55,
nullsub_92 LinkOpponentCmdEnd
}; };
static void nullsub_28(void) static void nullsub_28(void)
@ -1857,6 +1856,6 @@ static void LinkOpponentHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
} }
static void nullsub_92(void) static void LinkOpponentCmdEnd(void)
{ {
} }

8
src/battle_controller_link_partner.c
View file

@ -16,6 +16,7 @@
#include "palette.h" #include "palette.h"
#include "pokeball.h" #include "pokeball.h"
#include "pokemon.h" #include "pokemon.h"
#include "recorded_battle.h"
#include "reshow_battle_screen.h" #include "reshow_battle_screen.h"
#include "sound.h" #include "sound.h"
#include "string_util.h" #include "string_util.h"
@ -31,7 +32,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern void sub_81851A8(u8 *);
// this file's functions // this file's functions
static void LinkPartnerHandleGetMonData(void); static void LinkPartnerHandleGetMonData(void);
@ -90,7 +90,7 @@ static void LinkPartnerHandleBattleAnimation(void);
static void LinkPartnerHandleLinkStandbyMsg(void); static void LinkPartnerHandleLinkStandbyMsg(void);
static void LinkPartnerHandleResetActionMoveSelection(void); static void LinkPartnerHandleResetActionMoveSelection(void);
static void LinkPartnerHandleCmd55(void); static void LinkPartnerHandleCmd55(void);
static void SpriteCB_Null3(void); static void LinkPartnerCmdEnd(void);
static void LinkPartnerBufferRunCommand(void); static void LinkPartnerBufferRunCommand(void);
static void LinkPartnerBufferExecCompleted(void); static void LinkPartnerBufferExecCompleted(void);
@ -161,7 +161,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
LinkPartnerHandleLinkStandbyMsg, LinkPartnerHandleLinkStandbyMsg,
LinkPartnerHandleResetActionMoveSelection, LinkPartnerHandleResetActionMoveSelection,
LinkPartnerHandleCmd55, LinkPartnerHandleCmd55,
SpriteCB_Null3 LinkPartnerCmdEnd
}; };
static void SpriteCB_Null2(void) static void SpriteCB_Null2(void)
@ -1687,6 +1687,6 @@ static void LinkPartnerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
} }
static void SpriteCB_Null3(void) static void LinkPartnerCmdEnd(void)
{ {
} }

6
src/battle_controller_opponent.c
View file

@ -97,7 +97,7 @@ static void OpponentHandleBattleAnimation(void);
static void OpponentHandleLinkStandbyMsg(void); static void OpponentHandleLinkStandbyMsg(void);
static void OpponentHandleResetActionMoveSelection(void); static void OpponentHandleResetActionMoveSelection(void);
static void OpponentHandleCmd55(void); static void OpponentHandleCmd55(void);
static void nullsub_91(void); static void OpponentCmdEnd(void);
static void OpponentBufferRunCommand(void); static void OpponentBufferRunCommand(void);
static void OpponentBufferExecCompleted(void); static void OpponentBufferExecCompleted(void);
@ -169,7 +169,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
OpponentHandleLinkStandbyMsg, OpponentHandleLinkStandbyMsg,
OpponentHandleResetActionMoveSelection, OpponentHandleResetActionMoveSelection,
OpponentHandleCmd55, OpponentHandleCmd55,
nullsub_91 OpponentCmdEnd
}; };
// unknown unused data // unknown unused data
@ -2003,6 +2003,6 @@ static void OpponentHandleCmd55(void)
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
static void nullsub_91(void) static void OpponentCmdEnd(void)
{ {
} }

6
src/battle_controller_player.c
View file

@ -99,7 +99,7 @@ static void PlayerHandleBattleAnimation(void);
static void PlayerHandleLinkStandbyMsg(void); static void PlayerHandleLinkStandbyMsg(void);
static void PlayerHandleResetActionMoveSelection(void); static void PlayerHandleResetActionMoveSelection(void);
static void PlayerHandleCmd55(void); static void PlayerHandleCmd55(void);
static void nullsub_22(void); static void PlayerCmdEnd(void);
static void PlayerBufferRunCommand(void); static void PlayerBufferRunCommand(void);
static void HandleInputChooseTarget(void); static void HandleInputChooseTarget(void);
@ -186,7 +186,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
PlayerHandleLinkStandbyMsg, PlayerHandleLinkStandbyMsg,
PlayerHandleResetActionMoveSelection, PlayerHandleResetActionMoveSelection,
PlayerHandleCmd55, PlayerHandleCmd55,
nullsub_22 PlayerCmdEnd
}; };
static const u8 sTargetIdentities[] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT}; 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; gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
} }
static void nullsub_22(void) static void PlayerCmdEnd(void)
{ {
} }

6
src/battle_controller_player_partner.c
View file

@ -90,7 +90,7 @@ static void PlayerPartnerHandleBattleAnimation(void);
static void PlayerPartnerHandleLinkStandbyMsg(void); static void PlayerPartnerHandleLinkStandbyMsg(void);
static void PlayerPartnerHandleResetActionMoveSelection(void); static void PlayerPartnerHandleResetActionMoveSelection(void);
static void PlayerPartnerHandleCmd55(void); static void PlayerPartnerHandleCmd55(void);
static void nullsub_128(void); static void PlayerPartnerCmdEnd(void);
static void PlayerPartnerBufferRunCommand(void); static void PlayerPartnerBufferRunCommand(void);
static void PlayerPartnerBufferExecCompleted(void); static void PlayerPartnerBufferExecCompleted(void);
@ -167,7 +167,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
PlayerPartnerHandleLinkStandbyMsg, PlayerPartnerHandleLinkStandbyMsg,
PlayerPartnerHandleResetActionMoveSelection, PlayerPartnerHandleResetActionMoveSelection,
PlayerPartnerHandleCmd55, PlayerPartnerHandleCmd55,
nullsub_128 PlayerPartnerCmdEnd
}; };
// unknown unused data // unknown unused data
@ -1928,6 +1928,6 @@ static void PlayerPartnerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
} }
static void nullsub_128(void) static void PlayerPartnerCmdEnd(void)
{ {
} }

7
src/battle_controller_recorded_opponent.c
View file

@ -34,7 +34,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern u16 sub_8068B48(void);
// this file's functions // this file's functions
static void RecordedOpponentHandleGetMonData(void); static void RecordedOpponentHandleGetMonData(void);
@ -93,7 +92,7 @@ static void RecordedOpponentHandleBattleAnimation(void);
static void RecordedOpponentHandleLinkStandbyMsg(void); static void RecordedOpponentHandleLinkStandbyMsg(void);
static void RecordedOpponentHandleResetActionMoveSelection(void); static void RecordedOpponentHandleResetActionMoveSelection(void);
static void RecordedOpponentHandleCmd55(void); static void RecordedOpponentHandleCmd55(void);
static void SpriteCB_Null9(void); static void RecordedOpponentCmdEnd(void);
static void RecordedOpponentBufferRunCommand(void); static void RecordedOpponentBufferRunCommand(void);
static void RecordedOpponentBufferExecCompleted(void); static void RecordedOpponentBufferExecCompleted(void);
@ -165,7 +164,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void
RecordedOpponentHandleLinkStandbyMsg, RecordedOpponentHandleLinkStandbyMsg,
RecordedOpponentHandleResetActionMoveSelection, RecordedOpponentHandleResetActionMoveSelection,
RecordedOpponentHandleCmd55, RecordedOpponentHandleCmd55,
SpriteCB_Null9 RecordedOpponentCmdEnd
}; };
static void nullsub_70(void) static void nullsub_70(void)
@ -1791,6 +1790,6 @@ static void RecordedOpponentHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
} }
static void SpriteCB_Null9(void) static void RecordedOpponentCmdEnd(void)
{ {
} }

6
src/battle_controller_recorded_player.c
View file

@ -89,7 +89,7 @@ static void RecordedPlayerHandleBattleAnimation(void);
static void RecordedPlayerHandleLinkStandbyMsg(void); static void RecordedPlayerHandleLinkStandbyMsg(void);
static void RecordedPlayerHandleResetActionMoveSelection(void); static void RecordedPlayerHandleResetActionMoveSelection(void);
static void RecordedPlayerHandleCmd55(void); static void RecordedPlayerHandleCmd55(void);
static void nullsub_121(void); static void RecordedPlayerCmdEnd(void);
static void RecordedPlayerBufferRunCommand(void); static void RecordedPlayerBufferRunCommand(void);
static void RecordedPlayerBufferExecCompleted(void); static void RecordedPlayerBufferExecCompleted(void);
@ -160,7 +160,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void)
RecordedPlayerHandleLinkStandbyMsg, RecordedPlayerHandleLinkStandbyMsg,
RecordedPlayerHandleResetActionMoveSelection, RecordedPlayerHandleResetActionMoveSelection,
RecordedPlayerHandleCmd55, RecordedPlayerHandleCmd55,
nullsub_121 RecordedPlayerCmdEnd
}; };
static void nullsub_120(void) static void nullsub_120(void)
@ -1808,6 +1808,6 @@ static void RecordedPlayerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
} }
static void nullsub_121(void) static void RecordedPlayerCmdEnd(void)
{ {
} }

6
src/battle_controller_safari.c
View file

@ -84,7 +84,7 @@ static void SafariHandleBattleAnimation(void);
static void SafariHandleLinkStandbyMsg(void); static void SafariHandleLinkStandbyMsg(void);
static void SafariHandleResetActionMoveSelection(void); static void SafariHandleResetActionMoveSelection(void);
static void SafariHandleCmd55(void); static void SafariHandleCmd55(void);
static void SpriteCB_Null5(void); static void SafariCmdEnd(void);
static void SafariBufferRunCommand(void); static void SafariBufferRunCommand(void);
static void SafariBufferExecCompleted(void); static void SafariBufferExecCompleted(void);
@ -148,7 +148,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
SafariHandleLinkStandbyMsg, SafariHandleLinkStandbyMsg,
SafariHandleResetActionMoveSelection, SafariHandleResetActionMoveSelection,
SafariHandleCmd55, SafariHandleCmd55,
SpriteCB_Null5 SafariCmdEnd
}; };
static void SpriteCB_Null4(void) static void SpriteCB_Null4(void)
@ -688,6 +688,6 @@ static void SafariHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_81595E4; gBattlerControllerFuncs[gActiveBattler] = sub_81595E4;
} }
static void SpriteCB_Null5(void) static void SafariCmdEnd(void)
{ {
} }

6
src/battle_controller_wally.c
View file

@ -92,7 +92,7 @@ static void WallyHandleBattleAnimation(void);
static void WallyHandleLinkStandbyMsg(void); static void WallyHandleLinkStandbyMsg(void);
static void WallyHandleResetActionMoveSelection(void); static void WallyHandleResetActionMoveSelection(void);
static void WallyHandleCmd55(void); static void WallyHandleCmd55(void);
static void SpriteCB_Null8(void); static void WallyCmdEnd(void);
static void WallyBufferRunCommand(void); static void WallyBufferRunCommand(void);
static void WallyBufferExecCompleted(void); static void WallyBufferExecCompleted(void);
@ -161,7 +161,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
WallyHandleLinkStandbyMsg, WallyHandleLinkStandbyMsg,
WallyHandleResetActionMoveSelection, WallyHandleResetActionMoveSelection,
WallyHandleCmd55, WallyHandleCmd55,
SpriteCB_Null8 WallyCmdEnd
}; };
static void SpriteCB_Null7(void) static void SpriteCB_Null7(void)
@ -1559,6 +1559,6 @@ static void WallyHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
} }
static void SpriteCB_Null8(void) static void WallyCmdEnd(void)
{ {
} }