From b35c3ea09891c0273300ada1aca789ed4bd26c40 Mon Sep 17 00:00:00 2001
From: SoupPotato <toomanyluigis11@gmail.com>
Date: Tue, 3 Sep 2024 15:19:52 +0100
Subject: [PATCH] Updated palettes for Solarbeam, Absorb, Mega Drain, Giga
 Drain and Leech Seed

---
 constants/battle_anim_constants.asm |  1 +
 data/moves/animations.asm           | 31 ++++++++++-------------------
 gfx/battle_anims/custom.pal         |  5 +++++
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm
index ebea61244..5d2b351b9 100644
--- a/constants/battle_anim_constants.asm
+++ b/constants/battle_anim_constants.asm
@@ -930,6 +930,7 @@ DEF NUM_BG_EFFECTS EQU 5 ; see wActiveBGEffects
 	const PAL_BTLCUSTOM_HP_PSYCHIC      ; 1b
 	const PAL_BTLCUSTOM_HP_GHOST        ; 1c
 	const PAL_BTLCUSTOM_ACID            ; 1d
+	const PAL_BTLCUSTOM_LIME            ; 1e
 
 DEF NUM_CUSTOM_BATTLE_PALETTES EQU const_value
 
diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index 403fae137..c35c87825 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -290,6 +290,8 @@ BattleAnimations::
 
 BattleAnim_Dummy:
 BattleAnim_MirrorMove:
+BattleAnim_InWhirlpool: ; unused/removed
+BattleAnim_Miss:
 	anim_ret
 
 BattleAnim_HeldItemTrigger:
@@ -515,7 +517,8 @@ BattleAnim_Psn:
 	anim_ret
 
 BattleAnim_Sap:
-	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_GREEN
+	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_LIME
+	anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $6, $0
 	anim_1gfx BATTLE_ANIM_GFX_CHARGE
 	anim_sound 6, 3, SFX_WATER_GUN
 	anim_obj BATTLE_ANIM_OBJ_ABSORB, 128, 48, $2
@@ -564,19 +567,6 @@ BattleAnim_InNightmare:
 	anim_wait 40
 	anim_ret
 
-BattleAnim_InWhirlpool: ; unused
-	anim_setobjpal PAL_BATTLE_OB_GRAY, PAL_BTLCUSTOM_WATER
-	anim_1gfx BATTLE_ANIM_GFX_WIND
-	anim_bgeffect BATTLE_BG_EFFECT_WHIRLPOOL, $0, $0, $0
-	anim_sound 0, 1, SFX_SURF
-.loop
-	anim_obj BATTLE_ANIM_OBJ_GUST, 132, 72, $0
-	anim_wait 6
-	anim_loop 6, .loop
-	anim_incbgeffect BATTLE_BG_EFFECT_WHIRLPOOL
-	anim_wait 1
-	anim_ret
-
 BattleAnim_HitConfusion:
 	anim_1gfx BATTLE_ANIM_GFX_HIT
 	anim_sound 0, 0, SFX_POUND
@@ -584,9 +574,6 @@ BattleAnim_HitConfusion:
 	anim_wait 16
 	anim_ret
 
-BattleAnim_Miss:
-	anim_ret
-
 BattleAnim_EnemyDamage:
 .loop
 	anim_bgeffect BATTLE_BG_EFFECT_HIDE_MON, $0, BG_EFFECT_TARGET, $0
@@ -1220,6 +1207,7 @@ BattleAnim_Solarbeam:
 	anim_ret
 
 .FireSolarBeam
+	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_LIME
 	anim_1gfx BATTLE_ANIM_GFX_BEAM
 	anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $2, $0
 	anim_bgeffect BATTLE_BG_EFFECT_ALTERNATE_HUES, $0, $1, $0
@@ -1675,7 +1663,8 @@ BattleAnim_Recover_branch:
 	anim_ret
 
 BattleAnim_Absorb:
-	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_GREEN
+	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_LIME
+	anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $6, $0
 	anim_1gfx BATTLE_ANIM_GFX_CHARGE
 	anim_obj BATTLE_ANIM_OBJ_ABSORB_CENTER, 44, 88, $0
 .loop
@@ -1693,7 +1682,8 @@ BattleAnim_Absorb:
 	anim_ret
 
 BattleAnim_MegaDrain:
-	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_GREEN
+	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_LIME
+	anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $6, $0
 	anim_1gfx BATTLE_ANIM_GFX_CHARGE
 	anim_call BattleAnim_TargetObj_1Row
 	anim_bgeffect BATTLE_BG_EFFECT_FADE_MONS_TO_BLACK_REPEATING, $0, BG_EFFECT_TARGET, $10
@@ -3831,7 +3821,8 @@ BattleAnim_InSandstorm:
 	anim_ret
 
 BattleAnim_GigaDrain:
-	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_GREEN
+	anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_LIME
+	anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $6, $0
 	anim_2gfx BATTLE_ANIM_GFX_CHARGE, BATTLE_ANIM_GFX_SHINE
 	anim_call BattleAnim_TargetObj_1Row
 	anim_bgeffect BATTLE_BG_EFFECT_FADE_MONS_TO_BLACK_REPEATING, $0, BG_EFFECT_TARGET, $10
diff --git a/gfx/battle_anims/custom.pal b/gfx/battle_anims/custom.pal
index ee4384065..4a5536724 100644
--- a/gfx/battle_anims/custom.pal
+++ b/gfx/battle_anims/custom.pal
@@ -126,6 +126,11 @@ INCLUDE "gfx/battle_anims/battle_anims.pal"
 	RGB 31, 31, 07
 	RGB 31, 23, 04
 	RGB 31, 16, 01
+; lime
+	RGB 31, 31, 31
+	RGB 31, 31, 05
+	RGB 19, 31, 01
+	RGB 04, 21, 00
 
 rept NUM_CUSTOM_BATTLE_PALETTES - 6
 endr