diff options
| author | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
| commit | 89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch) | |
| tree | f5387471637b5e9e62fa5b6a0614a935b2921118 /src/engine/record_mixing.c | |
| parent | 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff) | |
| parent | 3c5f725de49371aced1788a21f5e53df5b498b5f (diff) | |
Merge branch 'master' into decompile_data
Diffstat (limited to 'src/engine/record_mixing.c')
| -rw-r--r-- | src/engine/record_mixing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index 2624837c7..6cb1e54b2 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -131,7 +131,7 @@ void Task_RecordMixing_Main(u8 taskId) if (!gTasks[data[10]].isActive) { tState = 2; - FlagSet(SYS_MIX_RECORD); + FlagSet(FLAG_SYS_MIX_RECORD); DestroyRecordMixingSprite(); DestroyTask(tSndEffTaskId); } @@ -1019,7 +1019,7 @@ void sub_80B9F3C(u16 *a, u8 b) VarSet(VAR_0x4001, *a); StringCopy(gStringVar1, gLinkPlayers[0].name); if (*a == ITEM_EON_TICKET) - FlagSet(SYS_HAS_EON_TICKET); + FlagSet(FLAG_SYS_HAS_EON_TICKET); } else { |