diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
| commit | ad2ef517bd702c352d7a4d5b64db0e99f04721c2 (patch) | |
| tree | 540ef4c700ee35c2b177e219a9c0092a3a9aa29c /asm/macros/window.inc | |
| parent | 77352c7ee480fe3127692ce50a6bdd019de87291 (diff) | |
| parent | 8a60952fc01ada92e029be488481a29da32f47eb (diff) | |
option menu fix conflicts
Diffstat (limited to 'asm/macros/window.inc')
| -rw-r--r-- | asm/macros/window.inc | 2 |
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 |