diff options
| author | melody <melody@pallet.town> | 2018-11-13 23:38:42 -0500 |
|---|---|---|
| committer | melody <melody@pallet.town> | 2018-11-14 00:10:54 -0500 |
| commit | 5989a8a4616601db97333ea65694bd927d800ddc (patch) | |
| tree | b988fbe6f5fe2696cfbbf0a24aba4f1abdce3b24 /src | |
| parent | 648885b00a82141c42c1ab0af38b0a089e2814c2 (diff) | |
Brings in surfable tile data structure
Diffstat (limited to 'src')
| -rw-r--r-- | src/metatile_behavior.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 71dcf15fe..cc9b7c023 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -2,6 +2,20 @@ #include "metatile_behavior.h" #include "constants/metatile_behaviors.h" +static const bool8 sTileSurfable[METATILE_COUNT] = { + [MB_POND_WATER] = TRUE, + [MB_SEMI_DEEP_WATER] = TRUE, + [MB_DEEP_WATER] = TRUE, + [MB_WATERFALL] = TRUE, + [MB_SPLASHING_WATER] = TRUE, + [MB_1A] = TRUE, + [MB_1B] = TRUE, + [MB_EASTWARD_CURRENT] = TRUE, + [MB_WESTWARD_CURRENT] = TRUE, + [MB_NORTHWARD_CURRENT] = TRUE, + [MB_SOUTHWARD_CURRENT] = TRUE +}; + bool8 MetatileBehavior_UnusedReturnTrue(u8 metatileBehavior) { return TRUE; @@ -181,7 +195,7 @@ bool8 MetatileBehavior_ReturnFalse_2(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior) { - if(sTileBitAttributes[metatileBehavior] & 1) + if(sTileSurfable[metatileBehavior] & 1) return TRUE; else return FALSE; @@ -501,7 +515,7 @@ bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsMB1A(u8 metatileBehavior) +bool8 MetatileBehavior_UnusedIsMB1A(u8 metatileBehavior) { if(metatileBehavior == MB_1A) return TRUE; |