diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-02 11:48:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 11:48:20 -0400 |
| commit | e97f37077c793a388e3a98c13f09846839e80b22 (patch) | |
| tree | 821ca6bd8d7db65ecd0f8a092b4acea13e00f7f4 /src/scrcmd.c | |
| parent | bbd177fa20a3f53a4815061c524a14e959de6783 (diff) | |
| parent | 1bd678656c735bbeb603ccb80367c7a85f820f61 (diff) | |
Merge branch 'master' into emerald_diff
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 8015705a0..4dd5d08a2 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 | 0xC00); + MapGridSetMetatileIdAt(x, y, metatileId | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT)); return FALSE; } |