Merge branch 'master' into master

1 files changed, 8 insertions, 7 deletions

diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 39ed30260..c68a95d41 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -22,6 +22,7 @@
 #include "constants/metatile_behaviors.h"
 #include "constants/songs.h"
 #include "constants/vars.h"
+#include "constants/metatile_labels.h"
 
 EWRAM_DATA struct MapPosition gPlayerFacingPosition = {0};
 
@@ -800,16 +801,16 @@ static void Task_SecretBasePCTurnOn(u8 taskId)
     {
     case 4:
     case 12:
-        MapGridSetMetatileIdAt(data[0], data[1], 548);
+        MapGridSetMetatileIdAt(data[0], data[1], 0x224);
         CurrentMapDrawMetatileAt(data[0], data[1]);
         break;
     case 8:
     case 16:
-        MapGridSetMetatileIdAt(data[0], data[1], 544);
+        MapGridSetMetatileIdAt(data[0], data[1], 0x220);
         CurrentMapDrawMetatileAt(data[0], data[1]);
         break;
     case 20:
-        MapGridSetMetatileIdAt(data[0], data[1], 548);
+        MapGridSetMetatileIdAt(data[0], data[1], 0x224);
         CurrentMapDrawMetatileAt(data[0], data[1]);
         FieldEffectActiveListRemove(FLDEFF_PCTURN_ON);
         EnableBothScriptContexts();
@@ -828,9 +829,9 @@ void DoSecretBasePCTurnOffEffect(void)
     PlaySE(SE_PC_OFF);
 
     if (!VarGet(VAR_CURRENT_SECRET_BASE))
-        MapGridSetMetatileIdAt(x, y, 3616);
+        MapGridSetMetatileIdAt(x, y, 0x220 | METATILE_COLLISION_MASK);
     else
-        MapGridSetMetatileIdAt(x, y, 3617);
+        MapGridSetMetatileIdAt(x, y, 0x221 | METATILE_COLLISION_MASK);
 
     CurrentMapDrawMetatileAt(x, y);
 }
@@ -902,8 +903,8 @@ bool8 FldEff_NopA700(void)
 static void DoSecretBaseBreakableDoorEffect(s16 x, s16 y)
 {
     PlaySE(SE_TOY_KABE);
-    MapGridSetMetatileIdAt(x, y, 630);
-    MapGridSetMetatileIdAt(x, y - 1, 622);
+    MapGridSetMetatileIdAt(x, y, 0x276);
+    MapGridSetMetatileIdAt(x, y - 1, 0x26E);
     CurrentMapDrawMetatileAt(x, y);
     CurrentMapDrawMetatileAt(x, y - 1);
 }