summaryrefslogtreecommitdiff
path: root/src/metatile_behavior.c
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-10-16 21:54:14 -0500
committerGitHub <noreply@github.com>2018-10-16 21:54:14 -0500
commitf67bbbdaaa905833f1c2a315624128aafef9a4cb (patch)
tree1dbafe48cfdb46142cd3df7d9fa50b3ffd4ec961 /src/metatile_behavior.c
parent832947f329b71a9a1d4b88f8b24ef85b540b4fc5 (diff)
parente75f0b4f80670bd3b6a28257f10770911869ea08 (diff)
Merge pull request #364 from Diegoisawesome/master
Port/decompile field_control_avatar
Diffstat (limited to 'src/metatile_behavior.c')
-rw-r--r--src/metatile_behavior.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 5a7d4ae83..dd594f075 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -679,7 +679,7 @@ bool8 MetatileBehavior_IsSecretBasePC(u8 metatileBehavior)
return FALSE;
}
-bool8 MetatileBehavior_IsSecretBaseRegisterPC(u8 metatileBehavior)
+bool8 MetatileBehavior_IsRecordMixingSecretBasePC(u8 metatileBehavior)
{
if (metatileBehavior == MB_SECRET_BASE_REGISTER_PC)
return TRUE;
@@ -815,7 +815,7 @@ bool8 MetatileBehavior_IsSecretBaseSandOrnament(u8 metatileBehavior)
return FALSE;
}
-bool8 MetatileBehavior_IsSecretBaseTvOrShield(u8 metatileBehavior)
+bool8 MetatileBehavior_IsSecretBaseShieldOrToyTV(u8 metatileBehavior)
{
if (metatileBehavior == MB_SECRET_BASE_TV_SHIELD)
return TRUE;
@@ -1164,7 +1164,7 @@ bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior)
return FALSE;
}
-bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8 metatileBehavior)
+bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior)
{
if (metatileBehavior == MB_CLOSED_SOOTOPOLIS_DOOR)
return TRUE;
@@ -1365,7 +1365,7 @@ bool8 MetatileBehavior_IsCuttableGrass(u8 metatileBehavior)
return FALSE;
}
-bool8 MetatileBehavior_IsRunningShoesInstruction(u8 metatileBehavior)
+bool8 MetatileBehavior_IsRunningShoesManual(u8 metatileBehavior)
{
if (metatileBehavior == MB_RUNNING_SHOES_INSTRUCTION)
return TRUE;