Don't require a boolean trainer flag for givepoke

This commit is contained in:
Rangi 2022-01-10 21:16:32 -05:00
parent 2aba2b9ff0
commit d850eb831b
2 changed files with 5 additions and 3 deletions

View File

@ -300,6 +300,8 @@ if _NARG == 2
givepoke \1, \2, NO_ITEM, FALSE
elif _NARG == 3
givepoke \1, \2, \3, FALSE
elif _NARG == 5
givepoke \1, \2, \3, TRUE, \4, \5
else
db givepoke_command
db \1 ; pokemon
@ -307,8 +309,8 @@ else
db \3 ; item
db \4 ; trainer
if \4
dw \5 ; trainer_name_pointer
dw \6 ; pkmn_nickname
dw \5 ; nickname_pointer
dw \6 ; ot_name_pointer
endc
endc
ENDM

View File

@ -27,7 +27,7 @@ RandyScript:
writetext Route35GoldenrodGatePlayerReceivedAMonWithMailText
playsound SFX_KEY_ITEM
waitsfx
givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName
givepoke SPEAROW, 10, NO_ITEM, GiftSpearowName, GiftSpearowOTName
givepokemail GiftSpearowMail
setevent EVENT_GOT_KENYA
.alreadyhavekenya