diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-02-12 00:40:42 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-02-12 00:40:42 -0600 |
| commit | dfb896356cf46fd1679814c7d5cf8f1e31e34dee (patch) | |
| tree | 0c38e9dc94b1ef531b7a740cd1a08c4a2d5e091c /src/battle_controller_player.c | |
| parent | 449fb25f2372c8d51fc156d0eeeffa4023ec38b8 (diff) | |
| parent | 16eff049a14be4f826edb8bc07929e6d5e4e4e0d (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 70b0a6160..6bcc97c68 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2377,7 +2377,7 @@ static void PlayerHandleTrainerSlide(void) static void PlayerHandleTrainerSlideBack(void) { - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; @@ -2921,7 +2921,7 @@ static void PlayerHandleIntroTrainerBallThrow(void) u8 paletteNum; u8 taskId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; |