aboutsummaryrefslogtreecommitdiffstats
path: root/macros/scripts/gfx_anims.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-11-23 21:19:29 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-11-23 21:19:29 -0500
commit7574e186e7505e237efc3ab0969fed60bec6eb9d (patch)
tree527ec48412989e98cca7827c5e31d89cdf742b05 /macros/scripts/gfx_anims.asm
parentIdentify starter pikachu happiness boost medicine check (#72) (diff)
parentUse ~X instead of $ff ^ X (diff)
downloadpokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.gz
pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.xz
pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.zip
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'macros/scripts/gfx_anims.asm')
-rw-r--r--macros/scripts/gfx_anims.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm
index f475ad8d..9ba1e61c 100644
--- a/macros/scripts/gfx_anims.asm
+++ b/macros/scripts/gfx_anims.asm
@@ -5,7 +5,7 @@ frame: MACRO
x = \2
IF _NARG > 2
REPT _NARG - 2
-x = x | (\3 << 1)
+x |= \3 << 1
shift
ENDR
ENDC