diff options
Diffstat (limited to 'src/bike.c')
| -rw-r--r-- | src/bike.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/bike.c b/src/bike.c index bbcda989c..e97a5e04e 100644 --- a/src/bike.c +++ b/src/bike.c @@ -614,27 +614,24 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) return; } collision = GetBikeCollision(direction); - // TODO: Try to get rid of this goto - if (collision == 0 || collision == COLLISION_WHEELIE_HOP) + if (collision && collision != COLLISION_WHEELIE_HOP) { - goto derp; - } - else if (collision == COLLISION_LEDGE_JUMP) - { - PlayerLedgeHoppingWheelie(direction); - } - else if (collision < COLLISION_STOP_SURFING || collision > COLLISION_ROTATING_GATE) - { - if (collision < COLLISION_VERTICAL_RAIL) + if (collision == COLLISION_LEDGE_JUMP) { - AcroBikeTransition_WheelieHoppingStanding(direction); + PlayerLedgeHoppingWheelie(direction); + return; } - else + if (collision >= COLLISION_STOP_SURFING && collision <= COLLISION_ROTATING_GATE) + { + return; + } + if (collision < COLLISION_VERTICAL_RAIL) { - derp: - PlayerMovingHoppingWheelie(direction); + AcroBikeTransition_WheelieHoppingStanding(direction); + return; } } + PlayerMovingHoppingWheelie(direction); } static void AcroBikeTransition_SideJump(u8 direction) @@ -1056,7 +1053,7 @@ void Bike_HandleBumpySlopeJump(void) bool32 IsRunningDisallowed(u8 metatile) { - if (!(gMapHeader.flags & MAP_ALLOW_RUNNING) || IsRunningDisallowedByMetatile(metatile) == TRUE) + if (!gMapHeader.allowRunning || IsRunningDisallowedByMetatile(metatile) == TRUE) return TRUE; else return FALSE; |