diff options
author | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
---|---|---|
committer | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
commit | a3ebca4d814adcf245212cb549f72812f2cf39c6 (patch) | |
tree | 88fddcd03a5f19cf84b6199863f95fd06f1954bf /src/reshow_battle_screen.c | |
parent | 1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (diff) | |
parent | a0ff38d0be4f618822d96cc7833e7c331ee78b5f (diff) |
Fix merge conflicts
Diffstat (limited to 'src/reshow_battle_screen.c')
-rw-r--r-- | src/reshow_battle_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 06d2af5b7..1b17c372c 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -50,8 +50,8 @@ static void CB2_ReshowBattleScreenAfterMenu(void) case 0: ScanlineEffect_Clear(); BattleInitBgsAndWindows(); - SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); - SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(1, BG_ATTR_CHARBASEINDEX, 0); + SetBgAttribute(2, BG_ATTR_CHARBASEINDEX, 0); ShowBg(0); ShowBg(1); ShowBg(2); |