diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-31 09:42:57 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-31 09:42:57 -0400 |
commit | a704592eb71b0e9ebefe51ebc87a6a2455ca675e (patch) | |
tree | c21542bb6f65863c05e1f56842c5364c4a53c82e /src/metatile_behavior.c | |
parent | f00b44699c49550ae2a56bf64e10e7f2d841e839 (diff) | |
parent | d1afbf17bbc9eb70cf085f3b734d02e4ce6b3b57 (diff) |
Merge branch 'master' of github.com:pret/pokefirered into fix_mvmt_types
Diffstat (limited to 'src/metatile_behavior.c')
-rw-r--r-- | src/metatile_behavior.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 4728ca05c..95215d7b6 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -598,7 +598,7 @@ bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_ReturnFalse_9(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior){ return FALSE; } bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior) { return FALSE; } @@ -691,9 +691,9 @@ bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsMB0A(u8 metatileBehavior) +bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior) { - if(metatileBehavior == MB_0A) + if(metatileBehavior == MB_RUNNING_DISALLOWED) return TRUE; else return FALSE; |