More syncing with pokegold

This commit is contained in:
Rangi
2020-11-03 10:13:06 -05:00
parent 01d6e6c758
commit 826e070f04
14 changed files with 29 additions and 29 deletions

View File

@@ -15,7 +15,7 @@ GiveShuckle:
jr nc, .NotGiven
; Caught data.
ld b, 0
ld b, CAUGHT_BY_UNKNOWN
farcall SetGiftPartyMonCaughtData
; Holding a Berry.

View File

@@ -87,13 +87,12 @@ NameRival:
ld b, NAME_RIVAL
ld de, wRivalName
farcall _NamingScreen
; default to "SILVER"
ld hl, wRivalName
ld de, .default
ld de, .DefaultName
call InitName
ret
.default
.DefaultName:
db "SILVER@"
NameRater: