fix build

1 files changed, 13 insertions, 13 deletions

diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index a537d9adb..269f20642 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -102,7 +102,7 @@ extern void sub_80E43C0();
 extern void oamt_add_pos2_onto_pos1();
 extern void sub_8078B34(struct Sprite *);
 extern void oamt_set_x3A_32();
-extern void sub_80318FC();
+extern void BattleLoadPlayerMonSprite();
 extern bool8 IsDoubleBattle(void);
 extern void sub_802D500(void);
 extern bool8 sub_8078874(u8);
@@ -124,7 +124,7 @@ extern void sub_80105EC(struct Sprite *);
 extern void sub_802D274(void);
 extern void sub_802D23C(void);
 extern u8 GetBankIdentity(u8);
-extern void sub_8031AF4();
+extern void LoadPlayerTrainerBankSprite();
 extern void sub_80313A0(struct Sprite *);
 extern void sub_802D204(void);
 extern u8 sub_8079E90();
@@ -1067,7 +1067,7 @@ void sub_802D680(void)
         ewram17810[gActiveBank].unk1_0 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
         gBattleBankFunc[gActiveBank] = sub_802D730;
     }
@@ -2298,7 +2298,7 @@ void PlayerHandlecmd3(void)
 
 void PlayerHandleLoadPokeSprite(void)
 {
-    sub_80318FC(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
     gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
     gBattleBankFunc[gActiveBank] = bx_0802E404;
 }
@@ -2307,7 +2307,7 @@ void PlayerHandleSendOutPoke(void)
 {
     sub_8032AA8(gActiveBank, gBattleBufferA[gActiveBank][2]);
     gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    sub_80318FC(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
     gActionSelectionCursor[gActiveBank] = 0;
     gMoveSelectionCursor[gActiveBank] = 0;
     sub_802F934(gActiveBank, gBattleBufferA[gActiveBank][2]);
@@ -2359,7 +2359,7 @@ void sub_802FB2C(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4 = 1;
         break;
@@ -2388,7 +2388,7 @@ void PlayerHandleTrainerThrow(void)
     {
         r7 = 0;
     }
-    sub_8031AF4(gSaveBlock2.playerGender, gActiveBank);
+    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
     GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
     gObjectBankIDs[gActiveBank] = CreateSprite(
       &gUnknown_02024E8C,
@@ -2404,7 +2404,7 @@ void PlayerHandleTrainerThrow(void)
 
 void PlayerHandleTrainerSlide(void)
 {
-    sub_8031AF4(gSaveBlock2.playerGender, gActiveBank);
+    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
     GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
     gObjectBankIDs[gActiveBank] = CreateSprite(
       &gUnknown_02024E8C,
@@ -2434,7 +2434,7 @@ void PlayerHandlecmd10(void)
 {
     if (ewram17810[gActiveBank].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4++;
     }
@@ -2522,7 +2522,7 @@ void sub_8030190(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2 == 1 && ewram17800[gActiveBank].unk0_3 == 0)
+        if (ewram17800[gActiveBank].substituteSprite == 1 && ewram17800[gActiveBank].unk0_3 == 0)
         {
             ewram17800[gActiveBank].unk0_3 = 1;
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
@@ -2542,7 +2542,7 @@ void sub_8030190(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if (ewram17800[gActiveBank].unk0_2 == 1 && r7 < 2)
+            if (ewram17800[gActiveBank].substituteSprite == 1 && r7 < 2)
             {
                 move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
                 ewram17800[gActiveBank].unk0_3 = 0;
@@ -2916,7 +2916,7 @@ void sub_8030E38(struct Sprite *sprite)
     FreeSpriteOamMatrix(sprite);
     FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
     DestroySprite(sprite);
-    sub_80318FC(&gPlayerParty[gBattlePartyID[r4]], r4);
+    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[r4]], r4);
     StartSpriteAnim(&gSprites[gObjectBankIDs[r4]], 0);
 }
 
@@ -2942,7 +2942,7 @@ void task05_08033660(u8 taskId)
             sub_802F934(gActiveBank, 0);
             gActiveBank ^= 2;
             gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_80318FC(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             sub_802F934(gActiveBank, 0);
             gActiveBank ^= 2;
         }