summaryrefslogtreecommitdiff
path: root/asm/macros.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/macros.s')
-rw-r--r--asm/macros.s20
1 files changed, 16 insertions, 4 deletions
diff --git a/asm/macros.s b/asm/macros.s
index 4d44a7ac5..4a33fd82b 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -5,10 +5,6 @@
.include "asm/macros/ec.s"
.include "asm/macros/map.s"
- .macro include_range start, end
- .incbin "base_emerald.gba", \start, \end - \start
- .endm
-
.macro region_map_entry x, y, width, height, name
.byte \x
.byte \y
@@ -16,3 +12,19 @@
.byte \height
.4byte gMapName_\name
.endm
+
+ .macro obj_tiles address, uncompressed_size, tag
+ .4byte \address
+ .2byte \uncompressed_size
+ .2byte \tag
+ .endm
+
+ .macro obj_pal address, tag
+ .4byte \address
+ .2byte \tag
+ .2byte 0; padding
+ .endm
+
+ .macro zero_fill count
+ .fill \count
+ .endm