fix merge conflicts

1 files changed, 31 insertions, 35 deletions

diff --git a/src/battle_2.c b/src/battle_2.c
index fd7cf6863..aeba69213 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -40,7 +40,9 @@
 #include "trainer_classes.h"
 #include "evolution_scene.h"
 #include "roamer.h"
+#include "tv.h"
 #include "safari_zone.h"
+#include "battle_string_ids.h"
 
 struct UnknownStruct6
 {
@@ -63,7 +65,6 @@ struct UnknownPokemonStruct2
     /*0x1D*/ u8 language;
 };
 
-extern u32 gBattleTypeFlags;
 extern u8 gBattleCommunication[];
 extern u8 gBattleTerrain;
 extern u16 gBattle_BG0_X;
@@ -87,7 +88,6 @@ extern void (*gBattleMainFunc)(void);
 extern void (*gUnknown_030061E8)(void);
 extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
 extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
-extern u8 gBattleOutcome;
 extern u8 gUnknown_02039B28[]; // possibly a struct?
 extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document
 extern struct MusicPlayerInfo gMPlay_SE1;
@@ -138,7 +138,6 @@ extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
 extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
 extern u8 gCurrentActionFuncId;
 extern u8 gLastUsedAbility;
-extern u16 gLastUsedItem;
 extern u8 gUnknown_0203CF00[];
 extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
 extern const u8* gBattlescriptCurrInstr;
@@ -151,7 +150,6 @@ extern u8 gCurrMovePos;
 extern u8 gUnknown_020241E9;
 extern u16 gLastUsedMove;
 
-extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const struct BattleMove gBattleMoves[];
 extern const u16 gUnknown_08C004E0[]; // battle textbox palette
 extern const struct BgTemplate gUnknown_0831AA08[];
@@ -219,14 +217,12 @@ extern void sub_81B9150(void);
 extern void sub_800AC34(void);
 extern void sub_80B3AF8(u8 taskId); // cable club
 extern void sub_8076918(u8 bank);
-extern void sub_80729D0(u8 healthoxSpriteId);
+extern void SetHealthboxSpriteVisible(u8 healthoxSpriteId);
 extern void sub_81A56B4(void); // battle frontier 2
 extern u8 sub_81A9E28(void); // battle frontier 2
 extern void sub_81A56E8(u8 bank); // battle frontier 2
 extern void sub_81B8FB0(u8, u8); // party menu
 extern u8 pokemon_order_func(u8); // party menu
-extern void sub_80EC728(void); // tv
-extern void sub_80EE184(void); // tv
 extern bool8 InBattlePyramid(void);
 
 // this file's functions
@@ -245,7 +241,7 @@ static void sub_8038F34(void);
 static void sub_80392A8(void);
 static void sub_803937C(void);
 static void sub_803939C(void);
-static void oac_poke_opponent(struct Sprite *sprite);
+void oac_poke_opponent(struct Sprite *sprite);
 static void sub_803980C(struct Sprite *sprite);
 static void sub_8039838(struct Sprite *sprite);
 static void sub_8039894(struct Sprite *sprite);
@@ -343,7 +339,7 @@ const u8 gStatusConditionString_IceJpn[8] = _("こおり$$$$");
 const u8 gStatusConditionString_ConfusionJpn[8] = _("こんらん$$$");
 const u8 gStatusConditionString_LoveJpn[8] = _("メロメロ$$$");
 
-const u8 * const gStatusConditionStringsTable[][2] =
+const u8 * const gStatusConditionStringsTable[7][2] =
 {
     {gStatusConditionString_PoisonJpn, gText_Poison},
     {gStatusConditionString_SleepJpn, gText_Sleep},
@@ -858,7 +854,7 @@ static void CB2_HandleStartBattle(void)
         {
             s32 i;
 
-            for (i = 0; i < 2 && (gLinkPlayers[i].version & 0xFF) == 3; i++);
+            for (i = 0; i < 2 && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++);
 
             if (i == 2)
                 gBattleCommunication[MULTIUSE_STATE] = 16;
@@ -1650,7 +1646,7 @@ void CB2_QuitRecordedBattle(void)
     }
 }
 
-static void sub_8038528(struct Sprite* sprite)
+void sub_8038528(struct Sprite* sprite)
 {
     sprite->data0 = 0;
     sprite->callback = sub_8038538;
@@ -2072,7 +2068,7 @@ static void sub_8038F34(void)
             else
                 monsCount = 2;
 
-            for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == 3; i++);
+            for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++);
 
             if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount)
             {
@@ -2417,7 +2413,7 @@ u32 sub_80397C4(u32 setId, u32 tableId)
 #define tBank               data0
 #define tSpeciesId          data2
 
-static void oac_poke_opponent(struct Sprite *sprite)
+void oac_poke_opponent(struct Sprite *sprite)
 {
     sprite->callback = sub_803980C;
     StartSpriteAnimIfDifferent(sprite, 0);
@@ -2441,7 +2437,7 @@ static void sub_8039838(struct Sprite *sprite)
     if (sprite->animEnded)
     {
         sub_8076918(sprite->tBank);
-        sub_80729D0(gHealthBoxesIds[sprite->tBank]);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[sprite->tBank]);
         sprite->callback = sub_8039894;
         StartSpriteAnimIfDifferent(sprite, 0);
         BeginNormalPaletteFade(0x20000, 0, 10, 0, 0x2108);
@@ -3299,7 +3295,7 @@ static void BattleIntroPrintTrainerWantsToBattle(void)
     if (gBattleExecBuffer == 0)
     {
         gActiveBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-        PrepareStringBattle(0, gActiveBank);
+        PrepareStringBattle(STRINGID_INTROMSG, gActiveBank);
         gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
     }
 }
@@ -3309,7 +3305,7 @@ static void BattleIntroPrintWildMonAttacked(void)
     if (gBattleExecBuffer == 0)
     {
         gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
-        PrepareStringBattle(0, 0);
+        PrepareStringBattle(STRINGID_INTROMSG, 0);
     }
 }
 
@@ -3332,7 +3328,7 @@ static void BattleIntroPrintOpponentSendsOut(void)
     else
         identity = IDENTITY_OPPONENT_MON1;
 
-    PrepareStringBattle(1, GetBankByIdentity(identity));
+    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
     gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
 }
 
@@ -3535,7 +3531,7 @@ static void BattleIntroPrintPlayerSendsOut(void)
             identity = IDENTITY_PLAYER_MON1;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-            PrepareStringBattle(1, GetBankByIdentity(identity));
+            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
 
         gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
     }
@@ -4006,8 +4002,8 @@ static void HandleTurnActionSelectionState(void)
                         for (i = 0; i < 4; i++)
                         {
                             moveInfo.moves[i] = gBattleMons[gActiveBank].moves[i];
-                            moveInfo.ppNumbers[i] = gBattleMons[gActiveBank].pp[i];
-                            moveInfo.ppWithBonusNumbers[i] = CalculatePPWithBonus(
+                            moveInfo.currentPp[i] = gBattleMons[gActiveBank].pp[i];
+                            moveInfo.maxPp[i] = CalculatePPWithBonus(
                                                             gBattleMons[gActiveBank].moves[i],
                                                             gBattleMons[gActiveBank].ppBonuses,
                                                             i);
@@ -4926,7 +4922,7 @@ static void HandleEndTurn_FinishBattle(void)
                     }
                 }
             }
-            sub_80EC728();
+            PutPokemonTodayCaughtOnAir();
         }
 
         if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
@@ -5323,30 +5319,30 @@ static void HandleAction_UseItem(void)
     {
         gBattleScripting.bank = gBankAttacker;
 
-        switch (*(gBattleStruct->field_C4 + (gBankAttacker >> 1)))
+        switch (*(gBattleStruct->AI_itemType + (gBankAttacker >> 1)))
         {
-        case 1:
-        case 2:
+        case AI_ITEM_FULL_RESTORE:
+        case AI_ITEM_HEAL_HP:
             break;
-        case 3:
+        case AI_ITEM_CURE_CONDITION:
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-            if (*(gBattleStruct->field_C6 + gBankAttacker / 2) & 1)
+            if (*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 1)
             {
-                if (*(gBattleStruct->field_C6 + gBankAttacker / 2) & 0x3E)
+                if (*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 0x3E)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 5;
             }
             else
             {
-                while (!(*(gBattleStruct->field_C6 + gBankAttacker / 2) & 1))
+                while (!(*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 1))
                 {
-                    *(gBattleStruct->field_C6 + gBankAttacker / 2) >>= 1;
+                    *(gBattleStruct->AI_itemFlags + gBankAttacker / 2) >>= 1;
                     gBattleCommunication[MULTISTRING_CHOOSER]++;
                 }
             }
             break;
-        case 4:
+        case AI_ITEM_X_STAT:
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            if (*(gBattleStruct->field_C6 + (gBankAttacker >> 1)) & 0x80)
+            if (*(gBattleStruct->AI_itemFlags + (gBankAttacker >> 1)) & 0x80)
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 5;
             }
@@ -5355,9 +5351,9 @@ static void HandleAction_UseItem(void)
                 PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
                 PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2)
 
-                while (!((*(gBattleStruct->field_C6 + (gBankAttacker >> 1))) & 1))
+                while (!((*(gBattleStruct->AI_itemFlags + (gBankAttacker >> 1))) & 1))
                 {
-                    *(gBattleStruct->field_C6 + gBankAttacker / 2) >>= 1;
+                    *(gBattleStruct->AI_itemFlags + gBankAttacker / 2) >>= 1;
                     gBattleTextBuff1[2]++;
                 }
 
@@ -5365,7 +5361,7 @@ static void HandleAction_UseItem(void)
                 gBattleScripting.animArg2 = 0;
             }
             break;
-        case 5:
+        case AI_ITEM_GUARD_SPECS:
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             else
@@ -5373,7 +5369,7 @@ static void HandleAction_UseItem(void)
             break;
         }
 
-        gBattlescriptCurrInstr = gUnknown_082DBD3C[*(gBattleStruct->field_C4 + gBankAttacker / 2)];
+        gBattlescriptCurrInstr = gUnknown_082DBD3C[*(gBattleStruct->AI_itemType + gBankAttacker / 2)];
     }
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }