diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
| commit | 73cce797533c5985406b7b5696834b0976039c4f (patch) | |
| tree | bcf7766a7a7ae0ad42bbfacd9566c219fe1d0fd3 /src/battle_controller_player.c | |
| parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 3fabf25f8..49629198c 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -114,7 +114,7 @@ static void MoveSelectionDisplayPpNumber(void); static void MoveSelectionDisplayPpString(void); static void MoveSelectionDisplayMoveType(void); static void MoveSelectionDisplayMoveNames(void); -static void HandleMoveSwitchting(void); +static void HandleMoveSwitching(void); static void sub_8058FC0(void); static void WaitForMonSelection(void); static void CompleteWhenChoseItem(void); @@ -617,7 +617,7 @@ static void HandleInputChooseMove(void) MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27); BattlePutTextOnWindow(gText_BattleSwitchWhich, 0xB); - gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitchting; + gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitching; } } } @@ -672,7 +672,7 @@ u32 sub_8057FBC(void) // unused return var; } -static void HandleMoveSwitchting(void) +static void HandleMoveSwitching(void) { u8 perMovePPBonuses[4]; struct ChooseMoveStruct moveStruct; @@ -2385,7 +2385,7 @@ static void PlayerHandleTrainerSlideBack(void) gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy); StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); gBattlerControllerFuncs[gActiveBattler] = sub_80588B4; @@ -2930,7 +2930,7 @@ static void PlayerHandleIntroTrainerBallThrow(void) gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_805CC00); |