Merge pull request #377 from camthesaxman/decompile_battle_8

decompile battle_8
This commit is contained in:
Cameron Hall 2017-07-21 22:40:49 -05:00 committed by GitHub
commit 297f1c2502
5 changed files with 1646 additions and 5224 deletions

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,7 @@ enum
// battle_ai
void BattleAI_SetupAIData(void);
u8 BattleAI_GetAIActionToUse(void);
void BattleAI_DoAIProcessing(void);
void sub_810745C(void);
void AIStackPushVar(u8 *);

View File

@ -58,7 +58,7 @@ SECTIONS {
asm/battle_5.o(.text);
src/battle_6.o(.text);
src/battle_7.o(.text);
asm/battle_8.o(.text);
src/battle_8.o(.text);
asm/battle_9.o(.text);
src/battle_10.o(.text);
src/pokemon_1.o(.text);

View File

@ -72,7 +72,7 @@ extern void sub_80375B4(void);
extern void sub_8010384(struct Sprite *);
extern void sub_8037B78(void);
extern u8 sub_8031720();
extern u8 mplay_80342A4();
extern bool8 mplay_80342A4(u8);
extern void ExecuteMoveAnim();
extern void sub_80326EC();
extern void sub_8031F24(void);
@ -887,6 +887,7 @@ void sub_8039A30(void)
gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
// Dead code. sub_8031720 always returns 0.
if (sub_8031720(r0, gUnknown_0202F7C4) != 0)
{
dp01_tbl4_exec_completed();

1642
src/battle_8.c Normal file

File diff suppressed because it is too large Load Diff