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/event_data.c | |
| parent | ee5a239534d7c4bd64ce7ced4146204579f5d598 (diff) | |
| parent | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'src/event_data.c')
| -rw-r--r-- | src/event_data.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/event_data.c b/src/event_data.c index f6a1cde78..df289c538 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -45,7 +45,7 @@ void ClearTempFieldEventData(void) FlagClear(FLAG_SYS_ENC_DOWN_ITEM); FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_CTRL_OBJ_DELETE); - FlagClear(FLAG_0x880); + FlagClear(FLAG_NURSE_UNION_ROOM_REMINDER); } // Probably had different flag splits at one point. @@ -114,21 +114,21 @@ bool32 IsMysteryGiftEnabled(void) void sub_809D4D8(void) { FlagClear(FLAG_MYSTERY_EVENT_DONE); - FlagClear(FLAG_0x1E5); - FlagClear(FLAG_0x1E6); - FlagClear(FLAG_0x1E7); - FlagClear(FLAG_0x1E8); - FlagClear(FLAG_0x1E9); - FlagClear(FLAG_0x1EA); - FlagClear(FLAG_0x1EB); - FlagClear(FLAG_0x1EC); - FlagClear(FLAG_0x1ED); - FlagClear(FLAG_0x1EE); - FlagClear(FLAG_0x1EF); - FlagClear(FLAG_0x1F0); - FlagClear(FLAG_0x1F1); - FlagClear(FLAG_0x1F2); - FlagClear(FLAG_0x1F3); + FlagClear(FLAG_MYSTERY_EVENT_1); + FlagClear(FLAG_MYSTERY_EVENT_2); + FlagClear(FLAG_MYSTERY_EVENT_3); + FlagClear(FLAG_MYSTERY_EVENT_4); + FlagClear(FLAG_MYSTERY_EVENT_5); + FlagClear(FLAG_MYSTERY_EVENT_6); + FlagClear(FLAG_MYSTERY_EVENT_7); + FlagClear(FLAG_MYSTERY_EVENT_8); + FlagClear(FLAG_MYSTERY_EVENT_9); + FlagClear(FLAG_MYSTERY_EVENT_10); + FlagClear(FLAG_MYSTERY_EVENT_11); + FlagClear(FLAG_MYSTERY_EVENT_12); + FlagClear(FLAG_MYSTERY_EVENT_13); + FlagClear(FLAG_MYSTERY_EVENT_14); + FlagClear(FLAG_MYSTERY_EVENT_15); } void sub_809D570(void) |