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/record_mixing.c | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge conflicts
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 { |