diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
| commit | 9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch) | |
| tree | 848c1688fe743dd0410183b182024ee961f07980 /src/engine/save_menu_util.c | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge conflicts
Diffstat (limited to 'src/engine/save_menu_util.c')
| -rw-r--r-- | src/engine/save_menu_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/save_menu_util.c b/src/engine/save_menu_util.c index a2d17bd36..771cb72c7 100644 --- a/src/engine/save_menu_util.c +++ b/src/engine/save_menu_util.c @@ -15,7 +15,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top) if (IsResizeSaveWindowEnabled()) width = 13; - if (FlagGet(SYS_POKEDEX_GET)) + if (FlagGet(FLAG_SYS_POKEDEX_GET)) { // print info + dex information. MenuDrawTextWindow(left, top, left + width, top + 11); @@ -44,7 +44,7 @@ void HandleCloseSaveWindow(u16 left, u16 top) if (IsResizeSaveWindowEnabled()) width = 13; - if (FlagGet(SYS_POKEDEX_GET)) + if (FlagGet(FLAG_SYS_POKEDEX_GET)) MenuZeroFillWindowRect(left, top, left + width, top + 11); else MenuZeroFillWindowRect(left, top, left + width, top + 9); @@ -106,7 +106,7 @@ u8 GetBadgeCount(void) u8 badgeCount = 0; int badgeFlag; - for (badgeFlag = BADGE01_GET; badgeFlag <= BADGE08_GET; badgeFlag++) + for (badgeFlag = FLAG_BADGE01_GET; badgeFlag <= FLAG_BADGE08_GET; badgeFlag++) if (FlagGet(badgeFlag)) badgeCount++; |