diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-05-14 16:20:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 16:20:13 -0400 |
| commit | 31e1a9e7596499e1fc90bc9b515dba888503f6f9 (patch) | |
| tree | 0d18f7532ed1c607567a78b5192332c887935369 /asm/macros/event.inc | |
| parent | 9b01d4fee588b0733cf4242173d43a9fc5889e57 (diff) | |
| parent | 2e9d8a61e0882d6606e72185e830a4abc623c21d (diff) | |
Merge pull request #48 from garakmon/mapdump
map data
Diffstat (limited to 'asm/macros/event.inc')
| -rw-r--r-- | asm/macros/event.inc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index d805aecb5..11ec30d74 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -653,6 +653,9 @@ .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script + .elseif \type == 9 + .4byte \pointer1 @ text + .4byte \pointer2 @ text .endif .endm @@ -824,8 +827,9 @@ .4byte \text .endm + @ RENAMED! @ Gives the player one of the specified (species) Pokmon at level level holding item. The unknown arguments should all be zeroes. - .macro givepoke species, level, item, unknown1, unknown2, unknown3 + .macro givemon species, level, item, unknown1, unknown2, unknown3 .byte 0x79 .2byte \species .byte \level @@ -840,7 +844,8 @@ .2byte \species .endm - .macro setpokemove byte1, byte2, word + @ RENAMED! + .macro setmonmove byte1, byte2, word .byte 0x7b .byte \byte1 .byte \byte2 @@ -860,14 +865,16 @@ .2byte \species .endm + @ RENAMED! @ Writes the name of the species of the first Pokémon in the player's party to the specified buffer. - .macro getfirstpartypokename out + .macro getfirstpartymonname out .byte 0x7e .byte \out .endm + @ RENAMED! @ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer. - .macro getpartypokename out, slot + .macro getpartymonname out, slot .byte 0x7f .byte \out .2byte \slot @@ -1181,12 +1188,8 @@ .endm @ In Emerald, this command consumes its parameters and does nothing. In FireRed, this command is a nop. - .macro addelevmenuitem a, b, c, d + .macro addelevmenuitem .byte 0xb1 - .byte \a - .2byte \b - .2byte \c - .2byte \d .endm @ In FireRed and Emerald, this command is a nop. |