diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-12 13:05:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-12 13:05:57 -0500 |
| commit | 956090b05f678db9f43d567131d6d43ce11806ec (patch) | |
| tree | 0f8318bf22c1e6f049772fd0846af6db14e86349 /src/battle_setup.c | |
| parent | 9c934c966400813e8ed6c8a5c0f93fb8cdc12546 (diff) | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index f6b386bf8..eff57eae3 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -321,7 +321,7 @@ const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] = [REMATCH_WALLACE] = REMATCH(TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, EVER_GRANDE_CITY), }; -static const u16 sBadgeFlags[8] = +static const u16 sBadgeFlags[NUM_BADGES] = { FLAG_BADGE01_GET, FLAG_BADGE02_GET, FLAG_BADGE03_GET, FLAG_BADGE04_GET, FLAG_BADGE05_GET, FLAG_BADGE06_GET, FLAG_BADGE07_GET, FLAG_BADGE08_GET, |