diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 09:33:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 09:33:58 -0600 |
| commit | 86a36767dba19e84297047addf1d1d776e2efdec (patch) | |
| tree | f2aaa9e93f8b8671491eda458963aee1027924c2 /constants | |
| parent | e3078400bbdb3e8416806127290b9a2d68cfb3b8 (diff) | |
| parent | d34de50d34d18ee64c95232202751532534c2ed9 (diff) | |
Merge pull request #501 from huderlem/event_macros
New map event macros
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/constants/battle.inc b/constants/battle.inc index 94b7a6d48..dfaa14779 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_SUN, 0 +.equiv BATTLE_WEATHER_RAIN, 1 +.equiv BATTLE_WEATHER_SANDSTORM, 2 +.equiv BATTLE_WEATHER_HAIL, 3 enum_start 1 enum ATTACK |