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_anim_ghost.c | |
| parent | 52495e889fcc5a0045a77234ab28e06fd957f542 (diff) | |
| parent | c1da6b29bc853df1a42f08adb9b141de747dae55 (diff) | |
Merge branch 'master' into doc-pokemonstorage
Diffstat (limited to 'src/battle_anim_ghost.c')
| -rw-r--r-- | src/battle_anim_ghost.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c index 4b253a7ec..e7cd4b253 100644 --- a/src/battle_anim_ghost.c +++ b/src/battle_anim_ghost.c @@ -950,19 +950,19 @@ void AnimTask_CurseStretchingBlackBg(u8 taskId) SetGpuReg(REG_OFFSET_WINOUT, ((WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ) | (WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR))); SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_DARKEN)); - SetGpuReg(REG_OFFSET_BLDY, 0x10); + SetGpuReg(REG_OFFSET_BLDY, 16); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest()) startX = 40; else startX = 200; - gBattle_WIN0H = (startX << 8) | startX; + gBattle_WIN0H = WIN_RANGE(startX, startX); startY = 40; - gBattle_WIN0V = (startY << 8) | startY; + gBattle_WIN0V = WIN_RANGE(startY, startY); leftDistance = startX; - rightDistance = 240 - startX; + rightDistance = DISPLAY_WIDTH - startX; topDistance = startY; bottomDistance = 72; gTasks[taskId].data[1] = leftDistance; @@ -1001,7 +1001,7 @@ static void AnimTask_CurseStretchingBlackBg_Step1(u8 taskId) else { left = 0; - right = 240; + right = DISPLAY_WIDTH; top = 0; bottom = 112; selectedPalettes = GetBattleBgPalettesMask(1, 0, 0, 0, 0, 0, 0); @@ -1009,8 +1009,8 @@ static void AnimTask_CurseStretchingBlackBg_Step1(u8 taskId) gTasks[taskId].func = AnimTask_CurseStretchingBlackBg_Step2; } - gBattle_WIN0H = (left << 8) | right; - gBattle_WIN0V = (top << 8) | bottom; + gBattle_WIN0H = WIN_RANGE(left, right); + gBattle_WIN0V = WIN_RANGE(top, bottom); } static void AnimTask_CurseStretchingBlackBg_Step2(u8 taskId) |