sync engine code with pokeyellow

This commit is contained in:
YamaArashi 2016-06-11 21:30:05 -07:00
parent a51037eeee
commit fd2235e678
47 changed files with 385 additions and 350 deletions

View file

@ -2,15 +2,15 @@ GetTrainerName_:
ld hl, wGrassRate
ld a, [wLinkState]
and a
jr nz, .rival
jr nz, .foundName
ld hl, wRivalName
ld a, [wTrainerClass]
cp SONY1
jr z, .rival
jr z, .foundName
cp SONY2
jr z, .rival
jr z, .foundName
cp SONY3
jr z, .rival
jr z, .foundName
ld [wd0b5], a
ld a, TRAINER_NAME
ld [wNameListType], a
@ -18,7 +18,7 @@ GetTrainerName_:
ld [wPredefBank], a
call GetName
ld hl, wcd6d
.rival
.foundName
ld de, wTrainerName
ld bc, $d
jp CopyData