diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-17 22:03:37 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-17 22:03:37 -0500 |
| commit | b9fa18bdd4a44e219c7678c26d692b2be4baeea3 (patch) | |
| tree | e7466ec4ff6635202580e6a29d748d6101f59a9f /src/intro.c | |
| parent | c4f8f4d11aeb2255fb0e7ccaa1256be7a2a0f63b (diff) | |
| parent | ecb13cdbf722aacbceca1b7a2e7514e5dd1ec83a (diff) | |
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros
Diffstat (limited to 'src/intro.c')
| -rw-r--r-- | src/intro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intro.c b/src/intro.c index 418e143cf..827ce80be 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1848,7 +1848,7 @@ static void Task_Scene3_StartGroudon(u8 taskId) { gTasks[taskId].tState = 0; gTasks[taskId].func = Task_Scene3_Groudon; - ScanlineEffect_InitWave(0, 160, 4, 4, 1, 4, 0); + ScanlineEffect_InitWave(0, 160, 4, 4, 1, SCANLINE_EFFECT_REG_BG1HOFS, 0); } #define tScreenX data[1] @@ -2058,7 +2058,7 @@ static void Task_Scene3_LoadKyogre(u8 taskId) gTasks[taskId].tDelay = 16; gTasks[taskId].tZoom = 256; PanFadeAndZoomScreen(gTasks[taskId].tScreenX, gTasks[taskId].tScreenY, gTasks[taskId].tZoom, 0); - ScanlineEffect_InitWave(0, 0xA0, 4, 4, 1, 6, 0); + ScanlineEffect_InitWave(0, 0xA0, 4, 4, 1, SCANLINE_EFFECT_REG_BG1VOFS, 0); } static void Task_Scene3_Kyogre(u8 taskId) |