diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-13 15:54:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 15:54:40 -0500 |
| commit | b14fe9dce369b1a78c5f4f653b4c7e2e2d67d98d (patch) | |
| tree | ff1f6209a92bc3a92c102bb4a18ca8a7fa907af7 /asm/macros | |
| parent | ef935f6f4a59a2b37c4ff870ade96853621210ae (diff) | |
| parent | 57be596ce43bed86594412d598d3058c4a3d1d2d (diff) | |
Merge pull request #1547 from GriffinRichards/doc-sounddata
Clean up sound, 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 |