Merge branch 'master' of https://github.com/pret/pokecrystal

battle/core.asm

@@ -3454,7 +3454,7 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
 	ld bc, BASE_DATA_SIZE
 	call AddNTimes
 	ld de, EnemyMonType
-	ld bc, 2
+	ld bc, BASE_CATCH_RATE - BASE_TYPES
 	ld a, BANK(BaseData)
 	call FarCopyBytes
 	ld a, [BattleMonType1]

battle/effect_command_pointers.asm

@@ -78,7 +78,7 @@ BattleCommandPointers: ; 3fd28
 	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

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
 
@@ -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