diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-27 10:27:36 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-27 10:27:36 +0800 |
| commit | ca130a8aeb39d05340495766a1f33dc854f6b4a1 (patch) | |
| tree | 37613c40377ae380446a62c7cfda0ed8c4175e5a /include/battle.h | |
| parent | a61be4c32d8b81bd0ee414f44e1b0c9095778148 (diff) | |
thru atkc0
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/battle.h b/include/battle.h index 8abb95333..88b440a22 100644 --- a/include/battle.h +++ b/include/battle.h @@ -147,19 +147,6 @@ #define TYPE_FORESIGHT 0xFE #define TYPE_ENDTABLE 0xFF -#define BS_GET_TARGET 0 -#define BS_GET_ATTACKER 1 -#define BS_GET_EFFECT_BANK 2 -#define BS_GET_gBank1 3 -#define BS_GET_BANK_0 7 -#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 @@ -942,5 +929,6 @@ extern u8 gLeveledUpInBattle; extern u16 gLastResultingMoves[MAX_BATTLERS_COUNT]; extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; +extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT]; #endif // GUARD_BATTLE_H |