summaryrefslogtreecommitdiff
path: root/asm/macros.inc
diff options
context:
space:
mode:
Diffstat (limited to 'asm/macros.inc')
-rw-r--r--asm/macros.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/asm/macros.inc b/asm/macros.inc
index 0c6644002..ee58cc14e 100644
--- a/asm/macros.inc
+++ b/asm/macros.inc
@@ -65,7 +65,7 @@
.byte 3, 4, \slot, \slot, \slot
.endm
- .macro sprite_oam x, y, priority, tile_num_offset, size
+ .macro subsprite x, y, priority, tile_num_offset, size
.byte \x
.byte \y
.2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size
@@ -114,7 +114,8 @@
.4byte 0 @ padding
.endm
- .macro obj_rot_scal_anim_end
+ .macro obj_rot_scal_anim_end unknown=0
.2byte 0x7fff
- .fill 6 @ padding
+ .2byte \unknown
+ .fill 4 @ padding
.endm