diff options
| -rw-r--r-- | asm/macros/window.inc | 4 | ||||
| -rw-r--r-- | data/berry_tag_screen.s | 2 | ||||
| -rw-r--r-- | data/clear_save_data_screen.s | 2 | ||||
| -rw-r--r-- | data/credits.s | 2 | ||||
| -rw-r--r-- | data/link.s | 20 |
5 files changed, 16 insertions, 14 deletions
diff --git a/asm/macros/window.inc b/asm/macros/window.inc index 04c148114..b7291138b 100644 --- a/asm/macros/window.inc +++ b/asm/macros/window.inc @@ -8,6 +8,10 @@ .2byte \vram_tile_offset .endm + .macro window_template_terminator + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + .endm + .macro glyph_width_func font_id, func .4byte \font_id .4byte \func diff --git a/data/berry_tag_screen.s b/data/berry_tag_screen.s index 197f3c7d8..01a44bb14 100644 --- a/data/berry_tag_screen.s +++ b/data/berry_tag_screen.s @@ -23,7 +23,7 @@ gUnknown_085EFD28:: @ 85EFD28 window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055 window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gBerryFirmnessStringPointers:: @ 85EFD50 diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s index 8e30a6303..3abf9bf6d 100644 --- a/data/clear_save_data_screen.s +++ b/data/clear_save_data_screen.s @@ -10,7 +10,7 @@ gUnknown_085F06C0:: @ 85F06C0 .align 2 gUnknown_085F06C8:: @ 85F06C8 window_template 0x00, 0x03, 0x0f, 0x1a, 0x04, 0x0f, 0x000b - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_085F06D8:: @ 85F06D8 diff --git a/data/credits.s b/data/credits.s index 5e1e83c8b..cc75915a0 100644 --- a/data/credits.s +++ b/data/credits.s @@ -1493,7 +1493,7 @@ gUnknown_085E6F68:: @ 85E6F68 struct BgTemplate .align 2 gUnknown_085E6F6C:: @ 85E6F6C window_template 0x00, 0x00, 0x09, 0x1e, 0x0c, 0x08, 0x0001 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_085E6F7C:: @ 85E6F7C diff --git a/data/link.s b/data/link.s index 2ce6b49ba..d9cf886c5 100644 --- a/data/link.s +++ b/data/link.s @@ -57,12 +57,9 @@ gUnknown_082ED1FC:: @ 82ED1FC BgTemplate .align 2 gUnknown_082ED204:: @ 82ED204 window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002 - window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098 - window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A - - window_template 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_082ED224:: @ 82ED224 @@ -1889,7 +1886,7 @@ gUnknown_082F05A8:: @ 82F05A8 window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0c, 0x0013 window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0c, 0x004f window_template 0x00, 0x00, 0x0f, 0x1e, 0x05, 0x0d, 0x004f - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_082F05C8:: @ 82F05C8 @@ -2073,7 +2070,7 @@ gUnknown_082F0D3C:: @ 82F0D3C window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001 window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049 window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_082F0D5C:: @ 82F0D5C @@ -2105,7 +2102,7 @@ gUnknown_082F0DD0:: @ 82F0DD0 .align 2 gUnknown_082F0DD4:: @ 82F0DD4 window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_082F0DE4:: @ 82F0DE4 @@ -2758,7 +2755,7 @@ gUnknown_082F2C70:: @ 82F2C70 window_template 0x01, 0x09, 0x12, 0x0f, 0x02, 0x0c, 0x007a window_template 0x01, 0x00, 0x02, 0x06, 0x0f, 0x07, 0x0020 window_template 0x00, 0x01, 0x02, 0x07, 0x09, 0x0e, 0x0013 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_082F2C98:: @ 82F2C98 @@ -3025,11 +3022,12 @@ gUnknown_082F32F4:: @ 82F32F4 window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9 window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7 window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator + window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001 window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001 window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_082F3344:: @ 82F3344 @@ -4423,7 +4421,7 @@ gUnknown_082FE164:: @ 82FE164 struct BgTemplate gUnknown_082FE174:: @ 82FE174 window_template 0x00, 0x13, 0x00, 0x06, 0x02, 0x02, 0x0013 window_template 0x00, 0x08, 0x00, 0x06, 0x02, 0x02, 0x001f - window_template 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + window_template_terminator .align 2 gUnknown_082FE18C:: @ 82FE18C |