diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /asm/wallclock.s | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'asm/wallclock.s')
| -rw-r--r-- | asm/wallclock.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/wallclock.s b/asm/wallclock.s index f8cc87fe8..5c818212c 100644 --- a/asm/wallclock.s +++ b/asm/wallclock.s @@ -153,7 +153,7 @@ _081348FC: movs r2, 0x20 bl LoadPalette _08134906: - bl sub_8098C64 + bl GetOverworldTextboxPalettePtr movs r1, 0xE0 movs r2, 0x20 bl LoadPalette |