more renaming

4 files changed, 81 insertions, 81 deletions

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 07bedb113..5dd9ecdc0 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1314,10 +1314,10 @@ static void BattleAICmd_count_usable_party_mons(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        u32 identity;
+        u32 position;
         bankOnField1 = gBattlePartyID[bank];
-        identity = GetBankPosition(bank) ^ BIT_MON;
-        bankOnField2 = gBattlePartyID[GetBankByPosition(identity)];
+        position = GetBankPosition(bank) ^ BIT_MON;
+        bankOnField2 = gBattlePartyID[GetBankByPosition(position)];
     }
     else // in singles there's only one bank by side
     {
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 76da24383..c1051f93a 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -613,8 +613,8 @@ static void ScriptCmd_monbg(void)
 
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -632,8 +632,8 @@ static void ScriptCmd_monbg(void)
     bank ^= BIT_MON;
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -893,8 +893,8 @@ static void sub_80A4980(u8 taskId)
     if (gTasks[taskId].data[1] != 1)
     {
         u8 to_BG2;
-        u8 identity = GetBankPosition(gTasks[taskId].data[2]);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(gTasks[taskId].data[2]);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             to_BG2 = FALSE;
         else
             to_BG2 = TRUE;
@@ -937,8 +937,8 @@ static void ScriptCmd_monbg_22(void)
 
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -949,8 +949,8 @@ static void ScriptCmd_monbg_22(void)
     bank ^= BIT_MON;
     if (animBankId > 1 && IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -1001,8 +1001,8 @@ static void sub_80A4BB0(u8 taskId)
     {
         bool8 toBG_2;
         u8 bank = gTasks[taskId].data[2];
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index d6a52b898..4bfbebf98 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -543,7 +543,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
 {
     u32 monsPersonality, currentPersonality, otId;
     u16 species;
-    u8 identity;
+    u8 position;
     u16 paletteOffset;
     const void *lzPaletteData;
 
@@ -561,9 +561,9 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    identity = GetBankPosition(bank);
+    position = GetBankPosition(bank);
     HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
-                                              gMonSpritesGfxPtr->sprites[identity],
+                                              gMonSpritesGfxPtr->sprites[position],
                                               species, currentPersonality);
 
     paletteOffset = 0x100 + bank * 16;
@@ -596,7 +596,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
 {
     u32 monsPersonality, currentPersonality, otId;
     u16 species;
-    u8 identity;
+    u8 position;
     u16 paletteOffset;
     const void *lzPaletteData;
 
@@ -614,18 +614,18 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    identity = GetBankPosition(bank);
+    position = GetBankPosition(bank);
 
     if (sub_80688F8(1, bank) == 1 || gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
     {
         HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
-                                                  gMonSpritesGfxPtr->sprites[identity],
+                                                  gMonSpritesGfxPtr->sprites[position],
                                                   species, currentPersonality);
     }
     else
     {
         HandleLoadSpecialPokePic(&gMonBackPicTable[species],
-                                gMonSpritesGfxPtr->sprites[identity],
+                                gMonSpritesGfxPtr->sprites[position],
                                 species, currentPersonality);
     }
 
@@ -665,18 +665,18 @@ void nullsub_24(u16 species)
 
 void DecompressTrainerFrontPic(u16 frontPicId, u8 bank)
 {
-    u8 identity = GetBankPosition(bank);
+    u8 position = GetBankPosition(bank);
     DecompressPicFromTable_2(&gTrainerFrontPicTable[frontPicId],
-                             gMonSpritesGfxPtr->sprites[identity],
+                             gMonSpritesGfxPtr->sprites[position],
                              SPECIES_NONE);
     LoadCompressedObjectPalette(&gTrainerFrontPicPaletteTable[frontPicId]);
 }
 
 void DecompressTrainerBackPic(u16 backPicId, u8 bank)
 {
-    u8 identity = GetBankPosition(bank);
+    u8 position = GetBankPosition(bank);
     DecompressPicFromTable_2(&gTrainerBackPicTable[backPicId],
-                             gMonSpritesGfxPtr->sprites[identity],
+                             gMonSpritesGfxPtr->sprites[position],
                              SPECIES_NONE);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data,
                           0x100 + 16 * bank, 0x20);
@@ -885,7 +885,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
     u16 paletteOffset;
     u32 personalityValue;
     u32 otId;
-    u8 identity;
+    u8 position;
     const u8 *lzPaletteData;
 
     if (notTransform)
@@ -909,7 +909,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
 
         if (IsContest())
         {
-            identity = 0;
+            position = 0;
             targetSpecies = gContestResources->field_18->field_2;
             personalityValue = gContestResources->field_18->field_8;
             otId = gContestResources->field_18->field_C;
@@ -921,7 +921,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
         }
         else
         {
-            identity = GetBankPosition(bankAtk);
+            position = GetBankPosition(bankAtk);
 
             if (GetBankSide(bankDef) == SIDE_OPPONENT)
                 targetSpecies = GetMonData(&gEnemyParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
@@ -934,7 +934,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
                 otId = GetMonData(&gPlayerParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
 
                 HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[targetSpecies],
-                                                          gMonSpritesGfxPtr->sprites[identity],
+                                                          gMonSpritesGfxPtr->sprites[position],
                                                           targetSpecies,
                                                           gTransformedPersonalities[bankAtk]);
             }
@@ -944,13 +944,13 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
                 otId = GetMonData(&gEnemyParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
 
                 HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[targetSpecies],
-                                                          gMonSpritesGfxPtr->sprites[identity],
+                                                          gMonSpritesGfxPtr->sprites[position],
                                                           targetSpecies,
                                                           gTransformedPersonalities[bankAtk]);
             }
         }
 
-        src = gMonSpritesGfxPtr->sprites[identity];
+        src = gMonSpritesGfxPtr->sprites[position];
         dst = (void *)(VRAM + 0x10000 + gSprites[gBankSpriteIds[bankAtk]].oam.tileNum * 32);
         DmaCopy32(3, src, dst, 0x800);
         paletteOffset = 0x100 + bankAtk * 16;
@@ -981,7 +981,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
 
 void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
 {
-    u8 identity;
+    u8 position;
     s32 i;
     u32 var;
     const void *substitutePal;
@@ -989,23 +989,23 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
     if (!loadMonSprite)
     {
         if (IsContest())
-            identity = 0;
+            position = 0;
         else
-            identity = GetBankPosition(bank);
+            position = GetBankPosition(bank);
 
         if (IsContest())
-            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[identity]);
+            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[position]);
         else if (GetBankSide(bank) != SIDE_PLAYER)
-            LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites[identity]);
+            LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites[position]);
         else
-            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[identity]);
+            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[position]);
 
         i = 1;
         var = bank * 16;
         substitutePal = gSubstituteDollPal;
         for (; i < 4; i++)
         {
-            register void *dmaSrc asm("r0") = gMonSpritesGfxPtr->sprites[identity];
+            register void *dmaSrc asm("r0") = gMonSpritesGfxPtr->sprites[position];
             void *dmaDst = (i * 0x800) + dmaSrc;
             u32 dmaSize = 0x800;
             DmaCopy32(3, dmaSrc, dmaDst, dmaSize);
diff --git a/src/battle_main.c b/src/battle_main.c
index b19dcace1..0fd823fa1 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3274,46 +3274,46 @@ static void BattleIntroPrintWildMonAttacked(void)
 
 static void BattleIntroPrintOpponentSendsOut(void)
 {
-    u32 identity;
+    u32 position;
 
     if (gBattleExecBuffer)
         return;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_LEFT;
+        position = B_POSITION_OPPONENT_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_LEFT;
+            position = B_POSITION_OPPONENT_LEFT;
         else
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
     }
     else
-        identity = B_POSITION_OPPONENT_LEFT;
+        position = B_POSITION_OPPONENT_LEFT;
 
-    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
+    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(position));
     gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
 }
 
 static void BattleIntroOpponent2SendsOutMonAnimation(void)
 {
-    u32 identity;
+    u32 position;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_RIGHT;
+        position = B_POSITION_OPPONENT_RIGHT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_RIGHT;
+            position = B_POSITION_OPPONENT_RIGHT;
         else
-            identity = B_POSITION_PLAYER_RIGHT;
+            position = B_POSITION_PLAYER_RIGHT;
     }
     else
-        identity = B_POSITION_OPPONENT_RIGHT;
+        position = B_POSITION_OPPONENT_RIGHT;
 
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        if (GetBankPosition(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == position)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3326,26 +3326,26 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void)
 #ifdef NONMATCHING
 static void BattleIntroOpponent1SendsOutMonAnimation(void)
 {
-    u32 identity;
+    u32 position;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_LEFT;
+        position = B_POSITION_OPPONENT_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_LEFT;
+            position = B_POSITION_OPPONENT_LEFT;
         else
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
     }
     else
-        identity = B_POSITION_OPPONENT_LEFT;
+        position = B_POSITION_OPPONENT_LEFT;
 
     if (gBattleExecBuffer)
         return;
 
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        if (GetBankPosition(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == position)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3479,22 +3479,22 @@ static void BattleIntroPrintPlayerSendsOut(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        u8 identity;
+        u8 position;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
         else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-                identity = B_POSITION_PLAYER_LEFT;
+                position = B_POSITION_PLAYER_LEFT;
             else
-                identity = B_POSITION_OPPONENT_LEFT;
+                position = B_POSITION_OPPONENT_LEFT;
         }
         else
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
+            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(position));
 
         gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
     }
@@ -3502,23 +3502,23 @@ static void BattleIntroPrintPlayerSendsOut(void)
 
 static void BattleIntroPlayer2SendsOutMonAnimation(void)
 {
-    u32 identity;
+    u32 position;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_PLAYER_RIGHT;
+        position = B_POSITION_PLAYER_RIGHT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_PLAYER_RIGHT;
+            position = B_POSITION_PLAYER_RIGHT;
         else
-            identity = B_POSITION_OPPONENT_RIGHT;
+            position = B_POSITION_OPPONENT_RIGHT;
     }
     else
-        identity = B_POSITION_PLAYER_RIGHT;
+        position = B_POSITION_PLAYER_RIGHT;
 
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        if (GetBankPosition(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == position)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3534,26 +3534,26 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void)
 
 static void BattleIntroPlayer1SendsOutMonAnimation(void)
 {
-    u32 identity;
+    u32 position;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_PLAYER_LEFT;
+        position = B_POSITION_PLAYER_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
         else
-            identity = B_POSITION_OPPONENT_LEFT;
+            position = B_POSITION_OPPONENT_LEFT;
     }
     else
-        identity = B_POSITION_PLAYER_LEFT;
+        position = B_POSITION_PLAYER_LEFT;
 
     if (gBattleExecBuffer)
         return;
 
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        if (GetBankPosition(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == position)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3891,7 +3891,7 @@ static void HandleTurnActionSelectionState(void)
     gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0;
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        u8 identity = GetBankPosition(gActiveBank);
+        u8 position = GetBankPosition(gActiveBank);
         switch (gBattleCommunication[gActiveBank])
         {
         case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
@@ -3901,9 +3901,9 @@ static void HandleTurnActionSelectionState(void)
         case STATE_BEFORE_ACTION_CHOSEN: // choose an action
             *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI
-                || !(identity & BIT_MON)
-                || gBattleStruct->field_91 & gBitTable[GetBankByPosition(identity ^ BIT_MON)]
-                || gBattleCommunication[GetBankByPosition(identity ^ BIT_MON)] == 5)
+                || !(position & BIT_MON)
+                || gBattleStruct->field_91 & gBitTable[GetBankByPosition(position ^ BIT_MON)]
+                || gBattleCommunication[GetBankByPosition(position ^ BIT_MON)] == 5)
             {
                 if (gBattleStruct->field_91 & gBitTable[gActiveBank])
                 {
@@ -4225,8 +4225,8 @@ static void HandleTurnActionSelectionState(void)
                 i = (sub_803CDB8() != 0);
 
                 if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE)
-                    || (identity & BIT_MON)
-                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByPosition(identity ^ BIT_MON)]))
+                    || (position & BIT_MON)
+                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByPosition(position ^ BIT_MON)]))
                 {
                     EmitLinkStandbyMsg(0, 0, i);
                 }