diff options
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a7524172..666eb9a0 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2923,7 +2923,7 @@ ForceEnemySwitch: call ClearEnemyMonBox call NewEnemyMonStatus call ResetEnemyStatLevels - call Function_SetEnemyMonAndSendOutAnimation + call ShowSetEnemyMonAndSendOutAnimation call BreakAttraction call ResetBattleParticipants ret @@ -2942,8 +2942,8 @@ EnemySwitch: call OfferSwitch push af call ClearEnemyMonBox - call Function_BattleTextEnemySentOut - call Function_SetEnemyMonAndSendOutAnimation + call ShowBattleTextEnemySentOut + call ShowSetEnemyMonAndSendOutAnimation pop af ret c ; If we're here, then we're switching too @@ -2967,8 +2967,8 @@ EnemySwitch_SetMode: ld a, 1 ld [wEnemyIsSwitching], a call ClearEnemyMonBox - call Function_BattleTextEnemySentOut - jp Function_SetEnemyMonAndSendOutAnimation + call ShowBattleTextEnemySentOut + jp ShowSetEnemyMonAndSendOutAnimation CheckWhetherSwitchmonIsPredetermined: ; returns carry if: ??? @@ -3336,12 +3336,12 @@ ClearEnemyMonBox: call WaitBGMap jp FinishBattleAnim -Function_BattleTextEnemySentOut: +ShowBattleTextEnemySentOut: callfar Battle_GetTrainerName ld hl, BattleText_EnemySentOut jp StdBattleTextbox -Function_SetEnemyMonAndSendOutAnimation: +ShowSetEnemyMonAndSendOutAnimation: ld a, [wTempEnemyMonSpecies] ld [wCurPartySpecies], a ld [wCurSpecies], a |