diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-09-01 16:07:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 16:07:57 -0500 |
| commit | 4418189d4cf94bd5f837611da2dcb6147709d653 (patch) | |
| tree | 5f9887cdc8a1b7b794c10b302da0bedbba7c734b /include/constants | |
| parent | 1895383352da3bd5a4f4990fab045ae3610937fc (diff) | |
| parent | 528a1e9ed0f64040fce6148eac875cda913384ec (diff) | |
Merge pull request #309 from DizzyEggg/types_manage
Various labelling
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle.h | 2 | ||||
| -rw-r--r-- | include/constants/battle_ai.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index b3f9d919a..e5ca9d7ae 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -252,7 +252,7 @@ #define MOVE_EFFECT_RAPIDSPIN 0x23 #define MOVE_EFFECT_REMOVE_PARALYSIS 0x24 #define MOVE_EFFECT_ATK_DEF_DOWN 0x25 -#define MOVE_EFFECT_RECOIL_33_PARALYSIS 0x26 +#define MOVE_EFFECT_RECOIL_33 0x26 #define MOVE_EFFECT_ATK_PLUS_2 0x27 #define MOVE_EFFECT_DEF_PLUS_2 0x28 #define MOVE_EFFECT_SPD_PLUS_2 0x29 diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h index 7d2c70307..4c3a45dc6 100644 --- a/include/constants/battle_ai.h +++ b/include/constants/battle_ai.h @@ -35,8 +35,8 @@ // script's table id to bit #define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0) -#define AI_SCRIPT_CHECK_VIABILITY (1 << 1) -#define AI_SCRIPT_TRY_TO_FAINT (1 << 2) +#define AI_SCRIPT_TRY_TO_FAINT (1 << 1) +#define AI_SCRIPT_CHECK_VIABILITY (1 << 2) #define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3) #define AI_SCRIPT_RISKY (1 << 4) #define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5) |