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 /data/data2b.s | |
| parent | 77352c7ee480fe3127692ce50a6bdd019de87291 (diff) | |
| parent | 8a60952fc01ada92e029be488481a29da32f47eb (diff) | |
option menu fix conflicts
Diffstat (limited to 'data/data2b.s')
| -rw-r--r-- | data/data2b.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/data2b.s b/data/data2b.s index 1400b31d3..6c24060a0 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4711,7 +4711,7 @@ gUnknown_0831AA18:: @ 831AA18 window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0 window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0 window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0 - window_template_terminator + null_window_template .align 2 gUnknown_0831AAE0:: @ 831AAE0 @@ -4738,7 +4738,7 @@ gUnknown_0831AAE0:: @ 831AAE0 window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148 window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090 - window_template_terminator + null_window_template .align 2 gUnknown_0831ABA0:: @ 831ABA0 |