diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-06 18:09:25 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-06 18:09:25 -0400 |
| commit | d2ffdbf7ea6c6c92bd8ccbfd8405ec66e42ffd96 (patch) | |
| tree | 7458a786cd585489b31136d389da285851e02540 /engine/battle | |
| parent | 5838d479a2859ca17c0a0f2e88e0ead9644343c8 (diff) | |
Update battle anim bg function comments, and identify more unnamed labels
Diffstat (limited to 'engine/battle')
| -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 |