Nickname "@" is default

1 files changed, 18 insertions, 5 deletions

diff --git a/Allow-more-trainer-parties,-with-individual-DVs,-stat-experience,-and-nicknames.md b/Allow-more-trainer-parties,-with-individual-DVs,-stat-experience,-and-nicknames.md
index 7590af1..a3eb700 100644
--- a/Allow-more-trainer-parties,-with-individual-DVs,-stat-experience,-and-nicknames.md
+++ b/Allow-more-trainer-parties,-with-individual-DVs,-stat-experience,-and-nicknames.md
@@ -349,9 +349,15 @@ Edit [engine/battle/read_trainer_party.asm](../blob/master/engine/battle/read_tr
 +	bit TRAINERTYPE_NICKNAME_F, a
 +	jr z, .no_nickname
 +
++	ld a, [hli]
++	cp "@"
++	jr z, .not_nickname
++
 +	push de
 +
 +	ld de, wStringBuffer2
++	ld [de], a
++	inc de
 +.copy_nickname
 +	ld a, [hli]
 +	ld [de], a
@@ -437,14 +443,14 @@ Finally, edit [engine/overworld/wildmons.asm](../blob/master/engine/overworld/wi
  	...
 ```
 
-Now you can give nicknames to enemy Pokémon. Be sure to keep the data in order: level, species, nickname, held item, moves.
+Now you can give nicknames to enemy Pokémon. If the nickname is just `"@"`, it will use the default species name. Be sure to keep the data in order: level, species, nickname, held item, moves.
 
 For example, here's a party for your rival that give him nicknames, held items, and a new Pokémon:
 
 ```
 	db "RIVAL@", TRAINERTYPE_NICKNAME | TRAINERTYPE_ITEM
-	db  3, RATTATA,    "RATTATA@", NO_ITEM
-	db  5, TOTODILE,   "JAWS@",    BERRY
+	db  3, RATTATA,    "@",     NO_ITEM
+	db  5, TOTODILE,   "JAWS@", BERRY
 	db -1 ; end
 ```
 
@@ -962,10 +968,17 @@ Edit [engine/battle/read_trainer_party.asm](../blob/master/engine/battle/read_tr
  	ld a, [wOtherTrainerType]
  	bit TRAINERTYPE_NICKNAME_F, a
  	jr z, .no_nickname
-
+ 
+-	ld a, [hli]
++	call GetNextTrainerDataByte
+ 	cp "@"
+ 	jr z, .not_nickname
+ 
  	push de
-
+ 
  	ld de, wStringBuffer2
+ 	ld [de], a
+ 	inc de
  .copy_nickname
 -	ld a, [hli]
 +	call GetNextTrainerDataByte