From 4b5ad9de049a63b101b2bf5f2f2cb92beb26e5fb Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Fri, 22 Dec 2017 12:36:12 -0600
Subject: Name and use temp var constants

---
 src/engine/record_mixing.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/engine/record_mixing.c')

diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 6cb1e54b2..997a257f5 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -119,7 +119,7 @@ void Task_RecordMixing_Main(u8 taskId)
     {
     case 0:        // init
         sub_8007270(gSpecialVar_0x8005);
-        VarSet(VAR_0x4000, 1);
+        VarSet(VAR_TEMP_0, 1);
         gUnknown_03000718 = 0;
         RecordMixing_PrepareExchangePacket();
         CreateRecordMixingSprite();
@@ -1016,26 +1016,26 @@ void sub_80B9F3C(u16 *a, u8 b)
         {
             if (!CheckBagHasItem(*a, 1) && !CheckPCHasItem(*a, 1) && AddBagItem(*a, 1))
             {
-                VarSet(VAR_0x4001, *a);
+                VarSet(VAR_TEMP_1, *a);
                 StringCopy(gStringVar1, gLinkPlayers[0].name);
                 if (*a == ITEM_EON_TICKET)
                     FlagSet(FLAG_SYS_HAS_EON_TICKET);
             }
             else
             {
-                VarSet(VAR_0x4001, ITEM_NONE);
+                VarSet(VAR_TEMP_1, ITEM_NONE);
             }
         }
         else
         {
             if (AddBagItem(*a, 1) == TRUE)
             {
-                VarSet(VAR_0x4001, *a);
+                VarSet(VAR_TEMP_1, *a);
                 StringCopy(gStringVar1, gLinkPlayers[0].name);
             }
             else
             {
-                VarSet(VAR_0x4001, ITEM_NONE);
+                VarSet(VAR_TEMP_1, ITEM_NONE);
             }
         }
     }
-- 
cgit v1.2.3


From c8d963b26afbe410bc1946bad911a11a7197c45e Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Mon, 1 Jan 2018 08:44:43 -0600
Subject: Label DoPokeNews and PokeNews struct

---
 src/engine/record_mixing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/engine/record_mixing.c')

diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 997a257f5..c8e2e34d5 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -36,7 +36,7 @@ static u8 gUnknown_0300071C[4];
 
 void *recordMixingSecretBases = &gSaveBlock1.secretBases;
 void *recordMixingTvShows = &gSaveBlock1.tvShows;
-void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
+void *gUnknown_083D0274 = &gSaveBlock1.pokeNews;
 void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan;
 void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
 struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738;
-- 
cgit v1.2.3