Merge pull request #1608 from GriffinRichards/fix-fieldmap

Fix some incorrect fieldmap names
2022-01-26 17:51:56 -05:00
parent 4188dd405c 3d0326106e
commit 2efbd5f549
34 changed files with 459 additions and 568 deletions
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2046,7 +2046,7 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx)
    if (!isImpassable)
        MapGridSetMetatileIdAt(x, y, tileId);
    else
-        MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK);
+        MapGridSetMetatileIdAt(x, y, tileId | MAPGRID_COLLISION_MASK);
    return FALSE;
 }