diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /engine/battle/moveEffects/focus_energy_effect.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'engine/battle/moveEffects/focus_energy_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/focus_energy_effect.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm index 9ba0ade0..16dad7bb 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -5,9 +5,9 @@ FocusEnergyEffect_: jr z, .notEnemy ld hl, wEnemyBattleStatus2 .notEnemy - bit GettingPumped, [hl] ; is mon already using focus energy? + bit GETTING_PUMPED, [hl] ; is mon already using focus energy? jr nz, .alreadyUsing - set GettingPumped, [hl] ; mon is now using focus energy + set GETTING_PUMPED, [hl] ; mon is now using focus energy callab PlayCurrentMoveAnimation ld hl, GettingPumpedText jp PrintText @@ -17,6 +17,6 @@ FocusEnergyEffect_: jpab PrintButItFailedText_ GettingPumpedText: - db $0a + TX_DELAY TX_FAR _GettingPumpedText db "@" |