diff options
| author | Tetrable <atiftetra@gmail.com> | 2018-09-09 20:42:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 20:42:23 +0100 |
| commit | 3a0c26887efb6abc8106671ceefcc098737d823b (patch) | |
| tree | 930dcf2dc217011c45671f3bf2017ec9111fd6ed /include/constants | |
| parent | 5a53d6d1fb304736c1fb3c222192a3b722707bca (diff) | |
| parent | e1834c9d7bc961f872169e056b788fec04f39867 (diff) | |
Merge pull request #3 from pret/master
merge
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle.h | 2 | ||||
| -rw-r--r-- | include/constants/battle_ai.h | 4 | ||||
| -rw-r--r-- | include/constants/region_map_sections.h | 2 |
3 files changed, 5 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) diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h index 8ff75dfa9..12c894367 100644 --- a/include/constants/region_map_sections.h +++ b/include/constants/region_map_sections.h @@ -220,4 +220,6 @@ #define MAPSEC_IN_GAME_TRADE 0xFE #define MAPSEC_FATEFUL_ENCOUNTER 0xFF +#define MAPSEC_SUBTRACT_KANTO (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC) + #endif //GUARD_REGIONMAPSEC_H |