From ed200a5a16d34e8ef7c2d210cc4e4d2bebb64745 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 29 Jul 2013 13:58:20 -0400 Subject: fill out bank f more --- battle/effect_commands.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'battle/effect_commands.asm') diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 4372dacba..f52dfa483 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 -- cgit v1.2.3 From 14160a180f8a898d2c282155e32a3c907083cba0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 9 Aug 2013 17:42:04 -0400 Subject: hidden power type/power calculation --- battle/effect_commands.asm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'battle/effect_commands.asm') diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index f52dfa483..afe822a16 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -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 -- cgit v1.2.3