diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
| commit | 1dc0b25c1e58e422883e16ce7fb4f6bea1e9a0bb (patch) | |
| tree | 867d72df6ebe9b2d1f3ff72503879640322ec224 /src/item_use.c | |
| parent | 9a53686a4eb595c288758486af5fea9b7805283f (diff) | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/item_use.c b/src/item_use.c index 416edfe88..2a2804510 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -203,7 +203,7 @@ void FieldUseFunc_MachBike(u8 taskId) PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); - if (FlagGet(FLAG_0x830) == TRUE + if (FlagGet(FLAG_SYS_ON_CYCLING_ROAD) == TRUE || MetatileBehavior_ReturnFalse_17(behavior) == TRUE || MetatileBehavior_ReturnFalse_18(behavior) == TRUE || MetatileBehavior_ReturnFalse_15(behavior) == TRUE @@ -530,8 +530,8 @@ void FieldUseFunc_BlackFlute(u8 taskId) ItemUse_SetQuestLogEvent(4, NULL, gSpecialVar_ItemId, 0xFFFF); if (gSpecialVar_ItemId == ITEM_WHITE_FLUTE) { - FlagSet(FLAG_WHITE_FLUTE_ACTIVE); - FlagClear(FLAG_BLACK_FLUTE_ACTIVE); + FlagSet(FLAG_SYS_WHITE_FLUTE_ACTIVE); + FlagClear(FLAG_SYS_BLACK_FLUTE_ACTIVE); CopyItemName(gSpecialVar_ItemId, gStringVar2); StringExpandPlaceholders(gStringVar4, gUnknown_84165D2); gTasks[taskId].func = sub_80A1B48; @@ -539,8 +539,8 @@ void FieldUseFunc_BlackFlute(u8 taskId) } else if (gSpecialVar_ItemId == ITEM_BLACK_FLUTE) { - FlagSet(FLAG_BLACK_FLUTE_ACTIVE); - FlagClear(FLAG_WHITE_FLUTE_ACTIVE); + FlagSet(FLAG_SYS_BLACK_FLUTE_ACTIVE); + FlagClear(FLAG_SYS_WHITE_FLUTE_ACTIVE); CopyItemName(gSpecialVar_ItemId, gStringVar2); StringExpandPlaceholders(gStringVar4, gUnknown_8416600); gTasks[taskId].func = sub_80A1B48; |