diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-13 23:04:56 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-13 23:04:56 -0500 |
| commit | 9e8a841bfa0271a603b5e4895be3067cfa26f8ab (patch) | |
| tree | 52279a2b052583ccfc4a0d6a592cf8a384227a93 /src/event_data.c | |
| parent | d979ac3bf3924051de8bb4154e8398083535eabb (diff) | |
| parent | efc54948345235bdc7d2961d547498612ea8426c (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine
Diffstat (limited to 'src/event_data.c')
| -rw-r--r-- | src/event_data.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/event_data.c b/src/event_data.c index df289c538..a9da142e5 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -3,7 +3,7 @@ #include "pokedex.h" #define TEMP_FLAGS_SIZE 0x4 -#define TEMP_UPPER_FLAGS_SIZE 0x8 +#define DAILY_FLAGS_SIZE 0x8 #define TEMP_VARS_SIZE 0x20 EWRAM_DATA u16 gSpecialVar_0x8000 = 0; @@ -48,10 +48,9 @@ void ClearTempFieldEventData(void) FlagClear(FLAG_NURSE_UNION_ROOM_REMINDER); } -// Probably had different flag splits at one point. -void ClearUpperFlags(void) +void ClearDailyFlags(void) { - memset(gSaveBlock1Ptr->flags + 0x124, 0, TEMP_UPPER_FLAGS_SIZE); + memset(gSaveBlock1Ptr->flags + 0x124, 0, DAILY_FLAGS_SIZE); } void DisableNationalPokedex(void) |