diff options
Diffstat (limited to 'src/metatile_behavior.c')
| -rw-r--r-- | src/metatile_behavior.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 7c05d1dde..414ece873 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -7,7 +7,7 @@ static const bool8 sTileSurfable[METATILE_COUNT] = { [MB_SEMI_DEEP_WATER] = TRUE, [MB_DEEP_WATER] = TRUE, [MB_WATERFALL] = TRUE, - [MB_SPLASHING_WATER] = TRUE, + [MB_OCEAN_WATER] = TRUE, [MB_1A] = TRUE, [MB_1B] = TRUE, [MB_EASTWARD_CURRENT] = TRUE, @@ -24,7 +24,7 @@ static const u8 sTileBitAttributes[32] = { [4] = 0x08, }; -bool8 MetatileBehavior_UnusedReturnTrue(u8 metatileBehavior) +bool8 MetatileBehavior_IsATile(u8 metatileBehavior) { return TRUE; } @@ -61,7 +61,7 @@ bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior) +bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior) { if(metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) return TRUE; @@ -69,23 +69,23 @@ bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsMB21OrSand(u8 metatileBehavior) +bool8 MetatileBehavior_IsSand(u8 metatileBehavior) { - if(metatileBehavior == MB_21 || metatileBehavior == MB_SAND) + if(metatileBehavior == MB_SAND || metatileBehavior == MB_SAND_CAVE) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsSandOrDeepSand(u8 metatileBehavior) +bool8 MetatileBehavior_IsSandOrShallowFlowingWater(u8 metatileBehavior) { - if(metatileBehavior == MB_21 || metatileBehavior == MB_WATERFALL_BOTTOM) + if(metatileBehavior == MB_SAND || metatileBehavior == MB_SHALLOW_WATER) return TRUE; else return FALSE; } -bool8 MetatileBehavior_ReturnFalse(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsDeepSand(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsReflective(u8 metatileBehavior) { @@ -412,7 +412,7 @@ bool8 MetatileBehavior_IsPC(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsPondWaterOrPuddle(u8 metatileBehavior) +bool8 MetatileBehavior_HasRipples(u8 metatileBehavior) { if(metatileBehavior == MB_POND_WATER || metatileBehavior == MB_PUDDLE) return TRUE; @@ -438,7 +438,7 @@ bool8 MetatileBehavior_IsTallGrass_2(u8 metatileBehavior) bool8 MetatileBehavior_IsLongGrass(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_ReturnFalse_4(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_ReturnFalse_5(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsFootprints(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsBridge(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_GetBridgeType(u8 metatileBehavior) { return FALSE; } @@ -490,9 +490,9 @@ bool8 MetatileBehavior_IsMB19(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsWaterfallBottom(u8 metatileBehavior) +bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior) { - if(metatileBehavior == MB_WATERFALL_BOTTOM) + if(metatileBehavior == MB_SHALLOW_WATER) return TRUE; else return FALSE; @@ -517,7 +517,7 @@ bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior) bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior) { if((metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) - || metatileBehavior == MB_SPLASHING_WATER) + || metatileBehavior == MB_OCEAN_WATER) return TRUE; else return FALSE; @@ -580,7 +580,7 @@ bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_ReturnFalse_8(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior) { @@ -603,7 +603,7 @@ bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior){ return FALSE; } bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_UnusedReturnFalse_4(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_ReturnFalse_10(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPacifidlogLog(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_ReturnFalse_11(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior) @@ -647,7 +647,7 @@ bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsWater(u8 metatileBehavior) { if((metatileBehavior >= MB_POND_WATER && metatileBehavior <= MB_DEEP_WATER) - || metatileBehavior == MB_SPLASHING_WATER + || metatileBehavior == MB_OCEAN_WATER || (metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT)) return TRUE; else @@ -683,7 +683,7 @@ bool8 MetatileBehavior_ReturnFalse_16(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_ReturnFalse_17(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_ReturnFalse_18(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_IsMB22(u8 metatileBehavior) +bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior) { if(metatileBehavior == MB_22) return TRUE; |