aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle
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 /engine/battle
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 '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 afed76d7..c25257f0 100644
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -372,7 +372,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 90e99f98..bc4665e4 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -662,7 +662,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