shithub: pokecrystal

Download patch

ref: b7e44124d31c66cb7de4f8f609a48dd1dba78c96
parent: 7a532435bf5782d89d09f2f4e0985cf3e90d890f
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Feb 2 07:29:42 EST 2018

Fix confusing label

--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -355,33 +355,25 @@
 	ld a, $ff
 .max_1
 
+	; BUG: farcall overwrites a, and GetItemHeldEffect takes b anyway.
+	; This is probably the reason the HELD_CATCH_CHANCE effect is never used.
+	; Uncomment the line below to fix.
 	ld d, a
 	push de
-
-	; BUG: farcall overwrites a,
-	; and GetItemHeldEffect takes b anyway.
-
-	; This is probably the reason
-	; the HELD_CATCH_CHANCE effect
-	; is never used.
-
-	; Uncomment the line below to fix.
-
 	ld a, [BattleMonItem]
 ;	ld b, a
 	farcall GetItemHeldEffect
 	ld a, b
 	cp HELD_CATCH_CHANCE
-
 	pop de
 	ld a, d
-
-	jr nz, .skip_hp_calc
+	jr nz, .max_2
 	add c
-	jr nc, .skip_hp_calc
+	jr nc, .max_2
 	ld a, $ff
-.skip_hp_calc
+.max_2
 
+.skip_hp_calc
 	ld b, a
 	ld [Buffer1], a
 	call Random