summaryrefslogtreecommitdiff
path: root/src/battle/battle_setup.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-17 20:07:53 -0800
committerMarcus Huderle <huderlem@gmail.com>2017-12-17 20:07:53 -0800
commit88716f4c0e053a984eeb4bef92fefa42027dd22a (patch)
tree326805fbcc882cd74cc43431e34b680b4971184c /src/battle/battle_setup.c
parentb14cdde8bd4afda2b0b73bb72b3cffc6961a5790 (diff)
Use FLAG_ prefix for all flags
Diffstat (limited to 'src/battle/battle_setup.c')
-rw-r--r--src/battle/battle_setup.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 9f51c2878..6baf47dee 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -441,7 +441,17 @@ const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
},
};
-static const u16 sBadgeFlags[] = {BADGE01_GET, BADGE02_GET, BADGE03_GET, BADGE04_GET, BADGE05_GET, BADGE06_GET, BADGE07_GET, BADGE08_GET};
+static const u16 sBadgeFlags[] =
+{
+ FLAG_BADGE01_GET,
+ FLAG_BADGE02_GET,
+ FLAG_BADGE03_GET,
+ FLAG_BADGE04_GET,
+ FLAG_BADGE05_GET,
+ FLAG_BADGE06_GET,
+ FLAG_BADGE07_GET,
+ FLAG_BADGE08_GET,
+};
static void DoStandardWildBattle(void);
static void DoSafariBattle(void);