diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-03 10:13:06 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-03 10:13:06 -0500 |
| commit | 826e070f0443b50ff31a49b4faf7c66577f1e26e (patch) | |
| tree | 5a466635490c15e6a9e78e037507a22fceb1da9f /engine/events | |
| parent | 01d6e6c75843fdc0035499ce0214c19be74a9bda (diff) | |
More syncing with pokegold
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/shuckle.asm | 2 | ||||
| -rw-r--r-- | engine/events/specials.asm | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index 85bcce629..3a5f872e2 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -15,7 +15,7 @@ GiveShuckle: jr nc, .NotGiven ; Caught data. - ld b, 0 + ld b, CAUGHT_BY_UNKNOWN farcall SetGiftPartyMonCaughtData ; Holding a Berry. diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 1333f27ce..f49d358f4 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -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: |