Merge branch 'master' into doc-rm

2020-04-06 00:37:08 -04:00
parent 5f1a4de374 35a578c620
commit 93d17ef7c8
149 changed files with 4459 additions and 3904 deletions
@@ -268,7 +268,7 @@ void FieldUseFunc_MachBike(u8 taskId)
     || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE
     || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE)
        sub_80A10C4(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451);
-    else if (Overworld_IsBikingAllowed() == TRUE && !sub_80BD540())
+    else if (Overworld_IsBikingAllowed() == TRUE && !MetatileAtPlayerPositionForbidsBiking())
    {
        sItemUseOnFieldCB = ItemUseOnFieldCB_Bicycle;
        sub_80A103C(taskId);