Merge branch 'master' into decompile_data

3 files changed, 14 insertions, 22 deletions

diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c
index 4dda372f4..3187de7ed 100644
--- a/src/engine/cable_club.c
+++ b/src/engine/cable_club.c
@@ -23,7 +23,7 @@
 #include "text.h"
 #include "trainer_card.h"
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern struct TrainerCard gTrainerCards[4];
 extern u8 gUnknown_03004860;
 extern u8 gFieldLinkPlayerCount;
@@ -343,8 +343,8 @@ static void sub_8083188(u8 taskId)
     }
     else
     {
-        gScriptResult = sub_8082D9C(local1, local2);
-        if (gScriptResult != 0)
+        gSpecialVar_Result = sub_8082D9C(local1, local2);
+        if (gSpecialVar_Result != 0)
             gTasks[taskId].func = sub_8083288;
     }
 }
@@ -360,10 +360,10 @@ void sub_80831F8(u8 taskId)
      || sub_8082DF4(taskId) == TRUE)
         return;
 
-    gScriptResult = sub_8082D9C(local1, local2);
-    if (gScriptResult == 0)
+    gSpecialVar_Result = sub_8082D9C(local1, local2);
+    if (gSpecialVar_Result == 0)
         return;
-    if (gScriptResult == 3)
+    if (gSpecialVar_Result == 3)
     {
         sub_800832C();
         HideFieldMessageBox();
@@ -384,7 +384,7 @@ static void sub_8083288(u8 taskId)
     if (sub_8082DF4(taskId) == TRUE)
         return;
 
-    if (gScriptResult == 3)
+    if (gSpecialVar_Result == 3)
     {
         sub_800832C();
         HideFieldMessageBox();
@@ -425,7 +425,7 @@ static void sub_8083314(u8 taskId)
     ResetBlockReceivedFlags();
     HideFieldMessageBox();
 
-    if (gScriptResult == 1)
+    if (gSpecialVar_Result == 1)
     {
 #if ENGLISH
         u16 linkType;
@@ -461,7 +461,7 @@ static void sub_80833C4(u8 taskId)
 
 static void sub_80833EC(u8 taskId)
 {
-    gScriptResult = 5;
+    gSpecialVar_Result = 5;
     sub_8082D4C();
     HideFieldMessageBox();
     EnableBothScriptContexts();
@@ -470,7 +470,7 @@ static void sub_80833EC(u8 taskId)
 
 static void sub_8083418(u8 taskId)
 {
-    gScriptResult = 6;
+    gSpecialVar_Result = 6;
     sub_8082D4C();
     HideFieldMessageBox();
     EnableBothScriptContexts();
@@ -523,7 +523,7 @@ void sub_80834E4(void)
 
 void sub_808350C(void)
 {
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     gLinkType = 0x3311;
     gBattleTypeFlags = 0;
     sub_8082CD4(2, 4);
@@ -537,14 +537,14 @@ static void sub_808353C(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        if (gScriptResult == 1)
+        if (gSpecialVar_Result == 1)
         {
             playerCount = GetLinkPlayerCount();
             for (i = 0; i < playerCount; i++)
             {
                 if (gLinkPlayers[i].language == LANGUAGE_JAPANESE)
                 {
-                    gScriptResult = 7;
+                    gSpecialVar_Result = 7;
                     sub_8008480();
                     gTasks[taskId].data[0] = 1;
                     return;
diff --git a/src/engine/link.c b/src/engine/link.c
index 27afef937..28323207c 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -635,7 +635,7 @@ static void BuildSendCmd(u16 code)
         break;
     case 0xAAAB:
         gSendCmd[0] = 0xAAAB;
-        gSendCmd[1] = gScriptItemId;
+        gSendCmd[1] = gSpecialVar_ItemId;
         break;
     case 0xCCCC:
         gSendCmd[0] = 0xCCCC;
diff --git a/src/engine/sprite.c b/src/engine/sprite.c
index 69fa860c1..c1bb36917 100644
--- a/src/engine/sprite.c
+++ b/src/engine/sprite.c
@@ -26,14 +26,6 @@
 
 #define SPRITE_TILE_IS_ALLOCATED(n) ((gSpriteTileAllocBitmap[(n) / 8] >> ((n) % 8)) & 1)
 
-struct OamMatrix
-{
-    s16 a;
-    s16 b;
-    s16 c;
-    s16 d;
-};
-
 struct SpriteCopyRequest
 {
     const u8 *src;