summaryrefslogtreecommitdiff
path: root/asm/macros.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/macros.s')
-rw-r--r--asm/macros.s24
1 files changed, 12 insertions, 12 deletions
diff --git a/asm/macros.s b/asm/macros.s
index c4e3b6c87..4f0afa734 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -23,16 +23,16 @@
.macro obj_pal address, tag
.4byte \address
.2byte \tag
- .2byte 0; padding
+ .2byte 0@ padding
.endm
.macro zero_fill count
.fill \count
.endm
-; Berry trees have a table defining the palette slot used for each of their 5
-; stages. However, the first 2 stages always use the same slots regardless of
-; the type of tree and the slots of the last 3 stages always equal each other.
+@ Berry trees have a table defining the palette slot used for each of their 5
+@ stages. However, the first 2 stages always use the same slots regardless of
+@ the type of tree and the slots of the last 3 stages always equal each other.
.macro berry_tree_palette_slot_table slot
.byte 3, 4, \slot, \slot, \slot
.endm
@@ -46,24 +46,24 @@
.macro obj_image_anim_frame pic_id, duration, flags = 0
.2byte \pic_id
.byte (\flags) | (\duration)
- .byte 0 ; padding
+ .byte 0 @ padding
.endm
.macro obj_image_anim_loop count
.2byte 0xfffd
.byte \count
- .byte 0 ; padding
+ .byte 0 @ padding
.endm
.macro obj_image_anim_jump target_index
.2byte 0xfffe
.byte \target_index
- .byte 0 ; padding
+ .byte 0 @ padding
.endm
.macro obj_image_anim_end
.2byte 0xffff
- .2byte 0 ; padding
+ .2byte 0 @ padding
.endm
.macro obj_rot_scal_anim_frame delta_x_scale, delta_y_scale, delta_angle, duration
@@ -71,22 +71,22 @@
.2byte \delta_y_scale
.byte \delta_angle
.byte \duration
- .2byte 0 ; padding
+ .2byte 0 @ padding
.endm
.macro obj_rot_scal_anim_loop count
.2byte 0x7ffd
.2byte \count
- .4byte 0 ; padding
+ .4byte 0 @ padding
.endm
.macro obj_rot_scal_anim_jump target_index
.2byte 0x7ffe
.2byte \target_index
- .4byte 0 ; padding
+ .4byte 0 @ padding
.endm
.macro obj_rot_scal_anim_end
.2byte 0x7fff
- .fill 6 ; padding
+ .fill 6 @ padding
.endm