diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/charmap.asm | 19 | ||||
| -rw-r--r-- | macros/event.asm | 8 |
2 files changed, 26 insertions, 1 deletions
diff --git a/macros/charmap.asm b/macros/charmap.asm index bc5f16c4f..48ef2cad3 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -282,5 +282,22 @@ charmap "<USER>", $5a charmap "<ENEMY>", $3f charmap "<PKMN>", $4a - + charmap "<PK>", $e1 + charmap "<MN>", $e2 + charmap "<PO>", $70 + charmap "<KE>", $71 + charmap "<MOM>", $49 + charmap "<POKE>", $24 charmap "<PLAY_G>", $14 ; <PLAYER> + gender + charmap "<PARA>", $51 + charmap "<LINE>", $4f + charmap "<NEXT>", $4e + charmap "<CONT>", $55 + charmap "<DONE>", $57 + charmap "<PROMPT>", $58 + charmap "<DAY>", $15 + charmap "<PC>", $5b + charmap "<TM>", $5c + charmap "<TRNER>", $5d + charmap "<ROCKET>", $5e + charmap "<......>", $56 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 |