aboutsummaryrefslogtreecommitdiffstats
path: root/data/moves
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2022-06-06 16:25:34 -0500
committerGitHub <noreply@github.com>2022-06-06 17:25:34 -0400
commitc1ef7b75972fa4fbdf125bc85cc1a66f358151cd (patch)
treebcf71939ec5573ed5001c4a4b4342d26e5d8f9b1 /data/moves
parentImproved Virtual Console patch identifiers (#85) (diff)
downloadpokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.tar.gz
pokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.tar.xz
pokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.zip
RGBDS syntax updates (#86)
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 15f1ad52..1cc44fe7 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -213,7 +213,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