diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-18 01:19:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 01:19:16 -0500 |
| commit | 0a7b97ee0605e48a34c7af193a26d770c6d23d29 (patch) | |
| tree | 1170647551cd0b2d79c0b1543a09198aeb10612a /src/starter_choose.c | |
| parent | 5695617d64335474ead8a7e25c539daebcc55fa5 (diff) | |
| parent | 367c7b5f89e9433b7e11af645afbaaa6f4002930 (diff) | |
Merge branch 'master' into multiplayer-stuff
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 2d4a1b1e1..5a8de3b4a 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)); |