diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-01-10 21:16:32 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-01-10 21:16:32 -0500 |
| commit | d850eb831b07114d463c2c4410819462426588f1 (patch) | |
| tree | 4e09f3a1f35d4c0e6c17c3ff21eb11fe882898d6 | |
| parent | 2aba2b9ff003cb4c208634d62fa1cd69418b92f0 (diff) | |
Don't require a boolean trainer flag for `givepoke`
| -rw-r--r-- | macros/scripts/events.asm | 6 | ||||
| -rw-r--r-- | maps/Route35GoldenrodGate.asm | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 89d25fa8..663490aa 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -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 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 7295b6ad..ce92ae8b 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -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 |