diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
| commit | 78535eea89e8b71f37e188289793e3e18c9bb985 (patch) | |
| tree | c3d7ec29b849e810cc6bc90827f9053a4f486b64 /src/option_menu.c | |
| parent | f4e6816db9622dfa93466138ed075075009295b8 (diff) | |
| parent | 3f477dae36c99bcb03a38be251dbef2f7e344ebc (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/option_menu.c')
| -rw-r--r-- | src/option_menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index 2a5b0e534..6fc58b531 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -112,7 +112,7 @@ void CB2_InitOptionMenu(void) break; case 5: LoadPalette(gUnknown_0839F5FC, 0x80, 0x40); - CpuCopy16(gUnknown_0839F63C, (void *)0x0600BEE0, 0x40); + CpuCopy16(gUnknown_0839F63C, (void *)(VRAM + 0xBEE0), 0x40); gMain.state++; break; case 6: |