diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2019-06-23 18:47:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 18:47:35 +0530 |
| commit | 99703c6ab831d34e6859d8a8f53ba8e73dc4d3d9 (patch) | |
| tree | 3a712d3039d152616af58a45a13d82c40a87e58f /constants | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle.inc | 8 | ||||
| -rw-r--r-- | constants/constants.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/constants/battle.inc b/constants/battle.inc index 94b7a6d48..744399469 100644 --- a/constants/battle.inc +++ b/constants/battle.inc @@ -40,10 +40,10 @@ .equiv TARGET, 0 .equiv USER, 1 -.equiv WEATHER_SUN, 0 -.equiv WEATHER_RAIN, 1 -.equiv WEATHER_SANDSTORM, 2 -.equiv WEATHER_HAIL, 3 +.equiv BATTLE_WEATHER_SUNNY, 0 +.equiv BATTLE_WEATHER_RAIN, 1 +.equiv BATTLE_WEATHER_SANDSTORM, 2 +.equiv BATTLE_WEATHER_HAIL, 3 enum_start 1 enum ATTACK diff --git a/constants/constants.inc b/constants/constants.inc index 1ec25462f..4365e90e1 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -2,7 +2,7 @@ .include "constants/misc_constants.inc" .include "constants/type_constants.inc" .include "constants/contest_constants.inc" - .include "constants/item_data_constants.inc" +@ .include "constants/item_data_constants.inc" .include "constants/battle_move_constants.inc" .include "constants/trainer_constants.inc" .include "constants/berry_constants.inc" |