diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-26 17:53:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 17:53:18 -0400 |
| commit | b9c604b8d2ffe863cf17336a4d956b08438f0f45 (patch) | |
| tree | 95935cb5754f89ea78402cf4706830f71eb07e81 /src/item_use.c | |
| parent | 7a6d4525c4066038832d85a45ed6df6ab4660309 (diff) | |
| parent | 9130579f1454c869e74ea8c953c0c778a4760396 (diff) | |
Merge pull request #311 from PikalaxALT/field_player_avatar
Field player avatar
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/item_use.c b/src/item_use.c index 6f81ee0e3..df3dbaceb 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -263,10 +263,10 @@ void FieldUseFunc_MachBike(u8 taskId) behavior = MapGridGetMetatileBehaviorAt(x, y); if (FlagGet(FLAG_SYS_ON_CYCLING_ROAD) == TRUE - || MetatileBehavior_ReturnFalse_17(behavior) == TRUE - || MetatileBehavior_ReturnFalse_18(behavior) == TRUE - || MetatileBehavior_ReturnFalse_15(behavior) == TRUE - || MetatileBehavior_ReturnFalse_16(behavior) == TRUE) + || MetatileBehavior_IsVerticalRail(behavior) == TRUE + || MetatileBehavior_IsHorizontalRail(behavior) == TRUE + || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE + || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE) sub_80A10C4(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451); else if (sub_8055C9C() == TRUE && !sub_80BD540()) { @@ -308,7 +308,7 @@ static bool8 ItemUseCheckFunc_Rod(void) if (MetatileBehavior_IsWaterfall(behavior)) return FALSE; - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4)) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_UNDERWATER)) return FALSE; if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) { @@ -327,7 +327,7 @@ static bool8 ItemUseCheckFunc_Rod(void) static void ItemUseOnFieldCB_Rod(u8 taskId) { - sub_805D2C0(ItemId_GetSecondaryId(gSpecialVar_ItemId)); + StartFishing(ItemId_GetSecondaryId(gSpecialVar_ItemId)); DestroyTask(taskId); } |