diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-04-25 00:28:57 -0400 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-04-25 00:28:57 -0400 |
commit | 6a401b53867de87165f625510624c4a296dba34b (patch) | |
tree | 1a03aba54ebed695fffe2c11a1eb26f2b975f960 /src/option_menu.c | |
parent | 069a7e71fc8bd0886fe2d5c39bb96d8fee0d798b (diff) | |
parent | 867b496f2e5a525043c9fd82ccaaad9349c89fac (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
Diffstat (limited to 'src/option_menu.c')
-rw-r--r-- | src/option_menu.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index cbbe14b77..de9a216a6 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -146,23 +146,7 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 1: - { - u8 *addr; - u32 size; - - addr = (u8 *)VRAM; - size = 0x18000; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } + DmaClearLarge16(3, (void*)(VRAM), VRAM_SIZE, 0x1000); DmaClear32(3, OAM, OAM_SIZE); DmaClear16(3, PLTT, PLTT_SIZE); SetGpuReg(REG_OFFSET_DISPCNT, 0); @@ -189,7 +173,6 @@ void CB2_InitOptionMenu(void) ShowBg(0); ShowBg(1); gMain.state++; - } break; case 2: ResetPaletteFade(); |