summaryrefslogtreecommitdiff
path: root/include/metatile_behavior.h
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-03-19 11:00:32 -0400
committerGitHub <noreply@github.com>2020-03-19 11:00:32 -0400
commit33b65b547000387fcdce9fe497da9b217544ece6 (patch)
tree0c1754c67d188776ee1942fcca503ad8e1e19f05 /include/metatile_behavior.h
parent715c2ff3ad3a7842a97a2b221f4c02135a813139 (diff)
parenta8403c07790b1031c96ff35a1701e1684919ed95 (diff)
Merge pull request #307 from PikalaxALT/field_control_avatar
Field control avatar
Diffstat (limited to 'include/metatile_behavior.h')
-rw-r--r--include/metatile_behavior.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 91a1824e5..ae3e6a01d 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -62,8 +62,8 @@ bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedIsTallGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior);
bool8 MetatileBehavior_IsMountain(u8 metatileBehavior);
-bool8 MetatileBehavior_IsDeepOrSemiDeepWater(u8 metatileBehavior);
-bool8 MetatileBehavior_IsMB19(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior);
+bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior);
bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior);
bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior);
bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior);
@@ -89,9 +89,9 @@ bool8 MetatileBehavior_UnusedReturnFalse_5(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_6(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_7(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_8(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse_12(u8 metatileBehavior);
-bool8 MetatileBheavior_IsMB_68(u8 metatileBehavior);
-bool8 MetatileBehavior_IsRegularWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsWarpPad(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsWater(u8 metatileBehavior);
bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior);