diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
| commit | a58d9a16dd7e4f263ebccda50e70103e7490886b (patch) | |
| tree | ddde359501adee874131731c700862c615c46e77 /asm/macros/battle_anim_script.inc | |
| parent | a677d1f4cb6f2925e9694b8d2b408273dcd13d9b (diff) | |
| parent | 9e74409bb2032e25d431dda116462759e5b51fe0 (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'asm/macros/battle_anim_script.inc')
| -rw-r--r-- | asm/macros/battle_anim_script.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 6ccd8d505..32d9de82c 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -153,19 +153,19 @@ .byte \param4 .endm - .macro loopsewithpan se:req, param1:req, param2:req, param3:req + .macro loopsewithpan se:req, pan:req, wait:req, times:req .byte 0x1c .2byte \se - .byte \param1 - .byte \param2 - .byte \param3 + .byte \pan + .byte \wait + .byte \times .endm - .macro waitplaysewithpan se:req, param1:req, param2:req + .macro waitplaysewithpan se:req, pan:req, wait:req .byte 0x1d .2byte \se - .byte \param1 - .byte \param2 + .byte \pan + .byte \wait .endm .macro setbldcnt param0:req |