diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
| commit | 539d47279625a3d7a274726a02468bb5c1c56514 (patch) | |
| tree | 08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /asm/macros/battle_anim_script.inc | |
| parent | a58d9a16dd7e4f263ebccda50e70103e7490886b (diff) | |
| parent | fc72b74e6ca6626dbaffa353eabf49429ff5e75f (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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 32d9de82c..5426cdfba 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -144,7 +144,7 @@ .byte \pan .endm - .macro panse_1B se:req, param1:req, param2:req, param3:req, param4 + .macro panse_1B se:req, param1:req, param2:req, param3:req, param4:req .byte 0x1b .2byte \se .byte \param1 @@ -215,7 +215,7 @@ .byte \param2 .endm - .macro panse_26 se:req, param1:req, param2:req, param3:req, param4 + .macro panse_26 se:req, param1:req, param2:req, param3:req, param4:req .byte 0x26 .2byte \se .byte \param1 @@ -224,7 +224,7 @@ .byte \param4 .endm - .macro panse_27 se:req, param1:req, param2:req, param3:req, param4 + .macro panse_27 se:req, param1:req, param2:req, param3:req, param4:req .byte 0x27 .2byte \se .byte \param1 |