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

2021-11-17 22:03:37 -05:00
parent c4f8f4d11a ecb13cdbf7
commit b9fa18bdd4
79 changed files with 6531 additions and 6301 deletions
@@ -308,7 +308,7 @@ static const struct BgTemplate sOverworldBgTemplates[] =

 static const struct ScanlineEffectParams sFlashEffectParams =
 {
-    (void *)REG_ADDR_WIN0H,
+    &REG_WIN0H,
    ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
    1,
    0,