From 292d9b293353a8483dd0c4ce8fbad9743cbf2a87 Mon Sep 17 00:00:00 2001
From: FosterProgramming <jamiefosterandco@gmail.com>
Date: Sun, 26 Oct 2025 14:40:55 +0100
Subject: [PATCH] Fix PC turning on/off animation not working in Battle
 Frontier (#8048)

---
 src/field_specials.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/field_specials.c b/src/field_specials.c
index 09fca47899..cd7a2a798f 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -22,12 +22,13 @@
 #include "item.h"
 #include "item_icon.h"
 #include "link.h"
-#include "load_save.h"
 #include "list_menu.h"
+#include "load_save.h"
 #include "main.h"
-#include "mystery_gift.h"
 #include "match_call.h"
 #include "menu.h"
+#include "metatile_behavior.h"
+#include "mystery_gift.h"
 #include "overworld.h"
 #include "party_menu.h"
 #include "pokeblock.h"
@@ -984,7 +985,7 @@ void FieldShowRegionMap(void)
 
 static bool32 IsBuildingPCTile(u32 tileId)
 {
-    return gMapHeader.mapLayout->primaryTileset == &gTileset_Building && (tileId == METATILE_Building_PC_On || tileId == METATILE_Building_PC_Off);
+    return (MetatileBehavior_IsPC(UNPACK_BEHAVIOR(GetMetatileAttributesById(tileId))));
 }
 
 static bool32 IsPlayerHousePCTile(u32 tileId)