diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2012-01-21 18:04:54 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2012-01-21 18:04:54 -0600 |
| commit | c76b65f90bb2ebc431aeb33a92f417dc9f907727 (patch) | |
| tree | a57b5b8c50d60e31f4dd2f66940a5a0585b0e630 | |
| parent | f8c18f689d0123ac1cb9949c5b5b45bc931729fc (diff) | |
fix GiveItems
hg-commit-id: 0222de43f4b8
| -rw-r--r-- | common.asm | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -8226,7 +8226,7 @@ ItemUsePtrTable: ;$D5E1 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 @@ UnnamedText_e247: ; 0xe247 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 @@ ViridianCityText6: ; 0x19196 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 |