aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle
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 /engine/battle
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 'engine/battle')
-rw-r--r--engine/battle/animations.asm2
-rw-r--r--engine/battle/battle_transitions.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 61ad93dc..8cd62d2b 100644
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -392,7 +392,7 @@ LoadAnimationTileset:
ld c, a ; number of tiles
jp CopyVideoData ; load tileset
-anim_tileset: MACRO
+MACRO anim_tileset
db \1
dw \2
db -1 ; padding
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 6d3a4f9c..88cd1d6e 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -666,7 +666,7 @@ BattleTransition_Circle_Sub2:
const CIRCLE_LEFT
const CIRCLE_RIGHT
-half_circle: MACRO
+MACRO half_circle
; quadrant x, circle data, target coord
db \1
dw \2