diff options
author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /src/option_menu.c | |
parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) |
Merge branch 'master' into filenames_1
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: |