diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-07 12:58:11 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-07 13:33:05 -0500 |
| commit | 54b254a829d973345b0d282b7a4ffd7458a5c7da (patch) | |
| tree | db16c5d0a7b31889ecbc49e28c1e8c79c41f9606 /asm/macros | |
| parent | 4f825a6ee012c925b3da100b67d363676a03029d (diff) | |
Add CRY_MODE constants
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.inc | 10 | ||||
| -rw-r--r-- | asm/macros/music_voice.inc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 62437ccb8..27a439725 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -334,10 +334,10 @@ .byte 0x30 .endm - @ Plays the specified (fanfare_number) fanfare. - .macro playfanfare fanfare_number:req + @ Plays the fanfare specified by the song number. If the specified song is not a fanfare it will instead play the first song in sFanfares. + .macro playfanfare songNumber:req .byte 0x31 - .2byte \fanfare_number + .2byte \songNumber .endm @ Blocks script execution until all currently-playing fanfares finish. @@ -1208,10 +1208,10 @@ .endm @ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes. - .macro playmoncry species:req, effect:req + .macro playmoncry species:req, mode:req .byte 0xa1 .2byte \species - .2byte \effect + .2byte \mode .endm @ Changes the metatile at (x, y) on the current map. diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc index 64dd38214..ff87c56d6 100644 --- a/asm/macros/music_voice.inc +++ b/asm/macros/music_voice.inc @@ -145,7 +145,7 @@ .byte 0xff, 0, 0xff, 0 .endm - .macro cry2 sample:req + .macro cry_reverse sample:req .byte 0x30, 60, 0, 0 .4byte \sample .byte 0xff, 0, 0xff, 0 |