diff options
| author | garak <garakmon@gmail.com> | 2018-10-16 08:22:51 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-16 08:22:51 -0400 |
| commit | 6976a3de94b39400a8f83e354251d5a8b25a0a63 (patch) | |
| tree | e0ec9270e5c59ed18ff307850fa518b552869b15 | |
| parent | b6fa61a59a063f99b14ecf8311e87130efed61a3 (diff) | |
guillotine background defines
| -rw-r--r-- | data/battle_anim_scripts.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 70ce40b04..978677769 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -14,7 +14,7 @@ gSingingMoves:: @ 81C7160 .2byte MOVE_SING .2byte MOVE_PERISH_SONG .2byte MOVE_GRASS_WHISTLE - .2byte -1 + .2byte 0xFFFF .align 2 gBattleAnims_Moves:: @ 81C7168 @@ -1857,7 +1857,7 @@ Move_GUILLOTINE: @ 81C9C29 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - fadetobgfromset 12, 13, 14 + fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein playsewithpan SE_W011, 63 createsprite gBattleAnimSpriteTemplate_83D76DC, 2, 0 |