summaryrefslogtreecommitdiff
path: root/asm/macros/window.inc
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-20 22:08:41 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-20 22:08:41 -0500
commit772f0aa3fd62678006181bd44b97c12744bd21ed (patch)
tree3bf79c86c3bfce8f6cbd5aa525ace5536c381b10 /asm/macros/window.inc
parent7af3cd051edcaa9918096a1d1b7e43a15d3682f6 (diff)
parentf00bbdfecafca4ea89d398061d1c584a39952487 (diff)
Merge branch 'master' into link
Diffstat (limited to 'asm/macros/window.inc')
-rw-r--r--asm/macros/window.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/macros/window.inc b/asm/macros/window.inc
index b7291138b..a91782bbf 100644
--- a/asm/macros/window.inc
+++ b/asm/macros/window.inc
@@ -8,7 +8,7 @@
.2byte \vram_tile_offset
.endm
- .macro window_template_terminator
+ .macro null_window_template
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.endm