summaryrefslogtreecommitdiff
path: root/include/constants/battle_ai.h
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-01-23 15:33:01 -0500
committerGitHub <noreply@github.com>2020-01-23 15:33:01 -0500
commit85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (patch)
tree252bafc0e59e3531c80e3b25b0b0ede2e1373201 /include/constants/battle_ai.h
parent5435bc4325407969b00dba8c9623fbb4f02d8cd1 (diff)
parenta01d83a4341cd0cdad01fe2d0b96920301257f2a (diff)
Merge pull request #237 from GriffinRichards/sync-ai
Sync AI scripts
Diffstat (limited to 'include/constants/battle_ai.h')
-rw-r--r--include/constants/battle_ai.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h
index f55661b91..d23648f39 100644
--- a/include/constants/battle_ai.h
+++ b/include/constants/battle_ai.h
@@ -23,7 +23,7 @@
#define AI_EFFECTIVENESS_x0 0
// ai weather
-#define AI_WEATHER_SUNNY 0
+#define AI_WEATHER_SUN 0
#define AI_WEATHER_RAIN 1
#define AI_WEATHER_SANDSTORM 2
#define AI_WEATHER_HAIL 3
@@ -35,8 +35,8 @@
// script's table id to bit
#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0)
-#define AI_SCRIPT_TRY_TO_FAINT (1 << 1)
-#define AI_SCRIPT_CHECK_VIABILITY (1 << 2)
+#define AI_SCRIPT_CHECK_VIABILITY (1 << 1)
+#define AI_SCRIPT_TRY_TO_FAINT (1 << 2)
#define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3)
#define AI_SCRIPT_RISKY (1 << 4)
#define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5)