Sync global

2021-11-19 17:04:04 -05:00
parent cd4462f58c
commit b2c74cae84
40 changed files with 456 additions and 522 deletions
@@ -177,7 +177,10 @@ static void BikeTransition_MoveDirection(u8 direction)
        {
            if (collision == COLLISION_LEDGE_JUMP)
                PlayerJumpLedge(direction);
-            else if (collision != COLLISION_STOP_SURFING && collision != COLLISION_LEDGE_JUMP && collision != COLLISION_PUSHED_BOULDER && collision != COLLISION_UNKNOWN_WARP_6C_6D_6E_6F)
+            else if (collision != COLLISION_STOP_SURFING
+                  && collision != COLLISION_LEDGE_JUMP
+                  && collision != COLLISION_PUSHED_BOULDER
+                  && collision != COLLISION_ROTATING_GATE)
                PlayerOnBikeCollide(direction);
        }
        else
@@ -249,7 +252,7 @@ bool8 RS_IsRunningDisallowed(u8 r0)

 bool32 IsRunningDisallowed(u8 metatileBehavior)
 {
-    if (!(gMapHeader.flags & MAP_ALLOW_RUN))
+    if (!gMapHeader.allowRunning)
        return TRUE;
    if (MetatileBehaviorForbidsBiking(metatileBehavior) != TRUE)
        return FALSE;