pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

HELD_TRADE_EVOLVE -> HELD_FLINCH

Browse Source 
This item effect effectively causes the target to flinch (sometimes).
It's not exclusive to trade evolve items in later generations either.
This commit is contained in:
mid-kid 2017-12-13 15:22:01 +01:00
parent d787c66374
commit 21607bdd1f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
battle/effect_command_pointers.asm
View File

@ -78,7 +78,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand_Spite ; 35c0f dw BattleCommand_Spite ; 35c0f
dw BattleCommand_FalseSwipe ; 35c94 dw BattleCommand_FalseSwipe ; 35c94
dw BattleCommand_HealBell ; 35cc9 dw BattleCommand_HealBell ; 35cc9
dw BattleCommand_KingsRock ; 36ac9 dw BattleCommand_HeldFlinch ; 36ac9
dw BattleCommand_TripleKick ; 346b2 dw BattleCommand_TripleKick ; 346b2
dw BattleCommand_KickCounter ; 346cd dw BattleCommand_KickCounter ; 346cd
dw BattleCommand_Thief ; 37492 dw BattleCommand_Thief ; 37492

4
battle/effect_commands.asm
View File

@ -7184,7 +7184,7 @@ CheckOpponentWentFirst: ; 36abf
; 36ac9 ; 36ac9
BattleCommand_KingsRock: ; 36ac9 BattleCommand_HeldFlinch: ; 36ac9
; kingsrock ; kingsrock
ld a, [AttackMissed] ld a, [AttackMissed]
@ -7193,7 +7193,7 @@ BattleCommand_KingsRock: ; 36ac9
call GetUserItem call GetUserItem
ld a, b ld a, b
cp HELD_TRADE_EVOLVE ; Only King's Rock has this effect cp HELD_FLINCH
ret nz ret nz
call CheckSubstituteOpp call CheckSubstituteOpp

2
constants/item_constants.asm
View File

@ -366,7 +366,7 @@ const_value SET 70
const HELD_ESCAPE const HELD_ESCAPE
const HELD_CRITICAL_UP const HELD_CRITICAL_UP
const HELD_QUICK_CLAW const HELD_QUICK_CLAW
const HELD_TRADE_EVOLVE const HELD_FLINCH
const HELD_AMULET_COIN const HELD_AMULET_COIN
const HELD_BRIGHTPOWDER const HELD_BRIGHTPOWDER
const HELD_78 const HELD_78

2
data/items/item_attributes.asm
View File

@ -170,7 +170,7 @@ ItemAttributes: ; 67c1
; POISON BARB ; POISON BARB
item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; KING'S ROCK ; 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 ; BITTER BERRY
item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY
; MINT BERRY ; MINT BERRY