summaryrefslogtreecommitdiff
path: root/src/field_control_avatar.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-01 18:06:15 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-11-02 18:06:06 -0400
commitafb9ff3a40dcfb2681ef274752bceb726d14b783 (patch)
tree4e41abebf769019ead392d3fa0034df04b796d79 /src/field_control_avatar.c
parentc98fbb5ca6edf4f2bb3d2eada318082051f0849d (diff)
Document files with a few remaining symbols
Diffstat (limited to 'src/field_control_avatar.c')
-rw-r--r--src/field_control_avatar.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index e58fb783b..6d338c06d 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -421,7 +421,7 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
return SecretBase_EventScript_SandOrnament;
if (MetatileBehavior_IsSecretBaseShieldOrToyTV(metatileBehavior) == TRUE)
return SecretBase_EventScript_ShieldOrToyTV;
- if (MetatileBehavior_IsMB_C6(metatileBehavior) == TRUE)
+ if (MetatileBehavior_IsSecretBaseDecorationBase(metatileBehavior) == TRUE)
{
CheckInteractedWithFriendsFurnitureBottom();
return NULL;
@@ -729,9 +729,8 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB
DoTeleportTileWarp();
return TRUE;
}
- if (MetatileBehavior_IsBridgeOverOcean(metatileBehavior) == TRUE)
+ if (MetatileBehavior_IsUnionRoomWarp(metatileBehavior) == TRUE)
{
- // Maybe unused? This MB is used by log bridges, but there's never a warp event on them.
DoSpinExitWarp();
return TRUE;
}
@@ -762,7 +761,7 @@ static bool8 IsWarpMetatileBehavior(u16 metatileBehavior)
&& MetatileBehavior_IsAquaHideoutWarp(metatileBehavior) != TRUE
&& MetatileBehavior_IsMtPyreHole(metatileBehavior) != TRUE
&& MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) != TRUE
- && MetatileBehavior_IsBridgeOverOcean(metatileBehavior) != TRUE)
+ && MetatileBehavior_IsUnionRoomWarp(metatileBehavior) != TRUE)
return FALSE;
return TRUE;
}