diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-18 11:50:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 11:50:54 -0800 |
| commit | 3c5f725de49371aced1788a21f5e53df5b498b5f (patch) | |
| tree | acd08dc7032e0844aeaf1c15128b34889b799a39 /src/battle/battle_setup.c | |
| parent | 77f725951f12425734235db42f17ce978a56d41f (diff) | |
| parent | 0ed3cab7a430baff96b7149edbaba222fcdd2c4c (diff) | |
Merge pull request #491 from huderlem/flags
Use named flag constants
Diffstat (limited to 'src/battle/battle_setup.c')
| -rw-r--r-- | src/battle/battle_setup.c | 12 |
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); |