diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
| commit | dee61330769b3e3a93844c9a0ef609500fe399d3 (patch) | |
| tree | 1f36102b4133fdfe5fe2fd8a062d085e9673b062 /include/battle.h | |
| parent | dd0f19476c3a15514e3d08855cee3266fdbdf2ed (diff) | |
| parent | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index a9243182e..a36fdec23 100644 --- a/include/battle.h +++ b/include/battle.h @@ -27,7 +27,9 @@ #define BIT_SIDE 0x1 #define BIT_MON 0x2 +#define GET_BANK_IDENTITY(bank)((gBanksByIdentity[bank])) #define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE)) +#define GET_BANK_SIDE2(bank)((GET_BANK_IDENTITY(bank) & BIT_SIDE)) #define BATTLE_TYPE_DOUBLE 0x0001 #define BATTLE_TYPE_LINK 0x0002 @@ -655,7 +657,9 @@ struct BattleStruct u8 field_1A1; bool8 overworldWeatherDone; u8 atkCancellerTracker; - u8 field_1A4[240]; + u8 field_1A4[96]; + u8 field_204[104]; + u8 field_26C[40]; u8 field_294[4]; u8 field_298[8]; u8 field_2A0; @@ -915,6 +919,11 @@ struct BattleSpriteData extern struct BattleSpriteData *gBattleSpritesDataPtr; +#define BATTLE_BUFFER_LINK_SIZE 0x1000 + +extern u8 *gLinkBattleSendBuffer; +extern u8 *gLinkBattleRecvBuffer; + // Move this somewhere else #include "sprite.h" |