diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-04 14:39:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-04 14:39:27 -0400 |
| commit | 7176eff7aafda5378305a593c459d158ac27601f (patch) | |
| tree | 85706da5f60a75f4a1aa8a12aa1b77638a538867 /macros/event.asm | |
| parent | 2e74d969f700f7eda40a84a75dfe8b4183d09683 (diff) | |
| parent | 2770cfc354b883f0e3f7e632374051ed9b5e936a (diff) | |
Merge pull request #311 from PikalaxALT/master
Bank 4 time functions moved out of main.asm
Diffstat (limited to 'macros/event.asm')
| -rw-r--r-- | macros/event.asm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/macros/event.asm b/macros/event.asm index 56028bf6a..22652abbd 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -300,12 +300,20 @@ givepoke: macro db givepoke_command db \1 ; pokemon db \2 ; level + if _NARG >= 3 db \3 ; item + if _NARG >= 4 db \4 ; trainer if \4 dw \5 ; trainer_name_pointer dw \6 ; pkmn_nickname endc + else + db 0 + endc + else + db 0, 0 + endc endm enum giveegg_command |