From 418c70a8afd034ed1ded863bd60e1f11f714f962 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 10 Jan 2022 21:16:34 -0500 Subject: Don't require a boolean trainer flag for `givepoke` Fixes #865 --- macros/scripts/events.asm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'macros/scripts') diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 0a18456fa..c260a3a81 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 -- cgit v1.2.3