summaryrefslogtreecommitdiff
path: root/engine/events
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-03 10:12:54 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-03 10:12:54 -0500
commitb56c1b6351f51742903250ee0c4eae9d22e2b6a5 (patch)
treee288ee3655a5c4c9d383370c4eb4102f1ad8f9a0 /engine/events
parent980153ac472870602a51779dbff623ea0072ed98 (diff)
More syncing with pokecrystal
Diffstat (limited to 'engine/events')
-rw-r--r--engine/events/specials.asm5
1 files changed, 2 insertions, 3 deletions
diff --git a/engine/events/specials.asm b/engine/events/specials.asm
index 0b3e3560..7a176a1b 100644
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@@ -81,13 +81,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:
IF DEF(_GOLD)
db "SILVER@"
ELIF DEF(_SILVER)