diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-17 12:37:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 12:37:06 -0600 |
| commit | 9c33214510c63fea9a8041011fd061219d9b61b0 (patch) | |
| tree | ece40e9b5161287e03ba64318b9aed24d344dfea /src/main_menu.c | |
| parent | 19b76bffda07d8878c1ff1a9005e1b57c549ffce (diff) | |
| parent | 22657c708753df14e84d4bdae4afac0072803447 (diff) | |
Merge pull request #564 from garakmon/vram
use macros for VRAM offsets
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 4cd5c8e14..82a30aa59 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1147,7 +1147,7 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId) SetGpuReg(REG_OFFSET_BLDY, 0); LZ77UnCompVram(sBirchSpeechShadowGfx, (void*)VRAM); - LZ77UnCompVram(sBirchSpeechBgMap, (void*)(VRAM + 0x3800)); + LZ77UnCompVram(sBirchSpeechBgMap, (void*)(BG_SCREEN_ADDR(7))); LoadPalette(sBirchSpeechBgPals, 0, 64); LoadPalette(sBirchSpeechPlatformBlackPal, 1, 16); ScanlineEffect_Stop(); @@ -1687,7 +1687,7 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) DmaFill16(3, 0, PLTT, PLTT_SIZE); ResetPaletteFade(); LZ77UnCompVram(sBirchSpeechShadowGfx, (u8*)VRAM); - LZ77UnCompVram(sBirchSpeechBgMap, (u8*)(VRAM + 0x3800)); + LZ77UnCompVram(sBirchSpeechBgMap, (u8*)(BG_SCREEN_ADDR(7))); LoadPalette(sBirchSpeechBgPals, 0, 64); LoadPalette(&sBirchSpeechBgGradientPal[1], 1, 16); ResetTasks(); |