Merge branch 'master' into modern_gcc

1 files changed, 40 insertions, 39 deletions

diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 0a8c252e0..8d76ecccb 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -18,6 +18,7 @@
 #include "constants/field_effects.h"
 #include "constants/event_objects.h"
 #include "constants/metatile_behaviors.h"
+#include "constants/metatile_labels.h"
 #include "constants/songs.h"
 
 extern void (*gFieldCallback)(void);
@@ -251,36 +252,36 @@ static void SetCutGrassMetatile(s16 x, s16 y)
 
     switch(metatileId)
     {
-    case 0x208:
-    case 0x15:
-    case 0xD:
-        MapGridSetMetatileIdAt(x, y, 0x1);
+    case METATILE_ID(Fortree, LongGrass_Root):
+    case METATILE_ID(General, LongGrass):
+    case METATILE_ID(General, TallGrass):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass));
         break;
-    case 0x1C6:
-        MapGridSetMetatileIdAt(x, y, 0x1CE);
+    case METATILE_ID(General, TallGrass_TreeLeft):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeLeft));
         break;
-    case 0x1C7:
-        MapGridSetMetatileIdAt(x, y, 0x1CF);
+    case METATILE_ID(General, TallGrass_TreeRight):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeRight));
         break;
-    case 0x281:
-        MapGridSetMetatileIdAt(x, y, 0x279);
+    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
         break;
-    case 0x282:
-        MapGridSetMetatileIdAt(x, y, 0x27A);
+    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
         break;
-    case 0x283:
-        MapGridSetMetatileIdAt(x, y, 0x27B);
+    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
         break;
-    case 0x206:
-    case 0x207:
-        MapGridSetMetatileIdAt(x, y, 0x271);
+    case METATILE_ID(Lavaridge, NormalGrass):
+    case METATILE_ID(Lavaridge, AshGrass):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Lavaridge, LavaField));
         break;
-    case 0x212:
-    case 0x20A:
-        MapGridSetMetatileIdAt(x, y, 0x218);
+    case METATILE_ID(Fallarbor, NormalGrass):
+    case METATILE_ID(Fallarbor, AshGrass):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fallarbor, AshField));
         break;
-    case 0x25:
-        MapGridSetMetatileIdAt(x, y, 0xE);
+    case METATILE_ID(General, TallGrass_TreeUp):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeUp));
         break;
     }
 }
@@ -289,13 +290,13 @@ static s32 sub_80A28A0(s16 x, s16 y)
 {
     u16 metatileId = MapGridGetMetatileIdAt(x, y);
 
-    if(metatileId == 1)
+    if(metatileId == METATILE_ID(General, Grass))
         return 1;
-    else if(metatileId == 633)
+    else if(metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft))
         return 2;
-    else if(metatileId == 634)
+    else if(metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopMid))
         return 3;
-    else if(metatileId == 635)
+    else if(metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopRight))
         return 4;
     else
         return 0;
@@ -310,34 +311,34 @@ static void SetCutGrassMetatiles(s16 x, s16 y)
     {
         u16 currentX = x + i;
         s16 currentXsigned = x + i;
-        if (MapGridGetMetatileIdAt(currentXsigned, y) == 21)
+        if (MapGridGetMetatileIdAt(currentXsigned, y) == METATILE_ID(General, LongGrass))
         {
             switch ((u8)sub_80A28A0(currentXsigned, y + 1))
             {
             case 1:
-                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x208);
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, METATILE_ID(Fortree, LongGrass_Root));
                 break;
             case 2:
-                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x281);
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft));
                 break;
             case 3:
-                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x282);
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid));
                 break;
             case 4:
-                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x283);
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight));
                 break;
             }
         }
         if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY) == 1)
         {
-            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == 0x208)
-                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, 0x1);
-            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == 0x281)
-                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, 0x279);
-            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == 0x282)
-                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, 0x27A);
-            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == 0x283)
-                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, 0x27B);
+            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == METATILE_ID(Fortree, LongGrass_Root))
+                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, METATILE_ID(General, Grass));
+            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft))
+                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
+            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid))
+                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
+            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight))
+                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
         }
     }
 }