ref: 21607bdd1fc4950ab711bcc2f507add524d9d07b
parent: d787c66374df60fceb34fa5860c34bf56e476cbe
author: mid-kid <esteve.varela@gmail.com>
date: Wed Dec 13 10:22:01 EST 2017
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.
--- a/battle/effect_command_pointers.asm
+++ b/battle/effect_command_pointers.asm
@@ -78,7 +78,7 @@
dw BattleCommand_Spite ; 35c0f
dw BattleCommand_FalseSwipe ; 35c94
dw BattleCommand_HealBell ; 35cc9
- dw BattleCommand_KingsRock ; 36ac9
+ dw BattleCommand_HeldFlinch ; 36ac9
dw BattleCommand_TripleKick ; 346b2
dw BattleCommand_KickCounter ; 346cd
dw BattleCommand_Thief ; 37492
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -7184,7 +7184,7 @@
; 36ac9
-BattleCommand_KingsRock: ; 36ac9
+BattleCommand_HeldFlinch: ; 36ac9
; kingsrock
ld a, [AttackMissed]
@@ -7193,7 +7193,7 @@
call GetUserItem
ld a, b
- cp HELD_TRADE_EVOLVE ; Only King's Rock has this effect
+ cp HELD_FLINCH
ret nz
call CheckSubstituteOpp
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -366,7 +366,7 @@
const HELD_ESCAPE
const HELD_CRITICAL_UP
const HELD_QUICK_CLAW
- const HELD_TRADE_EVOLVE
+ const HELD_FLINCH
const HELD_AMULET_COIN
const HELD_BRIGHTPOWDER
const HELD_78
--- a/data/items/item_attributes.asm
+++ b/data/items/item_attributes.asm
@@ -170,7 +170,7 @@
; POISON BARB
item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; KING'S ROCK
- item_attribute 100, HELD_TRADE_EVOLVE, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+ item_attribute 100, HELD_FLINCH, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BITTER BERRY
item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY
; MINT BERRY