diff options
| author | YamaArashi <shadow962@live.com> | 2016-04-21 23:03:41 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-04-21 23:06:36 -0700 |
| commit | 0601fb4d0013bd0f2508364b313acbdc371da674 (patch) | |
| tree | 8d11fa93697da09a4e0eb84bb0957d4722f5c8f4 /asm/macros.s | |
| parent | 8890ea36eef541ba571df102c3353ee411033261 (diff) | |
Prepare for switch to standard gas (with preprocessor)
Diffstat (limited to 'asm/macros.s')
| -rw-r--r-- | asm/macros.s | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/asm/macros.s b/asm/macros.s index d8f8fa173..d0afa8460 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -22,23 +22,23 @@ .macro obj_pal address, tag .4byte \address .2byte \tag - .2byte 0; padding + .2byte 0@ padding .endm -; For object animation frames. +@ For object animation frames. .macro obj_frame_tiles address, uncompressed_size .4byte \address .2byte \uncompressed_size - .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 @@ -47,30 +47,30 @@ .2byte \x .2byte \y .2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size - .2byte 0 ; padding + .2byte 0 @ padding .endm .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 @@ -78,22 +78,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 |