diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-17 02:40:30 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-17 02:40:30 -0500 |
| commit | 076d07f6fe24691d6d9d8872c049b18e2e16fa57 (patch) | |
| tree | fe67ff21237b8e988484e2a53eecaa50f01844ab /src/battle_intro.c | |
| parent | 71a7a8a0759373a8dafcccee82fa2d37cb285b85 (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/battle_intro.c')
| -rw-r--r-- | src/battle_intro.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/battle_intro.c b/src/battle_intro.c index 91e7c8ea0..736e35a87 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -250,12 +250,7 @@ static void BattleIntroSlide2(u8 taskId) if (gTasks[taskId].data[1] == 4) { - u16 *bg1Y = &gBattle_BG1_Y; - int cos = Cos2(gTasks[taskId].data[6]); - if (cos < 0) - cos += 0x1FF; - *bg1Y = (cos >> 9) - 8; - + gBattle_BG1_Y = Cos2(gTasks[taskId].data[6]) / 512 - 8; if (gTasks[taskId].data[6] < 180) gTasks[taskId].data[6] += 4; else |