summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-05-19 12:10:26 -0400
committerGitHub <noreply@github.com>2019-05-19 12:10:26 -0400
commit4661be783654c654ba66c5e5fafa1aa18e7b9213 (patch)
tree414b3654d06ebe8431c1334874a336a0c1a6d354 /constants
parent6c2d5ea50d8b2505f7eccc4283bfc32961adfb92 (diff)
parent333d2f37a811c05672f785a13af47708ccc08613 (diff)
Merge pull request #57 from SatoMew/master
Add weather labels and missing constants
Diffstat (limited to 'constants')
-rw-r--r--constants/battle.inc8
1 files changed, 4 insertions, 4 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