diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm index bfe5d7979..7efb3e8f6 100644 --- a/data/battle_anims/objects.asm +++ b/data/battle_anims/objects.asm @@ -50,7 +50,7 @@ BattleAnimObjects: ; BATTLE_ANIM_OBJ_FIRE_SPIN battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_EMBER, BATTLE_ANIM_FUNC_USER_TO_TARGET_SPIN, PAL_BATTLE_OB_RED, BATTLE_ANIM_GFX_FIRE ; BATTLE_ANIM_OBJ_FIRE_BLAST - battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_FLAMETHROWER, BATTLE_ANIM_FUNC_FIRE_BLAST, PAL_BATTLE_OB_RED, BATTLE_ANIM_GFX_FIRE + battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_FLAMETHROWER, BATTLE_ANIM_FUNC_FIRE_BLAST, PAL_BATTLE_OB_YELLOW, BATTLE_ANIM_GFX_FIRE ; BATTLE_ANIM_OBJ_BURNED battleanimobj RELATIVE_X, $90, BATTLE_ANIM_FRAMESET_BURNED, BATTLE_ANIM_FUNC_MOVE_IN_CIRCLE, PAL_BATTLE_OB_RED, BATTLE_ANIM_GFX_FIRE ; BATTLE_ANIM_OBJ_BLIZZARD @@ -276,7 +276,7 @@ BattleAnimObjects: ; BATTLE_ANIM_OBJ_FLAME_WHEEL battleanimobj RELATIVE_X, $98, BATTLE_ANIM_FRAMESET_EMBER, BATTLE_ANIM_FUNC_SMOKE_FLAME_WHEEL, PAL_BATTLE_OB_RED, BATTLE_ANIM_GFX_FIRE ; BATTLE_ANIM_OBJ_SACRED_FIRE - battleanimobj RELATIVE_X, $a8, BATTLE_ANIM_FRAMESET_FLAMETHROWER, BATTLE_ANIM_FUNC_SACRED_FIRE, PAL_BATTLE_OB_RED, BATTLE_ANIM_GFX_FIRE + battleanimobj RELATIVE_X, $a8, BATTLE_ANIM_FRAMESET_FLAMETHROWER, BATTLE_ANIM_FUNC_SACRED_FIRE, PAL_BATTLE_OB_YELLOW, BATTLE_ANIM_GFX_FIRE ; BATTLE_ANIM_OBJ_COTTON_SPORE battleanimobj RELATIVE_X | X_FLIP, $68, BATTLE_ANIM_FRAMESET_COTTON, BATTLE_ANIM_FUNC_SPIRAL_DESCENT, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_MISC ; BATTLE_ANIM_OBJ_MILK_DRINK diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 993316496..20e2664f3 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -921,7 +921,7 @@ BattleAnim_Flamethrower: anim_ret BattleAnim_FireBlast: - anim_setobjpal PAL_BATTLE_OB_RED, PAL_BTLCUSTOM_FIRE + anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_FIRE anim_1gfx BATTLE_ANIM_GFX_FIRE .loop1 anim_sound 6, 2, SFX_EMBER @@ -3334,6 +3334,7 @@ BattleAnim_Nightmare: BattleAnim_FlameWheel: anim_setobjpal PAL_BATTLE_OB_RED, PAL_BTLCUSTOM_FIRE + anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_FIRE anim_1gfx BATTLE_ANIM_GFX_FIRE .loop anim_sound 0, 0, SFX_EMBER @@ -4179,7 +4180,7 @@ BattleAnim_PainSplit: anim_ret BattleAnim_SacredFire: - anim_setobjpal PAL_BATTLE_OB_RED, PAL_BTLCUSTOM_FIRE + anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_FIRE anim_1gfx BATTLE_ANIM_GFX_FIRE anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $2, $0 anim_bgeffect BATTLE_BG_EFFECT_ALTERNATE_HUES, $0, $2, $0