diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 22:24:25 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 22:24:25 -0500 |
commit | 399d646e3fb24c8b4532267a4ab7aee4d2aaee92 (patch) | |
tree | 4805fda152bee21eb8bfb96f70f33e5f958c06b2 /src/starter_choose.c | |
parent | 9e8a841bfa0271a603b5e4895be3067cfa26f8ab (diff) | |
parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'src/starter_choose.c')
-rw-r--r-- | src/starter_choose.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c index f4067b382..fda1d95fa 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -393,8 +393,8 @@ void CB2_ChooseStarter(void) DmaFill16(3, 0, PLTT, PLTT_SIZE); LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); - LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x3000)); - LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x3800)); + LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(6))); + LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_085B1E00, ARRAY_COUNT(gUnknown_085B1E00)); |