diff options
author | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
---|---|---|
committer | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
commit | 73554ec88d4f269b6146f6d1ab5d2742cb0a6f89 (patch) | |
tree | fac5bee8a4ce4757816dbbe42265523478b78781 /src/battle_intro.c | |
parent | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (diff) | |
parent | 63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff) |
Merge remote-tracking branch 'pret/master'
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: |