diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-06 18:09:33 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-06 18:09:33 -0400 |
| commit | 2e90df15b76050c825f6c0b96c88453feec8f3dd (patch) | |
| tree | 7370a11f6a1d961eeb180066ca34cc7c5c2bda58 /engine/battle/core.asm | |
| parent | cf26f559857de7317900578c21c2e8727964d36c (diff) | |
Update battle anim bg function comments, and identify more unnamed labels
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 70cfde261..218fbeb75 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3111,7 +3111,7 @@ ForceEnemySwitch: call ClearEnemyMonBox call NewEnemyMonStatus call ResetEnemyStatLevels - call Function_SetEnemyMonAndSendOutAnimation + call ShowSetEnemyMonAndSendOutAnimation call BreakAttraction call ResetBattleParticipants ret @@ -3130,8 +3130,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 @@ -3155,8 +3155,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: ??? @@ -3526,13 +3526,13 @@ ClearEnemyMonBox: call WaitBGMap jp FinishBattleAnim -Function_BattleTextEnemySentOut: +ShowBattleTextEnemySentOut: callfar Battle_GetTrainerName ld hl, BattleText_EnemySentOut call StdBattleTextbox jp WaitBGMap -Function_SetEnemyMonAndSendOutAnimation: +ShowSetEnemyMonAndSendOutAnimation: ld a, [wTempEnemyMonSpecies] ld [wCurPartySpecies], a ld [wCurSpecies], a |