summaryrefslogtreecommitdiff
path: root/asm/macros.inc
diff options
context:
space:
mode:
authorSwastik Baranwal <swstkbaranwal@gmail.com>2019-06-23 18:47:35 +0530
committerGitHub <noreply@github.com>2019-06-23 18:47:35 +0530
commit99703c6ab831d34e6859d8a8f53ba8e73dc4d3d9 (patch)
tree3a712d3039d152616af58a45a13d82c40a87e58f /asm/macros.inc
parent6d190f861e3559eec922cd760778c0cba6e08397 (diff)
parent9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff)
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'asm/macros.inc')
-rw-r--r--asm/macros.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/asm/macros.inc b/asm/macros.inc
index 6d8657892..e6813d319 100644
--- a/asm/macros.inc
+++ b/asm/macros.inc
@@ -4,6 +4,7 @@
.include "asm/macros/pokemon_data.inc"
.include "asm/macros/ec.inc"
.include "asm/macros/map.inc"
+ .include "asm/macros/m4a.inc"
.macro region_map_location x, y, width, height, name
.byte \x
@@ -147,3 +148,8 @@
.2byte MAP_\map_name
.space 2
.endm
+
+ .macro window_template bg, top, left, height, width, palno, baseBlock
+ .byte \bg, \top, \left, \height, \width, \palno
+ .2byte \baseBlock
+ .endm