diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-26 11:50:30 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-26 11:50:30 -0500 |
| commit | c61b3d42ad4e88b32e9c321b7fcc559ec0220e64 (patch) | |
| tree | eba145aa3ec6cc1216604b953dfe2bdce6e94dd2 /battle/effect_commands.asm | |
| parent | 5098ed740d35d4f2a2d5414f309bf25e754e189c (diff) | |
| parent | 76fe7c5aa1b93a6d03280ad54f411e351dd0abc2 (diff) | |
Merge remote-tracking branch 'yenatch/merge-kanzure-again' into master
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 4372dacba..afe822a16 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -6850,7 +6850,7 @@ Function0x365d7: ; 365d7 ld a, $5 call Function0x3661d - ld hl, $6d45 + ld hl, BadgeStatBoosts call CallBankF call SwitchTurn @@ -8385,7 +8385,7 @@ BattleCommand98: ; 36f25 ; doubleflyingdamage ld a, BATTLE_VARS_SUBSTATUS3_OPP call CleanGetBattleVarPair - bit 6, a ; flying + bit SUBSTATUS_FLYING, a ret z jr DoubleDamage ; 36f2f @@ -8395,7 +8395,7 @@ BattleCommand99: ; 36f2f ; doubleundergrounddamage ld a, BATTLE_VARS_SUBSTATUS3_OPP call CleanGetBattleVarPair - bit 5, a ; underground + bit SUBSTATUS_UNDERGROUND, a ret z ; fallthrough @@ -10623,11 +10623,7 @@ BattleCommand6d: ; 37be8 ld a, [AttackMissed] and a ret nz - - ld a, $3e - ld hl, $7ced - rst FarCall - + callba GetHiddenPower ret ; 37bf4 |