Merge branch 'master' into decompile_battle_controllers

1 files changed, 22 insertions, 0 deletions

diff --git a/include/battle.h b/include/battle.h
index 855ff464e..f731168dd 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -256,6 +256,25 @@
 #define TYPE_MUL_NORMAL             10
 #define TYPE_MUL_SUPER_EFFECTIVE    20
 
+#define BS_GET_TARGET                   0
+#define BS_GET_ATTACKER                 1
+#define BS_GET_EFFECT_BANK              2
+#define BS_ATTACKER_WITH_PARTNER        4 // for atk98_status_icon_update
+#define BS_GET_ATTACKER_SIDE            8 // for atk1E_jumpifability
+#define BS_GET_NOT_ATTACKER_SIDE        9 // for atk1E_jumpifability
+#define BS_GET_SCRIPTING_BANK           10
+#define BS_GET_OPPONENT1                12
+#define BS_GET_PLAYER2                  13
+#define BS_GET_OPPONENT2                14
+
+// for battle script commands
+#define CMP_EQUAL               0x0
+#define CMP_NOT_EQUAL           0x1
+#define CMP_GREATER_THAN        0x2
+#define CMP_LESS_THAN           0x3
+#define CMP_COMMON_BITS         0x4
+#define CMP_NO_COMMON_BITS      0x5
+
 struct TrainerMonNoItemDefaultMoves
 {
     u16 iv;
@@ -263,6 +282,9 @@ struct TrainerMonNoItemDefaultMoves
     u16 species;
 };
 
+u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
+u8 GetBankSide(u8 bank);
+
 struct TrainerMonItemDefaultMoves
 {
     u16 iv;