Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu

1 files changed, 27 insertions, 27 deletions

diff --git a/src/battle_main.c b/src/battle_main.c
index 3c4a61600..78b69212d 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -20,6 +20,7 @@
 #include "constants/hold_effects.h"
 #include "constants/trainers.h"
 #include "link.h"
+#include "link_rfu.h"
 #include "bg.h"
 #include "dma3.h"
 #include "string_util.h"
@@ -50,7 +51,7 @@
 #include "international_string_util.h"
 #include "pokeball.h"
 
-struct UnknownPokemonStruct2
+struct UnknownPokemonStruct4
 {
     /*0x00*/ u16 species;
     /*0x02*/ u16 heldItem;
@@ -85,7 +86,6 @@ extern const u16 gBattleTextboxPalette[]; // battle textbox palette
 extern const struct BgTemplate gUnknown_0831AA08[];
 extern const struct WindowTemplate * const gUnknown_0831ABA0[];
 extern const u8 gUnknown_0831ACE0[];
-extern const u8 gStatStageRatios[][2];
 extern const u8 * const gBattleScriptsForMoveEffects[];
 extern const u8 * const gBattlescriptsForBallThrow[];
 extern const u8 * const gBattlescriptsForRunningByItem[];
@@ -198,8 +198,8 @@ EWRAM_DATA static u32 sUnusedUnknownArray[25] = {0};
 EWRAM_DATA u32 gBattleTypeFlags = 0;
 EWRAM_DATA u8 gBattleTerrain = 0;
 EWRAM_DATA u32 gUnknown_02022FF4 = 0;
-EWRAM_DATA struct UnknownPokemonStruct2 gUnknown_02022FF8[3] = {0}; // what is it used for?
-EWRAM_DATA struct UnknownPokemonStruct2* gUnknown_02023058 = NULL; // what is it used for?
+EWRAM_DATA struct UnknownPokemonStruct4 gUnknown_02022FF8[3] = {0}; // what is it used for?
+EWRAM_DATA struct UnknownPokemonStruct4* gUnknown_02023058 = NULL; // what is it used for?
 EWRAM_DATA u8 *gUnknown_0202305C = NULL;
 EWRAM_DATA u8 *gUnknown_02023060 = NULL;
 EWRAM_DATA u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200] = {0};
@@ -738,7 +738,7 @@ static void CB2_HandleStartBattle(void)
             sub_805EF14();
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
-        if (gLinkVSyncDisabled)
+        if (gWirelessCommType)
             sub_800E0E8();
         break;
     case 1:
@@ -762,8 +762,8 @@ static void CB2_HandleStartBattle(void)
                     SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
                     gBattleCommunication[MULTIUSE_STATE] = 2;
                 }
-                if (gLinkVSyncDisabled)
-                    sub_800DFB4(0, 0);
+                if (gWirelessCommType)
+                    CreateWirelessStatusIndicatorSprite(0, 0);
             }
         }
         else
@@ -790,7 +790,7 @@ static void CB2_HandleStartBattle(void)
             gTasks[taskId].data[4] = gBlockRecvBuffer[enemyMultiplayerId][1];
             sub_8185F90(gBlockRecvBuffer[playerMultiplayerId][1]);
             sub_8185F90(gBlockRecvBuffer[enemyMultiplayerId][1]);
-            sub_8068AA4();
+            SetDeoxysStats();
             gBattleCommunication[MULTIUSE_STATE]++;
         }
         break;
@@ -933,7 +933,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
             sub_805EF14();
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
-        if (gLinkVSyncDisabled)
+        if (gWirelessCommType)
             sub_800E0E8();
         // fall through
     case 1:
@@ -964,8 +964,8 @@ static void CB2_HandleStartMultiPartnerBattle(void)
                     gBattleCommunication[MULTIUSE_STATE] = 2;
                 }
 
-                if (gLinkVSyncDisabled)
-                    sub_800DFB4(0, 0);
+                if (gWirelessCommType)
+                    CreateWirelessStatusIndicatorSprite(0, 0);
             }
         }
         else
@@ -1202,9 +1202,9 @@ static void CB2_PreInitMultiBattle(void)
     case 0:
         if (gReceivedRemoteLinkPlayers != 0 && sub_800A520())
         {
-            gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct2) * 3);
+            gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct4) * 3);
             sub_80379F8(0);
-            SendBlock(bitmask_all_link_players_but_self(), gUnknown_02023058, sizeof(struct UnknownPokemonStruct2) * 3);
+            SendBlock(bitmask_all_link_players_but_self(), gUnknown_02023058, sizeof(struct UnknownPokemonStruct4) * 3);
             gBattleCommunication[MULTIUSE_STATE]++;
         }
         break;
@@ -1222,12 +1222,12 @@ static void CB2_PreInitMultiBattle(void)
                     if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplierId].lp_field_18 & 1))
                         || (gLinkPlayers[i].lp_field_18 & 1 && gLinkPlayers[playerMultiplierId].lp_field_18 & 1))
                     {
-                        memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct2) * 3);
+                        memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct4) * 3);
                     }
                 }
                 else
                 {
-                    memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct2) * 3);
+                    memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct4) * 3);
                 }
             }
             gBattleCommunication[MULTIUSE_STATE]++;
@@ -1241,14 +1241,14 @@ static void CB2_PreInitMultiBattle(void)
         if (sub_800A520() && !gPaletteFade.active)
         {
             gBattleCommunication[MULTIUSE_STATE]++;
-            if (gLinkVSyncDisabled)
+            if (gWirelessCommType)
                 sub_800ADF8();
             else
                 sub_800AC34();
         }
         break;
     case 3:
-        if (gLinkVSyncDisabled)
+        if (gWirelessCommType)
         {
             if (sub_8010500())
             {
@@ -1286,7 +1286,7 @@ static void CB2_PreInitIngamePlayerPartnerBattle(void)
     switch (gBattleCommunication[MULTIUSE_STATE])
     {
     case 0:
-        gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct2) * 3);
+        gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct4) * 3);
         sub_80379F8(3);
         gBattleCommunication[MULTIUSE_STATE]++;
         *savedCallback = gMain.savedCallback;
@@ -1333,7 +1333,7 @@ static void CB2_HandleStartMultiBattle(void)
             sub_805EF14();
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
-        if (gLinkVSyncDisabled)
+        if (gWirelessCommType)
             sub_800E0E8();
         break;
     case 1:
@@ -1351,8 +1351,8 @@ static void CB2_HandleStartMultiBattle(void)
                     SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
                     gBattleCommunication[MULTIUSE_STATE]++;
                 }
-                if (gLinkVSyncDisabled)
-                    sub_800DFB4(0, 0);
+                if (gWirelessCommType)
+                    CreateWirelessStatusIndicatorSprite(0, 0);
             }
         }
         else
@@ -1369,7 +1369,7 @@ static void CB2_HandleStartMultiBattle(void)
             ResetBlockReceivedFlags();
             sub_8036EB8(4, playerMultiplayerId);
             SetAllPlayersBerryData();
-            sub_8068AA4();
+            SetDeoxysStats();
             var = CreateTask(sub_8035D74, 0);
             gTasks[var].data[1] = 0x10E;
             gTasks[var].data[2] = 0x5A;
@@ -2136,12 +2136,12 @@ static void sub_8038F34(void)
         }
         break;
     case 8:
-        if (!gLinkVSyncDisabled)
+        if (!gWirelessCommType)
             sub_800AC34();
         gBattleCommunication[MULTIUSE_STATE]++;
         break;
     case 9:
-        if (!gMain.field_439_x4 || gLinkVSyncDisabled || gReceivedRemoteLinkPlayers != 1)
+        if (!gMain.field_439_x4 || gWirelessCommType || gReceivedRemoteLinkPlayers != 1)
         {
             gMain.field_439_x4 = 0;
             SetMainCallback2(gMain.savedCallback);
@@ -2320,13 +2320,13 @@ static void sub_803939C(void)
     case 8:
         if (--gBattleCommunication[1] == 0)
         {
-            if (gMain.field_439_x4 && !gLinkVSyncDisabled)
+            if (gMain.field_439_x4 && !gWirelessCommType)
                 sub_800AC34();
             gBattleCommunication[MULTIUSE_STATE]++;
         }
         break;
     case 9:
-        if (!gMain.field_439_x4 || gLinkVSyncDisabled || gReceivedRemoteLinkPlayers != 1)
+        if (!gMain.field_439_x4 || gWirelessCommType || gReceivedRemoteLinkPlayers != 1)
         {
             gMain.field_439_x4 = 0;
             if (!gPaletteFade.active)
@@ -3389,7 +3389,7 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void)
 }
 
 #else
-__attribute__((naked))
+ASM_DIRECT
 static void BattleIntroOpponent1SendsOutMonAnimation(void)
 {
     asm(".syntax unified\n\