diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-02 16:00:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-02 16:00:56 -0600 |
| commit | ff48e5ada02f5effa10e2bfd9b1e2dbaef37e5d3 (patch) | |
| tree | c0788afbbaf711bfdc90e5a896254cae4c77a063 /src/berry_blender.c | |
| parent | 59807c0f2cde5fb3068157a4c2ca3c31510d39fd (diff) | |
| parent | d64a905d65d638b7c76e86a2326f5077c3352b11 (diff) | |
Merge pull request #541 from Diegoisawesome/master
Misc documentation
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index ea9c6c4ff..f2e3c7d14 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1438,7 +1438,7 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, { opponentBerryId = sOpponentBerrySets[opponentSetId][i]; var = playerBerryItemId - 163; - if (!FlagGet(0x340) && gSpecialVar_0x8004 == 1) + if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS) && gSpecialVar_0x8004 == 1) { opponentSetId %= 5; opponentBerryId = sSpecialOpponentBerrySets[opponentSetId]; |