diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 16:24:35 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 16:24:35 -0700 |
| commit | c36715e3b692ac116a5f8d32b5c2bde7d5ce8f8e (patch) | |
| tree | 23e6352ca5c60b10723b152aa08cdae799393767 /include/battle.h | |
| parent | 818801cf5ab0c696f2460922753f921726aac6bb (diff) | |
Use 'battler' instead of 'bank'
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/battle.h b/include/battle.h index cea83fc7d..af0b48013 100644 --- a/include/battle.h +++ b/include/battle.h @@ -4,21 +4,7 @@ #include "sprite.h" #include "constants/battle_constants.h" -/* - Banks are a name given to what could be called a 'battlerId' or 'monControllerId'. - Each bank has a value consisting of two bits. - 0x1 bit is responsible for the side, 0 = player's side, 1 = opponent's side. - 0x2 bit is responsible for the id of sent out pokemon. 0 means it's the first sent out pokemon, 1 it's the second one. (Triple battle didn't exist at the time yet.) -*/ - -#define BATTLE_BANKS_COUNT 4 - -#define B_POSITION_PLAYER_LEFT 0 -#define B_POSITION_OPPONENT_LEFT 1 -#define B_POSITION_PLAYER_RIGHT 2 -#define B_POSITION_OPPONENT_RIGHT 3 - -#define GET_BATTLER_POSITION(bank)((gBanksByIdentity[bank])) +#define GET_BATTLER_POSITION(bank)((gBattlerPositions[bank])) #define GET_BATTLER_SIDE(bank)((GetBattlerPosition(bank) & BIT_SIDE)) #define GET_BATTLER_SIDE2(bank)((GET_BATTLER_POSITION(bank) & BIT_SIDE)) |