diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/metatile_behavior.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/metatile_behavior.c')
| -rw-r--r-- | src/metatile_behavior.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 77c839b89..4539c884b 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -131,51 +131,51 @@ bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsUnknownWarp6C(u8 metatileBehavior) +bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_UNKNOWN_WARP_6C) + if(metatileBehavior == MB_UP_RIGHT_STAIR_WARP) result = TRUE; return result; } -bool8 MetatileBehavior_IsUnknownWarp6D(u8 metatileBehavior) +bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_UNKNOWN_WARP_6D) + if(metatileBehavior == MB_UP_LEFT_STAIR_WARP) result = TRUE; return result; } -bool8 MetatileBehavior_IsUnknownWarp6E(u8 metatileBehavior) +bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_UNKNOWN_WARP_6E) + if(metatileBehavior == MB_DOWN_RIGHT_STAIR_WARP) result = TRUE; return result; } -bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior) +bool8 MetatileBehavior_IsDirectionalDownLeftStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_UNKNOWN_WARP_6F) + if(metatileBehavior == MB_DOWN_LEFT_STAIR_WARP) result = TRUE; return result; } -bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior) +bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior) { bool8 result = FALSE; - if(metatileBehavior >= MB_UNKNOWN_WARP_6C && metatileBehavior <= MB_UNKNOWN_WARP_6F) + if(metatileBehavior >= MB_UP_RIGHT_STAIR_WARP && metatileBehavior <= MB_DOWN_LEFT_STAIR_WARP) result = TRUE; else result = FALSE; @@ -484,7 +484,7 @@ bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior) bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior) { - if(metatileBehavior == MB_19) + if(metatileBehavior == MB_UNDERWATER_BLOCKED_ABOVE) return TRUE; else return FALSE; @@ -622,7 +622,7 @@ bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_68) + if(metatileBehavior == MB_LAVARIDGE_1F_WARP) return TRUE; else return FALSE; @@ -685,7 +685,7 @@ bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior) { - if(metatileBehavior == MB_22) + if(metatileBehavior == MB_SEAWEED) return TRUE; else return FALSE; |