diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-18 11:50:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 11:50:54 -0800 |
| commit | 3c5f725de49371aced1788a21f5e53df5b498b5f (patch) | |
| tree | acd08dc7032e0844aeaf1c15128b34889b799a39 /src/field/item_use.c | |
| parent | 77f725951f12425734235db42f17ce978a56d41f (diff) | |
| parent | 0ed3cab7a430baff96b7149edbaba222fcdd2c4c (diff) | |
Merge pull request #491 from huderlem/flags
Use named flag constants
Diffstat (limited to 'src/field/item_use.c')
| -rw-r--r-- | src/field/item_use.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field/item_use.c b/src/field/item_use.c index 48b159c1c..c2e71070c 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -177,7 +177,7 @@ void ItemUseOutOfBattle_Bike(u8 taskId) PlayerGetDestCoords(&x, &y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); - if (FlagGet(SYS_CYCLING_ROAD) == TRUE // on cycling road? + if (FlagGet(FLAG_SYS_CYCLING_ROAD) == TRUE // on cycling road? || MetatileBehavior_IsVerticalRail(tileBehavior) == TRUE || MetatileBehavior_IsHorizontalRail(tileBehavior) == TRUE || MetatileBehavior_IsIsolatedVerticalRail(tileBehavior) == TRUE @@ -952,8 +952,8 @@ void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId) { if (gScriptItemId == ITEM_WHITE_FLUTE) { - FlagSet(SYS_ENC_UP_ITEM); - FlagClear(SYS_ENC_DOWN_ITEM); + FlagSet(FLAG_SYS_ENC_UP_ITEM); + FlagClear(FLAG_SYS_ENC_DOWN_ITEM); sub_80CA07C(); StringExpandPlaceholders(gStringVar4, gOtherText_UsedFlute); gTasks[taskId].func = sub_80CA098; @@ -961,8 +961,8 @@ void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId) } else if (gScriptItemId == ITEM_BLACK_FLUTE) { - FlagSet(SYS_ENC_DOWN_ITEM); - FlagClear(SYS_ENC_UP_ITEM); + FlagSet(FLAG_SYS_ENC_DOWN_ITEM); + FlagClear(FLAG_SYS_ENC_UP_ITEM); sub_80CA07C(); StringExpandPlaceholders(gStringVar4, gOtherText_UsedRepel); gTasks[taskId].func = sub_80CA098; |