Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros

This commit is contained in:
GriffinR
2021-11-17 22:03:37 -05:00
79 changed files with 6531 additions and 6301 deletions
+1 -1
View File
@@ -870,7 +870,7 @@ static const struct WindowTemplate sInfoCardWindowTemplates[] =
static const struct ScanlineEffectParams sTourneyTreeScanlineEffectParams =
{
.dmaDest = (void *)REG_ADDR_BG3CNT,
.dmaDest = &REG_BG3CNT,
.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT,
.initState = 1,
};