diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:26:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 15:26:44 -0400 |
| commit | a081124a20896a0cc2ee4fac2df6d4b5440125ef (patch) | |
| tree | d839bae53453aadf4b7bf14a72d1669eaf6fee43 /asm | |
| parent | 2368f57669f6d2e9dc81f4028ff95c9421bd31a8 (diff) | |
| parent | e47b3efdfe8a397e20905d566a8e1b1261170fbb (diff) | |
Merge branch 'master' into doc-inc
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/event.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 54078332c..57bb504bd 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -878,15 +878,15 @@ .endm @ Displays a box containing the front sprite for the specified (species) Pokemon species. - .macro drawmonpic species:req, x:req, y:req + .macro showmonpic species:req, x:req, y:req .byte 0x75 .2byte \species .byte \x .byte \y .endm - @ Hides all boxes displayed with drawmonpic. - .macro erasemonpic + @ Hides all boxes displayed with showmonpic. + .macro hidemonpic .byte 0x76 .endm |