diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
| commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
| tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /src/event_data.c | |
| parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
nerge with master, fix conflicts
Diffstat (limited to 'src/event_data.c')
| -rw-r--r-- | src/event_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event_data.c b/src/event_data.c index e3742a147..9f1432f17 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -44,7 +44,7 @@ void ClearTempFieldEventData(void) FlagClear(FLAG_SYS_ENC_DOWN_ITEM); FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_CTRL_OBJ_DELETE); - FlagClear(FLAG_SYS_UNKNOWN_880); + FlagClear(FLAG_0x880); } // probably had different flag splits at one point. |