From ad365a35c1536740cbcbc10bee66e5dd908c39e7 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Thu, 18 Jul 2019 14:29:48 -0400
Subject: name metatiles

---
 src/tv.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/tv.c')

diff --git a/src/tv.c b/src/tv.c
index fa5b0f4d4..5b9867acb 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -42,6 +42,7 @@
 #include "ewram.h"
 #include "constants/moves.h"
 #include "constants/region_map_sections.h"
+#include "constants/metatile_labels.h"
 
 struct UnkTvStruct
 {
@@ -536,7 +537,7 @@ void UpdateTVScreensOnMap(int width, int height)
     switch (CheckForBigMovieOrEmergencyNewsOnTV())
     {
     case 1:
-        SetTVMetatilesOnMap(width, height, 0x3);
+        SetTVMetatilesOnMap(width, height, METATILE_ID(Building, TV_On));
         break;
     case 2:
         break;
@@ -544,12 +545,12 @@ void UpdateTVScreensOnMap(int width, int height)
         if (gSaveBlock1.location.mapGroup == MAP_GROUP(LILYCOVE_CITY_COVE_LILY_MOTEL_1F)
          && gSaveBlock1.location.mapNum == MAP_NUM(LILYCOVE_CITY_COVE_LILY_MOTEL_1F))
         {
-            SetTVMetatilesOnMap(width, height, 0x3);
+            SetTVMetatilesOnMap(width, height, METATILE_ID(Building, TV_On));
         }
         else if (FlagGet(FLAG_SYS_TV_START) && (sub_80BD8B8() != 0xff || FindAnyTVNewsOnTheAir() != 0xff || IsTVShowInSearchOfTrainersAiring()))
         {
             FlagClear(FLAG_SYS_TV_WATCH);
-            SetTVMetatilesOnMap(width, height, 0x3);
+            SetTVMetatilesOnMap(width, height, METATILE_ID(Building, TV_On));
         }
         break;
     }
@@ -565,14 +566,14 @@ void SetTVMetatilesOnMap(int width, int height, u16 tileId)
         for (x=0; x<width; x++)
         {
             if (MapGridGetMetatileBehaviorAt(x, y) == 0x86)
-                MapGridSetMetatileIdAt(x, y, tileId | 0xc00);
+                MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK);
         }
     }
 }
 
 void TurnOffTVScreen(void)
 {
-    SetTVMetatilesOnMap(gUnknown_03004870.width, gUnknown_03004870.height, 0x2);
+    SetTVMetatilesOnMap(gUnknown_03004870.width, gUnknown_03004870.height, METATILE_ID(Building, TV_Off));
     DrawWholeMapView();
 }
 
-- 
cgit v1.2.3


From 39683e0362a63ecbffc289b1e45d3e10106fbc58 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Mon, 29 Jul 2019 14:42:28 -0400
Subject: use more accurate metatile collision expression

---
 src/tv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/tv.c')

diff --git a/src/tv.c b/src/tv.c
index 5b9867acb..9cd8d7eea 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -566,7 +566,7 @@ void SetTVMetatilesOnMap(int width, int height, u16 tileId)
         for (x=0; x<width; x++)
         {
             if (MapGridGetMetatileBehaviorAt(x, y) == 0x86)
-                MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK);
+                MapGridSetMetatileIdAt(x, y, tileId | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
         }
     }
 }
-- 
cgit v1.2.3