diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 12:18:32 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 12:18:32 +0200 |
| commit | b229a1c295f9c4a722959ec564a1cb86d1a9eaef (patch) | |
| tree | 59bb968ae154c586342dfee05d9cc8b2c1776b4f /include/battle.h | |
| parent | e382a73e9d706fee763723b5a275b36db3b0fc97 (diff) | |
| parent | 428dd0e0a8539b171fccc59ea717fda970a22e91 (diff) | |
Merge branch 'master' into decompile_reshow_battle_screen
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index c9d202fd0..6e41b25c1 100644 --- a/include/battle.h +++ b/include/battle.h @@ -5,6 +5,7 @@ #include "battle_util.h" #include "battle_script_commands.h" #include "battle_2.h" +#include "battle_ai_switch_items.h" /* Banks are a name given to what could be called a 'battlerId' or 'monControllerId'. @@ -476,7 +477,7 @@ struct BattleHistory struct UsedMoves usedMoves[BATTLE_BANKS_COUNT]; u8 abilities[BATTLE_BANKS_COUNT]; u8 itemEffects[BATTLE_BANKS_COUNT]; - u16 TrainerItems[BATTLE_BANKS_COUNT]; + u16 trainerItems[BATTLE_BANKS_COUNT]; u8 itemsNo; }; @@ -632,8 +633,8 @@ struct BattleStruct void (*savedCallback)(void); u16 usedHeldItems[BATTLE_BANKS_COUNT]; u8 field_C0[4]; - u8 field_C4[2]; - u8 field_C6[2]; + u8 AI_itemType[2]; + u8 AI_itemFlags[2]; u16 choicedMove[BATTLE_BANKS_COUNT]; u16 changedItems[BATTLE_BANKS_COUNT]; u8 intimidateBank; |