Replace simple ewram access with battle struct, 2

1 files changed, 29 insertions, 29 deletions

diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index a7e65137d..49da3c9e6 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -194,9 +194,9 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e)
         gBattleMonForms[a] = e & 0x7F;
         return TRUE;
     }
-    if (ewram17800[a].substituteSprite && sub_803163C(d) == 0)
+    if (gBattleSpriteInfo[a].substituteSprite && sub_803163C(d) == 0)
         return TRUE;
-    if (ewram17800[a].substituteSprite && d == 2 && gSprites[gBattlerSpriteIds[a]].invisible)
+    if (gBattleSpriteInfo[a].substituteSprite && d == 2 && gSprites[gBattlerSpriteIds[a]].invisible)
     {
         refresh_graphics_maybe(a, 1, gBattlerSpriteIds[a]);
         sub_80324E0(a);
@@ -296,14 +296,14 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b)
     const u8 *lzPaletteData;
 
     personalityValue = GetMonData(pkmn, MON_DATA_PERSONALITY);
-    if (ewram17800[b].transformedSpecies == 0)
+    if (gBattleSpriteInfo[b].transformedSpecies == 0)
     {
         species = GetMonData(pkmn, MON_DATA_SPECIES);
         r7 = personalityValue;
     }
     else
     {
-        species = ewram17800[b].transformedSpecies;
+        species = gBattleSpriteInfo[b].transformedSpecies;
         r7 = gTransformedPersonalities[b];
     }
     otId = GetMonData(pkmn, MON_DATA_OT_ID);
@@ -317,7 +317,7 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b)
       species,
       r7);
     paletteOffset = 0x100 + b * 16;
-    if (ewram17800[b].transformedSpecies == 0)
+    if (gBattleSpriteInfo[b].transformedSpecies == 0)
         lzPaletteData = GetMonSpritePal(pkmn);
     else
         lzPaletteData = GetMonSpritePalFromOtIdPersonality(species, otId, personalityValue);
@@ -330,7 +330,7 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b)
         LZDecompressWram(lzPaletteData, ewram16400);
         LoadPalette(ewram16400 + gBattleMonForms[b] * 32, paletteOffset, 0x20);
     }
-    if (ewram17800[b].transformedSpecies != 0)
+    if (gBattleSpriteInfo[b].transformedSpecies != 0)
     {
         BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31));
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
@@ -348,14 +348,14 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b)
     const u8 *lzPaletteData;
 
     personalityValue = GetMonData(pkmn, MON_DATA_PERSONALITY);
-    if (ewram17800[b].transformedSpecies == 0)
+    if (gBattleSpriteInfo[b].transformedSpecies == 0)
     {
         species = GetMonData(pkmn, MON_DATA_SPECIES);
         r7 = personalityValue;
     }
     else
     {
-        species = ewram17800[b].transformedSpecies;
+        species = gBattleSpriteInfo[b].transformedSpecies;
         r7 = gTransformedPersonalities[b];
     }
     otId = GetMonData(pkmn, MON_DATA_OT_ID);
@@ -369,7 +369,7 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b)
       species,
       r7);
     paletteOffset = 0x100 + b * 16;
-    if (ewram17800[b].transformedSpecies == 0)
+    if (gBattleSpriteInfo[b].transformedSpecies == 0)
         lzPaletteData = GetMonSpritePal(pkmn);
     else
         lzPaletteData = GetMonSpritePalFromOtIdPersonality(species, otId, personalityValue);
@@ -382,7 +382,7 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b)
         LZDecompressWram(lzPaletteData, ewram16400);
         LoadPalette(ewram16400 + gBattleMonForms[b] * 32, paletteOffset, 0x20);
     }
-    if (ewram17800[b].transformedSpecies != 0)
+    if (gBattleSpriteInfo[b].transformedSpecies != 0)
     {
         BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31));
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
@@ -611,7 +611,7 @@ void sub_8031EE8(void)
 void sub_8031F0C(void)
 {
     sub_8031EE8();
-    memset(ewram17800, 0, 0x10);
+    memset(gBattleSpriteInfo, 0, 0x10);
 }
 
 void sub_8031F24(void)
@@ -619,12 +619,12 @@ void sub_8031F24(void)
     s32 i;
 
     for (i = 0; i < gBattlersCount; i++)
-        ewram17800[i].invisible = gSprites[gBattlerSpriteIds[i]].invisible;
+        gBattleSpriteInfo[i].invisible = gSprites[gBattlerSpriteIds[i]].invisible;
 }
 
 void sub_8031F88(u8 a)
 {
-    ewram17800[a].invisible = gSprites[gBattlerSpriteIds[a]].invisible;
+    gBattleSpriteInfo[a].invisible = gSprites[gBattlerSpriteIds[a]].invisible;
 }
 
 void sub_8031FC4(u8 a, u8 b, bool8 c)
@@ -642,7 +642,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
         paletteOffset = 0x100 + a * 16;
         LoadPalette(ewram16400 + ewram17840.unk0 * 32, paletteOffset, 32);
         gBattleMonForms[a] = ewram17840.unk0;
-        if (ewram17800[a].transformedSpecies != 0)
+        if (gBattleSpriteInfo[a].transformedSpecies != 0)
         {
             BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31));
             CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
@@ -716,7 +716,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
         if (!IsContest())
         {
-            ewram17800[a].transformedSpecies = species;
+            gBattleSpriteInfo[a].transformedSpecies = species;
             gBattleMonForms[a] = gBattleMonForms[b];
         }
         gSprites[gBattlerSpriteIds[a]].pos1.y = sub_8077F68(a);
@@ -777,12 +777,12 @@ void refresh_graphics_maybe(u8 a, u8 b, u8 spriteId)
 void sub_80324BC(u8 a, u16 b)
 {
     if (b == 0xA4)
-        ewram17800[a].substituteSprite = 1;
+        gBattleSpriteInfo[a].substituteSprite = 1;
 }
 
 void sub_80324E0(u8 a)
 {
-    ewram17800[a].substituteSprite = 0;
+    gBattleSpriteInfo[a].substituteSprite = 0;
 }
 
 void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b)
@@ -792,22 +792,22 @@ void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b)
 
     if (GetHPBarLevel(hp, maxHP) == 1)
     {
-        if (!ewram17800[b].unk0_1)
+        if (!gBattleSpriteInfo[b].lowHpSong)
         {
-            if (!ewram17800[b ^ 2].unk0_1)
+            if (!gBattleSpriteInfo[b ^ 2].lowHpSong)
                 PlaySE(SE_LOW_HEALTH);
-            ewram17800[b].unk0_1 = 1;
+            gBattleSpriteInfo[b].lowHpSong = 1;
         }
     }
     else
     {
-        ewram17800[b].unk0_1 = 0;
+        gBattleSpriteInfo[b].lowHpSong = 0;
         if (!IsDoubleBattle())
         {
             m4aSongNumStop(SE_LOW_HEALTH);
             return;
         }
-        if (IsDoubleBattle() && !ewram17800[b ^ 2].unk0_1)
+        if (IsDoubleBattle() && !gBattleSpriteInfo[b ^ 2].lowHpSong)
         {
             m4aSongNumStop(SE_LOW_HEALTH);
             return;
@@ -819,9 +819,9 @@ void BattleStopLowHpSound(void)
 {
     u8 r4 = GetBattlerAtPosition(0);
 
-    ewram17800[r4].unk0_1 = 0;
+    gBattleSpriteInfo[r4].lowHpSong = 0;
     if (IsDoubleBattle())
-        ewram17800[r4 ^ 2].unk0_1 = 0;
+        gBattleSpriteInfo[r4 ^ 2].lowHpSong = 0;
     m4aSongNumStop(SE_LOW_HEALTH);
 }
 
@@ -903,9 +903,9 @@ void sub_80328A4(struct Sprite *sprite)
     }
     if (gAnimScriptActive || r7->invisible)
         invisible = TRUE;
-    else if (ewram17800[r4].transformedSpecies != 0 && gEnemyMonElevation[ewram17800[r4].transformedSpecies] == 0)
+    else if (gBattleSpriteInfo[r4].transformedSpecies != 0 && gEnemyMonElevation[gBattleSpriteInfo[r4].transformedSpecies] == 0)
         invisible = TRUE;
-    if (ewram17800[r4].substituteSprite)
+    if (gBattleSpriteInfo[r4].substituteSprite)
         invisible = TRUE;
     sprite->pos1.x = r7->pos1.x;
     sprite->pos2.x = r7->pos2.x;
@@ -921,8 +921,8 @@ void sub_8032984(u8 a, u16 b)
 {
     if (GetBattlerSide(a) != 0)
     {
-        if (ewram17800[a].transformedSpecies != 0)
-            b = ewram17800[a].transformedSpecies;
+        if (gBattleSpriteInfo[a].transformedSpecies != 0)
+            b = gBattleSpriteInfo[a].transformedSpecies;
         if (gEnemyMonElevation[b] != 0)
             gSprites[ewram17810[a].unk7].callback = sub_80328A4;
         else
@@ -960,7 +960,7 @@ void sub_8032A38(void)
 
 void sub_8032AA8(u8 a, u8 b)
 {
-    ewram17800[a].transformedSpecies = 0;
+    gBattleSpriteInfo[a].transformedSpecies = 0;
     gBattleMonForms[a] = 0;
     if (b == 0)
         sub_80324E0(a);