diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
commit | 1e9143e0b22bc72cb77866e10817bc509064842a (patch) | |
tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /include/metatile_behavior.h | |
parent | c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (diff) | |
parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) |
merge union room with master
Diffstat (limited to 'include/metatile_behavior.h')
-rw-r--r-- | include/metatile_behavior.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index d6743b788..86a67ab3e 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -1,7 +1,7 @@ #ifndef GUARD_METATILE_BEHAVIOR #define GUARD_METATILE_BEHAVIOR -bool8 ShouldDoJumpLandingDustEffect(u8); +bool8 MetatileBehavior_IsATile(u8); bool8 MetatileBehavior_IsEncounterTile(u8); bool8 MetatileBehavior_IsJumpEast(u8); bool8 MetatileBehavior_IsJumpWest(u8); @@ -74,7 +74,7 @@ bool8 MetatileBehavior_IsPuddle(u8); bool8 MetatileBehavior_IsTallGrass(u8); bool8 MetatileBehavior_IsLongGrass(u8); bool8 MetatileBehavior_IsBerryTreeSoil(u8); -bool8 MetatileBehavior_IsAsh(u8); +bool8 MetatileBehavior_IsAshGrass(u8); bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8); bool8 MetatileBehavior_IsBridge(u8); u8 MetatileBehavior_GetBridgeSth(u8); |