battle_anim_effects_3 (5)

3 files changed, 6 insertions, 6 deletions

diff --git a/src/battle_anim.c b/src/battle_anim.c
index 5cba4a6e4..becc12d56 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -2808,12 +2808,12 @@ static void LoadMoveBg(u16 bgId)
         void *dmaDest;
 
         LZDecompressWram(tilemap, gDecompressionBuffer);
-        sub_80A4720(GetPaletteOffset(), (void*)(gDecompressionBuffer), 0x100, 0);
+        sub_80A4720(GetBattleBgPaletteNum(), (void*)(gDecompressionBuffer), 0x100, 0);
         dmaSrc = gDecompressionBuffer;
         dmaDest = (void *)(BG_SCREEN_ADDR(26));
         DmaCopy32(3, dmaSrc, dmaDest, 0x800);
         LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_SCREEN_ADDR(4)));
-        LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, GetPaletteOffset() * 16, 32);
+        LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, GetBattleBgPaletteNum() * 16, 32);
     }
     else
     {
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index b55a4c3ed..248228847 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -1379,7 +1379,7 @@ static void SetPsychicBackground_Step(u8 taskId)
 {
     int i;
     u16 lastColor;
-    u8 paletteIndex = GetPaletteOffset();
+    u8 paletteIndex = GetBattleBgPaletteNum();
 
     if (++gTasks[taskId].data[5] == 4)
     {
@@ -1405,7 +1405,7 @@ static void FadeScreenToWhite_Step(u8 taskId)
 {
     int i;
     u16 lastColor;
-    u8 paletteIndex = GetPaletteOffset();
+    u8 paletteIndex = GetBattleBgPaletteNum();
 
     if (++gTasks[taskId].data[5] == 4)
     {
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index 0eaa4b01d..43890f24a 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -966,7 +966,7 @@ void sub_80A6D60(struct BattleAnimBgData *unk, const void *src, u32 arg2)
     CopyBgTilemapBufferToVram(unk->bgId);
 }
 
-u8 GetPaletteOffset(void)
+u8 GetBattleBgPaletteNum(void)
 {
     if (IsContest())
         return 1;
@@ -1353,7 +1353,7 @@ u32 sub_80A75AC(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner,
         if (!IsContest())
             selectedPalettes = 0xe;
         else
-            selectedPalettes = 1 << GetPaletteOffset();
+            selectedPalettes = 1 << GetBattleBgPaletteNum();
     }
     if (attacker)
     {