diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-07 11:50:23 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-07 11:50:23 +0100 |
| commit | 9dec2bdef891653d10060a45417609c4d31b14c7 (patch) | |
| tree | f9080cfc922a15570aeeee98d1ff695596e55ccb /asm/macros/battle_anim_script.inc | |
| parent | bc42c5054c335f4de8a6b43135673ce931991c3e (diff) | |
| parent | ef62393289b7a1d2e20fe195e24830d5c1f2f973 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet
Diffstat (limited to 'asm/macros/battle_anim_script.inc')
| -rw-r--r-- | asm/macros/battle_anim_script.inc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index b26d1218d..d1a8f6656 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -56,14 +56,14 @@ .2byte \param0 .endm - .macro monbg bank + .macro monbg battler .byte 0xa - .byte \bank + .byte \battler .endm - .macro clearmonbg bank + .macro clearmonbg battler .byte 0xb - .byte \bank + .byte \battler .endm .macro setalpha param0 @@ -189,14 +189,14 @@ .4byte \param2 .endm - .macro monbg_22 bank + .macro monbg_22 battler .byte 0x22 - .byte \bank + .byte \battler .endm - .macro clearmonbg_23 bank + .macro clearmonbg_23 battler .byte 0x23 - .byte \bank + .byte \battler .endm .macro jumpifcontest param0 @@ -229,38 +229,38 @@ .byte \param4 .endm - .macro monbgprio_28 bank + .macro monbgprio_28 battler .byte 0x28 - .byte \bank + .byte \battler .endm .macro monbgprio_29 .byte 0x29 .endm - .macro monbgprio_2A bank + .macro monbgprio_2A battler .byte 0x2a - .byte \bank + .byte \battler .endm - .macro invisible bank + .macro invisible battler .byte 0x2b - .byte \bank + .byte \battler .endm - .macro visible bank + .macro visible battler .byte 0x2c - .byte \bank + .byte \battler .endm - .macro doublebattle_2D bank + .macro doublebattle_2D battler .byte 0x2d - .byte \bank + .byte \battler .endm - .macro doublebattle_2E bank + .macro doublebattle_2E battler .byte 0x2e - .byte \bank + .byte \battler .endm .macro stopsound |