From 1ae38be0a46d1d901a2d9e5bb22938a0cecf6b7f Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Thu, 24 Aug 2017 15:19:55 -0500
Subject: do some renaming and reorganizing

---
 src/trader.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/trader.c')

diff --git a/src/trader.c b/src/trader.c
index 9aeefa3d1..d289f72a8 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -37,7 +37,7 @@ void sub_810993C(void)
 {
     u8 i, j;
     u8 buffer[12];
-    struct MauvilleManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     for (i = 0; i < 3; i++)
     {
@@ -59,7 +59,7 @@ void sub_810993C(void)
 void TraderSetup(void)
 {
     u8 i;
-    struct MauvilleManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     trader->id = MAUVILLE_MAN_TRADER;
     trader->unk31 = 0;
@@ -75,7 +75,7 @@ void TraderSetup(void)
 
 void sub_8109A20(void)
 {
-    struct MauvilleManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
     trader->unk31 = 0;
 }
 
@@ -89,7 +89,7 @@ void sub_8109A48(u8 taskId)
     u8 i;
     u8 numChoices = 1;
     u8 numDecorations = 0;
-    struct MauvilleManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     for (i = 0; i < 4; i++)
     {
@@ -142,7 +142,7 @@ void sub_8109B34(u8 taskId, u8 decorationId)
 
 void sub_8109B7C(u8 taskId)
 {
-    struct MauvilleManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     if (gMain.newKeys & DPAD_UP)
     {
@@ -177,7 +177,7 @@ void sub_8109B7C(u8 taskId)
 
 void sub_8109C44(void)
 {
-    struct MauvilleManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
     gScriptResult = trader->unk31;
 }
 
@@ -245,7 +245,7 @@ void sub_8109DAC(u8 taskId)
 
 void sub_8109DE0(void)
 {
-    struct MauvilleManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     sub_81340A8(gSpecialVar_0x8006);
     IsThereStorageSpaceForDecoration(gSpecialVar_0x8004);
-- 
cgit v1.2.3