diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-18 01:49:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-18 01:49:09 -0400 |
commit | 342ebbf406ca9623bc53ac00317835237099ce35 (patch) | |
tree | 9f9373c29dc27b5bb59ab90525820e5fcf81dc3e /src/battle_intro.c | |
parent | 52495e889fcc5a0045a77234ab28e06fd957f542 (diff) | |
parent | c1da6b29bc853df1a42f08adb9b141de747dae55 (diff) |
Merge branch 'master' into doc-pokemonstorage
Diffstat (limited to 'src/battle_intro.c')
-rw-r--r-- | src/battle_intro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_intro.c b/src/battle_intro.c index c76e5bc31..0ea65dab1 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -532,8 +532,8 @@ static void BattleIntroSlidePartner(u8 taskId) SetGpuReg(REG_OFFSET_WININ, WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_BG3 | WININ_WIN1_OBJ | WININ_WIN1_CLR); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR); gBattle_BG0_Y = -48; - gBattle_BG1_X = 240; - gBattle_BG2_X = -240; + gBattle_BG1_X = DISPLAY_WIDTH; + gBattle_BG2_X = -DISPLAY_WIDTH; } break; case 2: |