From 2d04eb22abd3f60902ee1f9bc87bd510518709e3 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 28 Dec 2017 02:09:11 -0600 Subject: Split rom_81370FC and port function names --- asm/macros.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'asm/macros.inc') 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 -- cgit v1.2.3 From efe19e95c846a658c5e9bd9908de548db00dcab5 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 7 Jan 2018 01:29:26 -0600 Subject: Extract door animations --- asm/macros.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'asm/macros.inc') diff --git a/asm/macros.inc b/asm/macros.inc index ee58cc14e..7c35e059d 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -119,3 +119,17 @@ .2byte \unknown .fill 4 @ padding .endm + + .macro door_anim_frame unknown, offset + .byte \unknown + .byte 0 @ padding + .2byte \offset + .endm + + .macro door_anim_gfx metatile_num, unknown, unknown2, tile_addr, palette_addr + .2byte \metatile_num + .byte \unknown + .byte \unknown2 + .4byte \tile_addr + .4byte \palette_addr + .endm -- cgit v1.2.3