From ac46a1dfa5fc647aff4ac28a8b3b43c8762708ff Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 21 Jan 2012 18:09:08 -0600
Subject: clean up rod code labels

hg-commit-id: 0b6dcc434492
---
 common.asm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common.asm b/common.asm
index 502d93c9..7ee89c04 100644
--- a/common.asm
+++ b/common.asm
@@ -8699,20 +8699,20 @@ UnnamedText_e247: ; 0xe247
 OldRodCode:
 	call $62b4 ; probably sets carry if not in battle or not by water
 	jp c, ItemUseNotTime
-	ld bc, $0585
+	ld bc, (5 << 8) | MAGIKARP
 	ld a, $1 ; set bite
-	jr Next628E ; 0xe257 $34
+	jr RodResponse ; 0xe257 $34
 
 GoodRodCode: ; 6259 0xe259
 	call $62B4 ; probably sets carry if not in battle or not by water
 	jp c,ItemUseNotTime
-Next625F:
+.RandomLoop
 	call GenRandom
 	srl a
-	jr c,Next6278
+	jr c, .SetBite
 	and %11
 	cp 2
-	jr nc,Next625F
+	jr nc, .RandomLoop
 	; choose which monster appears
 	ld hl,GoodRodMons
 	add a,a
@@ -8723,11 +8723,11 @@ Next625F:
 	inc hl
 	ld c,[hl]
 	and a
-Next6278:
+.SetBite
 	ld a,0
 	rla
 	xor 1
-	jr Next628E
+	jr RodResponse
 
 GoodRodMons:
 	db 10,GOLDEEN
@@ -8738,7 +8738,7 @@ SuperRodCode: ; $6283 0xe283
 	jp c, ItemUseNotTime
 	call ReadSuperRodData ; 0xe8ea
 	ld a, e
-Next628E:
+RodResponse:
 	ld [$CD3D], a
 
 	dec a ; is there a bite?
-- 
cgit v1.2.3