diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-09 22:54:57 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-09 22:54:57 +0100 |
| commit | 711a345fd43da3edf0d1eed99e9df646c436ba16 (patch) | |
| tree | e8fa8e32ed217ccd7f8d46e333bedfdd9977a3d7 /include/battle.h | |
| parent | 70ec55386ce640b6844f7c0bf93a7a447888cb66 (diff) | |
| parent | ae214eca8b9086db64af3741aecaf05acf007b96 (diff) | |
fix conflicts
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h index b0554a914..ae8a1c98a 100644 --- a/include/battle.h +++ b/include/battle.h @@ -563,6 +563,14 @@ struct BattleStruct #define IS_MOVE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY) #define IS_MOVE_SPECIAL(moveType)(moveType > TYPE_MYSTERY) +#define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0)) + +#define IS_BATTLER_OF_TYPE(battlerId, type)((gBattleMons[battlerId].type1 == type || gBattleMons[battlerId].type2 == type)) +#define SET_BATTLER_TYPE(battlerId, type) \ +{ \ + gBattleMons[battlerId].type1 = type; \ + gBattleMons[battlerId].type2 = type; \ +} #define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8 #define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40 |