diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-17 20:07:53 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-17 20:07:53 -0800 |
| commit | 88716f4c0e053a984eeb4bef92fefa42027dd22a (patch) | |
| tree | 326805fbcc882cd74cc43431e34b680b4971184c /src/field/field_player_avatar.c | |
| parent | b14cdde8bd4afda2b0b73bb72b3cffc6961a5790 (diff) | |
Use FLAG_ prefix for all flags
Diffstat (limited to 'src/field/field_player_avatar.c')
| -rw-r--r-- | src/field/field_player_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index 437d16208..d80076be4 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -490,7 +490,7 @@ void sub_8058D0C(u8 direction, u16 heldKeys) PlayerGoSpeed2(direction); return; } - if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_4) && (heldKeys & B_BUTTON) && FlagGet(SYS_B_DASH) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_4) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) && IsRunningDisallowed(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E) == 0) { sub_805940C(direction); @@ -563,7 +563,7 @@ static bool8 ShouldJumpLedge(s16 a, s16 b, u8 c) static u8 sub_8058F6C(s16 a, s16 b, u8 c) { - if (FlagGet(SYS_USE_STRENGTH)) + if (FlagGet(FLAG_SYS_USE_STRENGTH)) { u8 mapObjectId = GetFieldObjectIdByXY(a, b); |