aboutsummaryrefslogtreecommitdiffstats
path: root/data/moves
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2022-06-06 16:25:31 -0500
committerGitHub <noreply@github.com>2022-06-06 17:25:31 -0400
commit6b5be9129cabe72b9f775b02db1bf7e7169153da (patch)
treed92012450c70f90bf8086bed32ec3dc87b68b332 /data/moves
parentImproved Virtual Console patch identifiers (#357) (diff)
downloadpokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.gz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.xz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.zip
RGBDS syntax updates (#358)
New MACRO and DEF syntax
Diffstat (limited to 'data/moves')
-rw-r--r--data/moves/animations.asm2
-rw-r--r--data/moves/moves.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index 0d8a2bd4..0049cf59 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -214,7 +214,7 @@ AttackAnimationPointers:
; if \2 is a subanimation_id:
;\3: tileset_id
;\4: delay
-battle_anim: MACRO
+MACRO battle_anim
IF _NARG == 4
db (\3 << 6) | \4
db \1 - 1
diff --git a/data/moves/moves.asm b/data/moves/moves.asm
index 0e52e01c..b7e5e7af 100644
--- a/data/moves/moves.asm
+++ b/data/moves/moves.asm
@@ -1,4 +1,4 @@
-move: MACRO
+MACRO move
db \1 ; animation (interchangeable with move id)
db \2 ; effect
db \3 ; power