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/battle_main.c | |
| parent | c4f8f4d11aeb2255fb0e7ccaa1256be7a2a0f63b (diff) | |
| parent | ecb13cdbf722aacbceca1b7a2e7514e5dd1ec83a (diff) | |
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index ac00567a0..682849af7 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -249,13 +249,13 @@ u8 gBattleControllerData[MAX_BATTLERS_COUNT]; // Used by the battle controllers static const struct ScanlineEffectParams sIntroScanlineParams16Bit = { - (void *)REG_ADDR_BG3HOFS, SCANLINE_EFFECT_DMACNT_16BIT, 1 + ®_BG3HOFS, SCANLINE_EFFECT_DMACNT_16BIT, 1 }; // unused static const struct ScanlineEffectParams sIntroScanlineParams32Bit = { - (void *)REG_ADDR_BG3HOFS, SCANLINE_EFFECT_DMACNT_32BIT, 1 + ®_BG3HOFS, SCANLINE_EFFECT_DMACNT_32BIT, 1 }; const struct SpriteTemplate gUnusedBattleInitSprite = |