From 874d4d047002a7651a4767e145c8b71a98996a84 Mon Sep 17 00:00:00 2001 From: pkmnsnfrn Date: Fri, 27 Sep 2024 17:19:58 -0700 Subject: [PATCH] Removed switch case per https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779197182 --- src/field_screen_effect.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index cd7f51b3da..073c92f3e0 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -1618,20 +1618,19 @@ void DoStairWarp(u16 metatileBehavior, u16 delay) bool32 IsDirectionalStairWarpMetatileBehavior(u16 metatileBehavior, u8 playerDirection) { - switch (playerDirection) + if (playerDirection == DIR_WEST) { - case DIR_WEST: - if (MetatileBehavior_IsDirectionalUpLeftStairWarp(metatileBehavior)) - return TRUE; - if (MetatileBehavior_IsDirectionalDownLeftStairWarp(metatileBehavior)) - return TRUE; - break; - case DIR_EAST: - if (MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior)) - return TRUE; - if (MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior)) - return TRUE; - break; + if (MetatileBehavior_IsDirectionalUpLeftStairWarp(metatileBehavior)) + return TRUE; + if (MetatileBehavior_IsDirectionalDownLeftStairWarp(metatileBehavior)) + return TRUE; + } + else if (playerDirection == DIR_EAST) + { + if (MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior)) + return TRUE; + if (MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior)) + return TRUE; } return FALSE; }