Synced src/battle_script_commands.c

2022-07-29 09:42:03 -04:00
parent 0709da5867
commit 7f53f533bb
90 changed files with 2734 additions and 2058 deletions
@@ -134,31 +134,32 @@
 #define EGG_GROUPS_PER_MON      2

 // Pokemon natures
-#define NATURE_HARDY 0
-#define NATURE_LONELY 1
-#define NATURE_BRAVE 2
-#define NATURE_ADAMANT 3
-#define NATURE_NAUGHTY 4
-#define NATURE_BOLD 5
-#define NATURE_DOCILE 6
-#define NATURE_RELAXED 7
-#define NATURE_IMPISH 8
-#define NATURE_LAX 9
-#define NATURE_TIMID 10
-#define NATURE_HASTY 11
-#define NATURE_SERIOUS 12
-#define NATURE_JOLLY 13
-#define NATURE_NAIVE 14
-#define NATURE_MODEST 15
-#define NATURE_MILD 16
-#define NATURE_QUIET 17
-#define NATURE_BASHFUL 18
-#define NATURE_RASH 19
-#define NATURE_CALM 20
-#define NATURE_GENTLE 21
-#define NATURE_SASSY 22
-#define NATURE_CAREFUL 23
-#define NATURE_QUIRKY 24
+#define NATURE_HARDY    0
+#define NATURE_LONELY   1
+#define NATURE_BRAVE    2
+#define NATURE_ADAMANT  3
+#define NATURE_NAUGHTY  4
+#define NATURE_BOLD     5
+#define NATURE_DOCILE   6
+#define NATURE_RELAXED  7
+#define NATURE_IMPISH   8
+#define NATURE_LAX      9
+#define NATURE_TIMID    10
+#define NATURE_HASTY    11
+#define NATURE_SERIOUS  12
+#define NATURE_JOLLY    13
+#define NATURE_NAIVE    14
+#define NATURE_MODEST   15
+#define NATURE_MILD     16
+#define NATURE_QUIET    17
+#define NATURE_BASHFUL  18
+#define NATURE_RASH     19
+#define NATURE_CALM     20
+#define NATURE_GENTLE   21
+#define NATURE_SASSY    22
+#define NATURE_CAREFUL  23
+#define NATURE_QUIRKY   24
+#define NUM_NATURES     25

 // Pokemon Stats
 #define STAT_HP      0