From d3d99c3f8c2b9e1a1dd45e8fcf6e4e56d8a3a65c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 6 Mar 2023 15:22:28 +0100
Subject: [PATCH] alpha omega indicator sprites use the same palete

---
 graphics/battle_interface/alpha_indicator.png | Bin 266 -> 211 bytes
 graphics/battle_interface/omega_indicator.png | Bin 271 -> 209 bytes
 include/battle_interface.h                    |   3 +--
 src/battle_interface.c                        |  11 +++++------
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/graphics/battle_interface/alpha_indicator.png b/graphics/battle_interface/alpha_indicator.png
index 0e302576b6aced8d385e93eee3a2919ea2e4d1c3..84cfee2cf1364598c2acd71ee78d8777d7389959 100644
GIT binary patch
delta 165
zcmeBTy39C1LYIS?fq_9omp>RtF%}28J29*~C-V}>F$nMpasAK0@W3nU&8wVQx&~hs
zwM=YN%-vV8?hjDf+|$J|L}KdMo}Ii51{}<pf8N*^`mkmOv7bCTcjD@OmJNF%m~4D*
z27aC_b<){D<!z+dx{DI;{xL*WGurN`@;n4If-g0~GtJkRK?}&{0Adih6g(M3dAj<!
JtaD0e0sszpHs}BV

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<FY)wsWq-;c#i*q8ZRW-ZppbZp
zYeY$Kep*R+Vo@rCyN?Ud7=^ObA_ZeTlfu>|4}nTJN(%hkfilKGHiK7#raX{hNq6*h
zWMJ6X&;2Kn705RT@CkAK&%mHie?!1~&W;BkI(9q&3gZVW>Mkq<s$fj=c6a%|l>O6D
zAV<&B#WAE}PIAHmF@cb#3q8l0_!8PSb#D}yk*JZ;aV$X0q-{l-QCO2kT0j#A14Dl=
V^X1G4%?}`pJYD@<);T3K0RZ%8M?wGq

diff --git a/graphics/battle_interface/omega_indicator.png b/graphics/battle_interface/omega_indicator.png
index c56d51c151e6c578e4a8935a7cf6bd4efaceb009..8e21007a800ba1102177d9205420dc248aa5fd4f 100644
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~g8-ip*Z&L*
z54^J8yvmuSYw%@Ji$eVk0q;3G9(?H7@c^g<6YMKk_Xj9y>gnPbA~E&snVo_R1{}<e
zU%td|c4a9^NZoE6@b#?2t8E)yw`_D}(Nl2ZnZf(TX5*%-mZz4<DJ*8F*iz8@184wW
eYJ_K+uP=iZkj(+L=2Gxv5X;lm&t;ucLK6T);XLdB

delta 211
zcmcb}*v~XUBAJDmfq~)e-A6${ioL|s*OmP#hZLidYQ|rc-#{Vp64!{5;QX|b^2DN4
z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc
zp7_K-(TNFcKok?~*I58mz?kIi?(%;r`=_Hoj<KhUV@SoE<b(xc0zqvTdbFI_651wq
zE4ZBS5IAKJA|k|QJV&H8<N%LYax!~|S#q)gD?>*H^Swn`zfJ?SGkCiCxvX<aXaWF=
C20#P=

diff --git a/include/battle_interface.h b/include/battle_interface.h
index 3d49356e24..e0f30b3097 100644
--- a/include/battle_interface.h
+++ b/include/battle_interface.h
@@ -56,8 +56,7 @@ enum
 
 #define TAG_MEGA_TRIGGER_PAL            0xD777
 #define TAG_MEGA_INDICATOR_PAL          0xD778
-#define TAG_ALPHA_INDICATOR_PAL         0xD779
-#define TAG_OMEGA_INDICATOR_PAL         0xD77A
+#define TAG_ALPHA_OMEGA_INDICATOR_PAL   0xD779 // Alpha and Omega indicators use the same palette as each of them only uses 4 different colors.
 #define TAG_ZMOVE_TRIGGER_PAL           0xD77B
 
 enum
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 4d0eedc35b..a793320f6a 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1439,9 +1439,8 @@ enum
 static const u8 sMegaIndicatorGfx[] = INCBIN_U8("graphics/battle_interface/mega_indicator.4bpp");
 static const u16 sMegaIndicatorPal[] = INCBIN_U16("graphics/battle_interface/mega_indicator.gbapal");
 static const u8 sAlphaIndicatorGfx[] = INCBIN_U8("graphics/battle_interface/alpha_indicator.4bpp");
-static const u16 sAlphaIndicatorPal[] = INCBIN_U16("graphics/battle_interface/alpha_indicator.gbapal");
 static const u8 sOmegaIndicatorGfx[] = INCBIN_U8("graphics/battle_interface/omega_indicator.4bpp");
-static const u16 sOmegaIndicatorPal[] = INCBIN_U16("graphics/battle_interface/omega_indicator.gbapal");
+static const u16 sAlphaOmegaIndicatorPal[] = INCBIN_U16("graphics/battle_interface/alpha_indicator.gbapal");
 
 static const struct SpriteSheet sMegaIndicator_SpriteSheets[] =
 {
@@ -1453,8 +1452,8 @@ static const struct SpriteSheet sMegaIndicator_SpriteSheets[] =
 static const struct SpritePalette sMegaIndicator_SpritePalettes[] =
 {
     [INDICATOR_MEGA] = {sMegaIndicatorPal, TAG_MEGA_INDICATOR_PAL},
-    [INDICATOR_ALPHA] = {sAlphaIndicatorPal, TAG_ALPHA_INDICATOR_PAL},
-    [INDICATOR_OMEGA] = {sOmegaIndicatorPal, TAG_OMEGA_INDICATOR_PAL},
+    [INDICATOR_ALPHA] = {sAlphaOmegaIndicatorPal, TAG_ALPHA_OMEGA_INDICATOR_PAL},
+    [INDICATOR_OMEGA] = {sAlphaOmegaIndicatorPal, TAG_ALPHA_OMEGA_INDICATOR_PAL},
     [INDICATOR_COUNT] = {0}
 };
 
@@ -1479,8 +1478,8 @@ static const struct SpriteTemplate sSpriteTemplate_MegaIndicator =
 static const u16 sMegaIndicatorTags[][2] =
 {
     [INDICATOR_MEGA] = {TAG_MEGA_INDICATOR_TILE, TAG_MEGA_INDICATOR_PAL},
-    [INDICATOR_ALPHA] = {TAG_ALPHA_INDICATOR_TILE, TAG_ALPHA_INDICATOR_PAL},
-    [INDICATOR_OMEGA] = {TAG_OMEGA_INDICATOR_TILE, TAG_OMEGA_INDICATOR_PAL},
+    [INDICATOR_ALPHA] = {TAG_ALPHA_INDICATOR_TILE, TAG_ALPHA_OMEGA_INDICATOR_PAL},
+    [INDICATOR_OMEGA] = {TAG_OMEGA_INDICATOR_TILE, TAG_ALPHA_OMEGA_INDICATOR_PAL},
 };
 
 static const s8 sIndicatorPositions[][2] =