diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-23 13:36:55 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-23 13:36:55 +0200 |
| commit | 5b703079627cf11a123e3f1a7e7f0e5e0fbeb9ed (patch) | |
| tree | cdd424af6aa370aa8af7dcf2bb0f5a2ce48965ad /include/battle.h | |
| parent | 7d1373e3fa239d74d69b5b3a7cb78b2272a6f54d (diff) | |
revert merge coz its bugged
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/battle.h b/include/battle.h index f731168dd..855ff464e 100644 --- a/include/battle.h +++ b/include/battle.h @@ -256,25 +256,6 @@ #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; @@ -282,9 +263,6 @@ struct TrainerMonNoItemDefaultMoves u16 species; }; -u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg); -u8 GetBankSide(u8 bank); - struct TrainerMonItemDefaultMoves { u16 iv; |