mirror of
https://github.com/pret/pokered.git
synced 2024-10-23 15:08:23 +00:00
clean up rod code labels
hg-commit-id: 0b6dcc434492
This commit is contained in:
parent
c76b65f90b
commit
ac46a1dfa5
1 changed files with 8 additions and 8 deletions
16
common.asm
16
common.asm
|
@ -8699,20 +8699,20 @@ UnnamedText_e247: ; 0xe247
|
||||||
OldRodCode:
|
OldRodCode:
|
||||||
call $62b4 ; probably sets carry if not in battle or not by water
|
call $62b4 ; probably sets carry if not in battle or not by water
|
||||||
jp c, ItemUseNotTime
|
jp c, ItemUseNotTime
|
||||||
ld bc, $0585
|
ld bc, (5 << 8) | MAGIKARP
|
||||||
ld a, $1 ; set bite
|
ld a, $1 ; set bite
|
||||||
jr Next628E ; 0xe257 $34
|
jr RodResponse ; 0xe257 $34
|
||||||
|
|
||||||
GoodRodCode: ; 6259 0xe259
|
GoodRodCode: ; 6259 0xe259
|
||||||
call $62B4 ; probably sets carry if not in battle or not by water
|
call $62B4 ; probably sets carry if not in battle or not by water
|
||||||
jp c,ItemUseNotTime
|
jp c,ItemUseNotTime
|
||||||
Next625F:
|
.RandomLoop
|
||||||
call GenRandom
|
call GenRandom
|
||||||
srl a
|
srl a
|
||||||
jr c,Next6278
|
jr c, .SetBite
|
||||||
and %11
|
and %11
|
||||||
cp 2
|
cp 2
|
||||||
jr nc,Next625F
|
jr nc, .RandomLoop
|
||||||
; choose which monster appears
|
; choose which monster appears
|
||||||
ld hl,GoodRodMons
|
ld hl,GoodRodMons
|
||||||
add a,a
|
add a,a
|
||||||
|
@ -8723,11 +8723,11 @@ Next625F:
|
||||||
inc hl
|
inc hl
|
||||||
ld c,[hl]
|
ld c,[hl]
|
||||||
and a
|
and a
|
||||||
Next6278:
|
.SetBite
|
||||||
ld a,0
|
ld a,0
|
||||||
rla
|
rla
|
||||||
xor 1
|
xor 1
|
||||||
jr Next628E
|
jr RodResponse
|
||||||
|
|
||||||
GoodRodMons:
|
GoodRodMons:
|
||||||
db 10,GOLDEEN
|
db 10,GOLDEEN
|
||||||
|
@ -8738,7 +8738,7 @@ SuperRodCode: ; $6283 0xe283
|
||||||
jp c, ItemUseNotTime
|
jp c, ItemUseNotTime
|
||||||
call ReadSuperRodData ; 0xe8ea
|
call ReadSuperRodData ; 0xe8ea
|
||||||
ld a, e
|
ld a, e
|
||||||
Next628E:
|
RodResponse:
|
||||||
ld [$CD3D], a
|
ld [$CD3D], a
|
||||||
|
|
||||||
dec a ; is there a bite?
|
dec a ; is there a bite?
|
||||||
|
|
Loading…
Reference in a new issue