diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
| commit | f8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch) | |
| tree | 81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /src/battle_tower.c | |
| parent | ee5a239534d7c4bd64ce7ced4146204579f5d598 (diff) | |
| parent | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 9e546b0c8..deb5acb2e 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -3158,10 +3158,10 @@ void sub_81653CC(void) { if (gSaveBlock2Ptr->frontier.field_CA8 == 1) sub_80F01B8(); - if (FlagGet(FLAG_0x077) == TRUE) + if (FlagGet(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE) == TRUE) { sub_80F01B8(); - FlagClear(FLAG_0x077); + FlagClear(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE); } } |