diff options
author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /battle/effects/present.asm | |
parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'battle/effects/present.asm')
-rwxr-xr-x | battle/effects/present.asm | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/battle/effects/present.asm b/battle/effects/present.asm deleted file mode 100755 index 819294f8c..000000000 --- a/battle/effects/present.asm +++ /dev/null @@ -1,93 +0,0 @@ -BattleCommand_Present: ; 37874 -; present - - ld a, [wLinkMode] - cp LINK_COLOSSEUM - jr z, .colosseum_skippush - push bc - push de -.colosseum_skippush - - call BattleCommand_Stab - - ld a, [wLinkMode] - cp LINK_COLOSSEUM - jr z, .colosseum_skippop - pop de - pop bc -.colosseum_skippop - - ld a, [wTypeMatchup] - and a - jp z, AnimateFailedMove - ld a, [AttackMissed] - and a - jp nz, AnimateFailedMove - - push bc - call BattleRandom - ld b, a - ld hl, .PresentPower - ld c, 0 -.next - ld a, [hli] - cp $ff - jr z, .heal_effect ; 378a4 $11 - cp b - jr nc, .got_power ; 378a7 $4 - inc c - inc hl - jr .next ; 378ab $f4 - -.got_power - ld a, c - ld [wPresentPower], a - call AnimateCurrentMoveEitherSide - ld d, [hl] - pop bc - ret - -.heal_effect - pop bc - ld a, $3 - ld [wPresentPower], a - call AnimateCurrentMove - call BattleCommand_SwitchTurn - ld hl, AICheckPlayerMaxHP - ld a, [hBattleTurn] - and a - jr z, .got_hp_fn_pointer ; 378c9 $3 - ld hl, AICheckEnemyMaxHP -.got_hp_fn_pointer - ld a, BANK(AICheckPlayerMaxHP) - rst FarCall - jr c, .already_fully_healed ; 378d1 $20 - - ld hl, GetQuarterMaxHP - call CallBattleCore - call BattleCommand_SwitchTurn - ld hl, RestoreHP - call CallBattleCore - call BattleCommand_SwitchTurn - ld hl, RegainedHealthText - call StdBattleTextBox - call BattleCommand_SwitchTurn - call UpdateOpponentInParty - jr .do_animation ; 378f1 $11 - -.already_fully_healed - call BattleCommand_SwitchTurn - call _CheckBattleScene - jr nc, .do_animation ; 378f9 $9 - call AnimateFailedMove - ld hl, RefusedGiftText - call StdBattleTextBox -.do_animation - jp EndMoveEffect - -.PresentPower: - db 40 percent, 40 - db 70 percent + 1, 80 - db 80 percent, 120 - db $ff -; 3790e |