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

recorded opponent controller is done

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5916
asm/battle_controller_recorded_opponent.s
View file

File diff suppressed because it is too large Load diff

1
ld_script.txt
View file

@ -233,7 +233,6 @@ SECTIONS {
asm/pokemon_animation.o(.text); asm/pokemon_animation.o(.text);
asm/recorded_battle.o(.text); asm/recorded_battle.o(.text);
src/battle_controller_recorded_opponent.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_controller_recorded_player.o(.text);
src/battle_dome_cards.o(.text); src/battle_dome_cards.o(.text);
src/lilycove_lady.o(.text); src/lilycove_lady.o(.text);

6
src/battle_controller_link_opponent.c
View file

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

6
src/battle_controller_link_partner.c
View file

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

6
src/battle_controller_player.c
View file

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

6
src/battle_controller_player_partner.c
View file

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

1766
src/battle_controller_recorded_opponent.c
View file

File diff suppressed because it is too large Load diff

6
src/battle_controller_recorded_player.c
View file

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

6
src/battle_controller_safari.c
View file

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