diff options
author | garak <garakmon@gmail.com> | 2019-07-29 14:42:28 -0400 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2019-07-29 14:47:08 -0400 |
commit | 39683e0362a63ecbffc289b1e45d3e10106fbc58 (patch) | |
tree | 0a7ea331b66a225f71b10b758b8abcc16844f8f6 /src/scrcmd.c | |
parent | ad365a35c1536740cbcbc10bee66e5dd908c39e7 (diff) |
use more accurate metatile collision expression
Diffstat (limited to 'src/scrcmd.c')
-rw-r--r-- | src/scrcmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 015fae69f..6084cfc5d 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1902,14 +1902,14 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); u16 metatileId = VarGet(ScriptReadHalfword(ctx)); - u16 v8 = VarGet(ScriptReadHalfword(ctx)); + u16 impassable = VarGet(ScriptReadHalfword(ctx)); x += 7; y += 7; - if (!v8) + if (!impassable) MapGridSetMetatileIdAt(x, y, metatileId); else - MapGridSetMetatileIdAt(x, y, metatileId | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(x, y, metatileId | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT)); return FALSE; } |