diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2015-04-01 11:41:20 +0200 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2015-04-01 17:05:43 +0200 |
| commit | 46c2a38c7c55ff01e8787dfd624cb1c771248b6c (patch) | |
| tree | 6b8590d765cbb93f40fdb59d39f3a3e5d8ddb28e /engine/battle/moveEffects | |
| parent | Rename battle files and split move effects Part 1 (diff) | |
| download | pokeyellow-46c2a38c7c55ff01e8787dfd624cb1c771248b6c.tar.gz pokeyellow-46c2a38c7c55ff01e8787dfd624cb1c771248b6c.tar.xz pokeyellow-46c2a38c7c55ff01e8787dfd624cb1c771248b6c.zip | |
Rename battle files and split move effects Part 2
5.asm, 9.asm, and a.asm
Diffstat (limited to '')
| -rw-r--r-- | engine/battle/moveEffects/focus_energy_effect.asm | 24 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/battle/moveEffects/leech_seed_effect.asm (renamed from engine/battle/a.asm) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/battle/moveEffects/substitute_effect.asm (renamed from engine/battle/5.asm) | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm new file mode 100644 index 00000000..f01e61cc --- /dev/null +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -0,0 +1,24 @@ +FocusEnergyEffect_: ; 27f86 (9:7f86) + ld hl, W_PLAYERBATTSTATUS2 + ld a, [H_WHOSETURN] + and a + jr z, .notEnemy + ld hl, W_ENEMYBATTSTATUS2 +.notEnemy + bit GettingPumped, [hl] ; is mon already using focus energy? + jr nz, .alreadyUsing + set GettingPumped, [hl] ; mon is now using focus energy + callab PlayCurrentMoveAnimation + ld hl, GettingPumpedText + jp PrintText +.alreadyUsing + ld c, $32 + call DelayFrames + ld hl, PrintButItFailedText_ + ld b, BANK(PrintButItFailedText_) + jp Bankswitch + +GettingPumpedText: ; 27fb3 (9:7fb3) + db $0a + TX_FAR _GettingPumpedText + db "@" diff --git a/engine/battle/a.asm b/engine/battle/moveEffects/leech_seed_effect.asm index a257d143..a257d143 100755..100644 --- a/engine/battle/a.asm +++ b/engine/battle/moveEffects/leech_seed_effect.asm diff --git a/engine/battle/5.asm b/engine/battle/moveEffects/substitute_effect.asm index ef3e1362..e88def4a 100755..100644 --- a/engine/battle/5.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -1,4 +1,4 @@ -SubstituteEffectHandler: ; 17dad (5:7dad) +SubstituteEffect_: ; 17dad (5:7dad) ld c, 50 call DelayFrames ld hl, wBattleMonMaxHP |