diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-30 12:20:16 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-30 12:20:16 +0100 |
| commit | 9bad1921df42e2b199fc53c679dc0767cc271337 (patch) | |
| tree | f2df987747705d66aeeda8b1074c88260ce3d522 /asm/macros.inc | |
| parent | 5ae6461cc5c43bbeca4cd38efcb340207f762303 (diff) | |
| parent | 1496ea3a24f188cad26ac40f5bfcc3e571f3311a (diff) | |
Merge branch 'master' into dump_trainer_ai_scripts
Diffstat (limited to 'asm/macros.inc')
| -rw-r--r-- | asm/macros.inc | 7 |
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 |