diff options
| author | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
|---|---|---|
| committer | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
| commit | 35cc20c9aa5a37f03bc0bf46bc31398aecda7bf6 (patch) | |
| tree | 59427fda7dbbb92268caf353870d0f0ed8f5e13b /data/data2b.s | |
| parent | c408110319885748b4fcc696063242c7002f4d30 (diff) | |
| parent | a1aa645f2364deffda698b8e0cdc5c961b5306a5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
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 |