diff options
| author | Tetrable <atiftetra@gmail.com> | 2018-09-01 12:36:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 12:36:33 +0100 |
| commit | 5a53d6d1fb304736c1fb3c222192a3b722707bca (patch) | |
| tree | eb1794c8da8a8b51caa4abc0de8b797c49ead358 /src/rom_8011DC0.c | |
| parent | d8f6da035015393339ea6391d293e5ff88558844 (diff) | |
| parent | 1895383352da3bd5a4f4990fab045ae3610937fc (diff) | |
Merge pull request #2 from pret/master
Update
Diffstat (limited to 'src/rom_8011DC0.c')
| -rw-r--r-- | src/rom_8011DC0.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 55e3fe32b..993dc0f4f 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -18,6 +18,7 @@ #include "constants/maps.h" #include "constants/species.h" #include "constants/rgb.h" +#include "constants/battle_frontier.h" #include "trade.h" #include "trainer_card.h" #include "overworld.h" @@ -468,7 +469,7 @@ void sub_8012780(u8 taskId) switch (data->state) { case 0: - if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.chosenLvl == 1) + if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN) gSpecialVar_0x8004++; gUnknown_02022C2C = gUnknown_082F00C4[gSpecialVar_0x8004]; gUnknown_02022C2D = gUnknown_082F00C4[gSpecialVar_0x8004] >> 8; @@ -1050,7 +1051,7 @@ void sub_80134E8(u8 taskId) switch (data->state) { case 0: - if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.chosenLvl == 1) + if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN) gSpecialVar_0x8004++; gUnknown_02022C2C = gUnknown_082F0530[gSpecialVar_0x8004]; sub_8010F84(gUnknown_02022C2C, 0, 0); |