recorded opponent controller is done

This commit is contained in:
DizzyEggg 2017-10-25 18:59:07 +02:00
parent 91b010299f
commit a9bc67dbb0
9 changed files with 1716 additions and 6003 deletions

File diff suppressed because it is too large Load Diff

View File

@ -233,7 +233,6 @@ SECTIONS {
asm/pokemon_animation.o(.text);
asm/recorded_battle.o(.text);
src/battle_controller_recorded_opponent.o(.text);
asm/battle_controller_recorded_opponent.o(.text);
src/battle_controller_recorded_player.o(.text);
src/battle_dome_cards.o(.text);
src/lilycove_lady.o(.text);

View File

@ -135,7 +135,7 @@ static void sub_8067618(u8 taskId);
static void sub_80676FC(struct Sprite *sprite);
static void sub_806782C(void);
static void (*const gLinkOpponentBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
static void (*const sLinkOpponentBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{
LinkOpponentHandleGetMonData,
LinkOpponentHandleGetRawMonData,
@ -209,8 +209,8 @@ static void LinkOpponentBufferRunCommand(void)
{
if (gBattleExecBuffer & gBitTable[gActiveBank])
{
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(gLinkOpponentBufferCommands))
gLinkOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sLinkOpponentBufferCommands))
sLinkOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
else
LinkOpponentBufferExecCompleted();
}

View File

@ -129,7 +129,7 @@ static void LinkPartnerDoMoveAnimation(void);
static void sub_814DCCC(u8 taskId);
static void sub_814DE9C(void);
static void (*const gLinkPartnerBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
static void (*const sLinkPartnerBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{
LinkPartnerHandleGetMonData,
LinkPartnerHandleGetRawMonData,
@ -203,8 +203,8 @@ static void LinkPartnerBufferRunCommand(void)
{
if (gBattleExecBuffer & gBitTable[gActiveBank])
{
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(gLinkPartnerBufferCommands))
gLinkPartnerBufferCommands[gBattleBufferA[gActiveBank][0]]();
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sLinkPartnerBufferCommands))
sLinkPartnerBufferCommands[gBattleBufferA[gActiveBank][0]]();
else
LinkPartnerBufferExecCompleted();
}

View File

@ -169,7 +169,7 @@ static void PlayerDoMoveAnimation(void);
static void task05_08033660(u8 taskId);
static void sub_805CE38(void);
static void (*const gPlayerBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
static void (*const sPlayerBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{
PlayerHandleGetMonData,
PlayerHandleGetRawMonData,
@ -266,8 +266,8 @@ static void PlayerBufferRunCommand(void)
{
if (gBattleExecBuffer & gBitTable[gActiveBank])
{
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(gPlayerBufferCommands))
gPlayerBufferCommands[gBattleBufferA[gActiveBank][0]]();
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sPlayerBufferCommands))
sPlayerBufferCommands[gBattleBufferA[gActiveBank][0]]();
else
PlayerBufferExecCompleted();
}

View File

@ -135,7 +135,7 @@ static void PlayerPartnerDoMoveAnimation(void);
static void sub_81BE2C8(u8 taskId);
static void sub_81BE498(void);
static void (*const gPlayerPartnerBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
static void (*const sPlayerPartnerBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{
PlayerPartnerHandleGetMonData,
PlayerPartnerHandleGetRawMonData,
@ -218,8 +218,8 @@ static void PlayerPartnerBufferRunCommand(void)
{
if (gBattleExecBuffer & gBitTable[gActiveBank])
{
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(gPlayerPartnerBufferCommands))
gPlayerPartnerBufferCommands[gBattleBufferA[gActiveBank][0]]();
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sPlayerPartnerBufferCommands))
sPlayerPartnerBufferCommands[gBattleBufferA[gActiveBank][0]]();
else
PlayerPartnerBufferExecCompleted();
}

File diff suppressed because it is too large Load Diff

View File

@ -132,7 +132,7 @@ static void RecordedPlayerDoMoveAnimation(void);
static void sub_818CC24(u8 taskId);
static void sub_818CDF4(void);
static void (*const gRecordedPlayerBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
static void (*const sRecordedPlayerBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{
RecordedPlayerHandleGetMonData,
RecordedPlayerHandleGetRawMonData,
@ -206,8 +206,8 @@ static void RecordedPlayerBufferRunCommand(void)
{
if (gBattleExecBuffer & gBitTable[gActiveBank])
{
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(gRecordedPlayerBufferCommands))
gRecordedPlayerBufferCommands[gBattleBufferA[gActiveBank][0]]();
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sRecordedPlayerBufferCommands))
sRecordedPlayerBufferCommands[gBattleBufferA[gActiveBank][0]]();
else
RecordedPlayerBufferExecCompleted();
}

View File

@ -110,7 +110,7 @@ static void SafariBufferRunCommand(void);
static void SafariBufferExecCompleted(void);
static void CompleteWhenChosePokeblock(void);
static void (*const gSafariBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
static void (*const sSafariBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{
SafariHandleGetMonData,
SafariHandleGetRawMonData,
@ -184,8 +184,8 @@ static void SafariBufferRunCommand(void)
{
if (gBattleExecBuffer & gBitTable[gActiveBank])
{
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(gSafariBufferCommands))
gSafariBufferCommands[gBattleBufferA[gActiveBank][0]]();
if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sSafariBufferCommands))
sSafariBufferCommands[gBattleBufferA[gActiveBank][0]]();
else
SafariBufferExecCompleted();
}