diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-25 21:34:42 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-25 21:34:42 -0500 |
| commit | 87514598bedf66be222d85ebbc7565c14d79e0f4 (patch) | |
| tree | deca5a42ceb1487b5cf7036a805f1c3f19e29399 /engine/battle/effect_commands | |
| parent | d504fb88529526f988985f7faaf70609263cb4a0 (diff) | |
More battle data in data/battle/
Diffstat (limited to 'engine/battle/effect_commands')
| -rw-r--r-- | engine/battle/effect_commands/metronome.asm | 17 | ||||
| -rwxr-xr-x | engine/battle/effect_commands/present.asm | 11 |
2 files changed, 4 insertions, 24 deletions
diff --git a/engine/battle/effect_commands/metronome.asm b/engine/battle/effect_commands/metronome.asm index 1908df84d..6835ab569 100644 --- a/engine/battle/effect_commands/metronome.asm +++ b/engine/battle/effect_commands/metronome.asm @@ -43,19 +43,4 @@ BattleCommand_Metronome: ; 37418 ; 37454 -MetronomeExcepts: ; 37454 - db NO_MOVE - db METRONOME - db STRUGGLE - db SKETCH - db MIMIC - db COUNTER - db MIRROR_COAT - db PROTECT - db DETECT - db ENDURE - db DESTINY_BOND - db SLEEP_TALK - db THIEF - db -1 -; 37462 +INCLUDE "data/battle/metronome_exception_moves.asm" diff --git a/engine/battle/effect_commands/present.asm b/engine/battle/effect_commands/present.asm index 2b358e8b9..1af6b4b49 100755 --- a/engine/battle/effect_commands/present.asm +++ b/engine/battle/effect_commands/present.asm @@ -27,7 +27,7 @@ BattleCommand_Present: ; 37874 push bc call BattleRandom ld b, a - ld hl, .PresentPower + ld hl, PresentPower ld c, 0 .next ld a, [hli] @@ -49,7 +49,7 @@ BattleCommand_Present: ; 37874 .heal_effect pop bc - ld a, $3 + ld a, 3 ld [wPresentPower], a call AnimateCurrentMove call BattleCommand_SwitchTurn @@ -85,9 +85,4 @@ BattleCommand_Present: ; 37874 .do_animation jp EndMoveEffect -.PresentPower: - db 40 percent, 40 - db 70 percent + 1, 80 - db 80 percent, 120 - db -1 ; end -; 3790e +INCLUDE "data/battle/present_power.asm" |