From 21607bdd1fc4950ab711bcc2f507add524d9d07b Mon Sep 17 00:00:00 2001 From: mid-kid Date: Wed, 13 Dec 2017 15:22:01 +0100 Subject: HELD_TRADE_EVOLVE -> HELD_FLINCH This item effect effectively causes the target to flinch (sometimes). It's not exclusive to trade evolve items in later generations either. --- battle/effect_commands.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'battle/effect_commands.asm') diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 57e4c574f..2ed9a73c4 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -7184,7 +7184,7 @@ CheckOpponentWentFirst: ; 36abf ; 36ac9 -BattleCommand_KingsRock: ; 36ac9 +BattleCommand_HeldFlinch: ; 36ac9 ; kingsrock ld a, [AttackMissed] @@ -7193,7 +7193,7 @@ BattleCommand_KingsRock: ; 36ac9 call GetUserItem ld a, b - cp HELD_TRADE_EVOLVE ; Only King's Rock has this effect + cp HELD_FLINCH ret nz call CheckSubstituteOpp -- cgit v1.2.3 From cbec3771e2944a502eea69aeb012bea6cdc4e26b Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 19 Dec 2017 21:28:06 +0100 Subject: Misc fixes for the usage of constants Several improvements that will make it easier to edit some data structures for everyone. --- battle/effect_commands.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'battle/effect_commands.asm') diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 2ed9a73c4..b40055f04 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3881,11 +3881,11 @@ BattleCommand_Counter: ; 35813 ld de, StringBuffer1 call GetMoveData - ld a, [StringBuffer1 + 2] + ld a, [StringBuffer1 + MOVE_POWER] and a ret z - ld a, [StringBuffer1 + 3] + ld a, [StringBuffer1 + MOVE_TYPE] cp SPECIAL ret nc -- cgit v1.2.3