ref: c76b65f90bb2ebc431aeb33a92f417dc9f907727
parent: f8c18f689d0123ac1cb9949c5b5b45bc931729fc
author: Bryan Bishop <kanzure@gmail.com>
date: Sat Jan 21 13:04:54 EST 2012
fix GiveItems hg-commit-id: 0222de43f4b8
--- a/common.asm
+++ b/common.asm
@@ -8226,7 +8226,7 @@
dw $6140 ; POKE_FLUTE
dw $6476 ; LIFT_KEY
dw $6476 ; EXP__ALL
- dw $624C ; OLD_ROD
+ dw OldRodCode ; OLD_ROD
dw GoodRodCode ; GOOD_ROD $6259
dw SuperRodCode ; SUPER_ROD $6283
dw $6317 ; PP_UP (see other?)
@@ -8696,7 +8696,12 @@
db $50
; 0xe247 + 5 bytes
-INCBIN "baserom.gbc",$e24c,$d
+OldRodCode:
+ call $62b4 ; probably sets carry if not in battle or not by water
+ jp c, ItemUseNotTime
+ ld bc, $0585
+ ld a, $1 ; set bite
+ jr Next628E ; 0xe257 $34
GoodRodCode: ; 6259 0xe259
call $62B4 ; probably sets carry if not in battle or not by water
@@ -10273,7 +10278,7 @@
ld hl, $51ca
call PrintText
ld bc,(TM_42 << 8) | 1
- call GIveItem
+ call GiveItem
jr nc, .asm_b655e ; 0x191aa
ld hl, $51cf
call PrintText