diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-23 20:46:23 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-23 20:46:23 -0500 |
| commit | d7a5ea998d5c92607b32e633d8875898a6bc450b (patch) | |
| tree | cba5438a7d0e15762e032816f67774dd4b2ec9d8 /battle/effect_commands.asm | |
| parent | 8152ab612c0405d9e0074b7d51c9785e0dd3bc95 (diff) | |
More battle anims and bg effects
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 4bc2e3754..e7d4878bc 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -5584,12 +5584,12 @@ CheckIfStatCanBeRaised: ; 361ef StatUpAnimation: ; 36281 ld bc, wPlayerMinimized - ld hl, Function3f447 + ld hl, DropPlayerSub ld a, [hBattleTurn] and a jr z, .do_player ; 0x3628a $6 ld bc, wEnemyMinimized - ld hl, Function3f486 + ld hl, DropEnemySub .do_player ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar @@ -6174,11 +6174,11 @@ BattleCommand_RaiseSubNoAnim: ; 365af BattleCommand_LowerSubNoAnim: ; 365c3 - ld hl, Function3f447 + ld hl, DropPlayerSub ld a, [hBattleTurn] and a jr z, .PlayerTurn ; 365c9 $3 - ld hl, Function3f486 + ld hl, DropEnemySub .PlayerTurn xor a ld [hBGMapMode], a @@ -9239,13 +9239,13 @@ BattleCommand_ClearHazards: ; 37b39 BattleCommand_HealMorn: ; 37b74 ; healmorn ld b, MORN - jr BattleCommand_HealMorn6c + jr BattleCommand_TimeBasedHealContinue ; 37b78 BattleCommand_HealDay: ; 37b78 ; healday ld b, DAY - jr BattleCommand_HealMorn6c + jr BattleCommand_TimeBasedHealContinue ; 37b7c BattleCommand_HealNite: ; 37b7c @@ -9254,7 +9254,7 @@ BattleCommand_HealNite: ; 37b7c ; fallthrough ; 37b7e -BattleCommand_HealMorn6c: ; 37b7e +BattleCommand_TimeBasedHealContinue: ; 37b7e ; Time- and weather-sensitive heal. ld hl, BattleMonMaxHP @@ -9284,7 +9284,7 @@ BattleCommand_HealMorn6c: ; 37b7e ld a, [TimeOfDay] cp b jr z, .Weather - dec c + dec c ; double .Weather ld a, [Weather] |