diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_control_avatar.c | 4 | ||||
| -rw-r--r-- | src/metatile_behavior.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 1d57c672c..304b5d75b 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -373,8 +373,8 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me return EventScript_PC; if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE) return EventScript_ClosedSootopolisDoor; - if (MetatileBehavior_IsUnknownClosedDoor(metatileBehavior) == TRUE) - return SkyPillar_Outside_EventScript_2393F9; + if (MetatileBehavior_IsSkyPillarClosedDoor(metatileBehavior) == TRUE) + return SkyPillar_Outside_EventScript_ClosedDoor; if (MetatileBehavior_IsCableBoxResults1(metatileBehavior) == TRUE) return EventScript_CableBoxResults; if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE) diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 16298183b..435ad7233 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -244,7 +244,7 @@ static const u8 sTileBitAttributes[] = [MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), - [MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SKY_PILLAR_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), @@ -1172,9 +1172,9 @@ bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsUnknownClosedDoor(u8 metatileBehavior) +bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8 metatileBehavior) { - if (metatileBehavior == MB_UNKNOWN_CLOSED_DOOR) + if (metatileBehavior == MB_SKY_PILLAR_CLOSED_DOOR) return TRUE; else return FALSE; |