From 6976a3de94b39400a8f83e354251d5a8b25a0a63 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 16 Oct 2018 08:22:51 -0400 Subject: guillotine background defines --- data/battle_anim_scripts.s | 4 ++-- 1 file 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 -- cgit v1.2.3