--- a/Party.cpp	Wed Oct 10 14:21:15 2012 +0200
+++ b/Party.cpp	Wed Oct 10 19:10:15 2012 +0200
@@ -512,7 +512,7 @@
 //----- (004917CE) --------------------------------------------------------
 int Party::Reset()
 {
-  Party *v1; // esi@1
+  //Party *v1; // esi@1
   unsigned __int64 *pTimePlayed; // edi@1
   bool v3; // edx@1
   Player **v4; // eax@1
@@ -532,27 +532,27 @@
   int v18; // edx@24
   Player *v19; // eax@24
 
-  v1 = this;
-  pTimePlayed = &this->uTimePlayed;
-  memset(&this->uTimePlayed, 0, 0x1620Cu);
-  v1->field_708 = 15;
-  pParty->sEyelevel = 160;
+  //v1 = this;
+  pTimePlayed = &uTimePlayed;
+  //memset(&this->uTimePlayed, 0, 0x1620Cu);
+  field_708 = 15;
+  sEyelevel = 160;
   LOBYTE(v3) = 1;
-  v1->uFlags2 = 0;
-  v1->uNumGold = 200;
-  v1->uNumGoldInBank = 0;
-  v1->uNumFoodRations = 7;
-  v1->uAlignment = 1;
+  uFlags2 = 0;
+  uNumGold = 200;
+  uNumGoldInBank = 0;
+  uNumFoodRations = 7;
+  uAlignment = 1;
   SetUserInterface(1, v3);
   *((int *)pTimePlayed + 1) = 0;
   *(int *)pTimePlayed = 0x21C00u;
-  LODWORD(v1->uLastRegenerationTime) = 0x21C00u;
-  HIDWORD(v1->uLastRegenerationTime) = 0;
-  v1->bTurnBasedModeOn = 0;
+  LODWORD(uLastRegenerationTime) = 0x21C00;
+  HIDWORD(uLastRegenerationTime) = 0;
+  bTurnBasedModeOn = 0;
   uActiveCharacter = 1;
-  ::pPlayers[0] = v1->pPlayers;
+  ::pPlayers[0] = pPlayers;
   v4 = &::pPlayers[1];
-  v5 = v1->pPlayers;
+  v5 = pPlayers;
   do
   {
     *v4 = v5;
@@ -564,12 +564,12 @@
   pPlayers[0].Reset(4u);
   pPlayers[0].Reset(0x18u);
   pPlayers[0].Reset(0x20u);
-  v1->pPlayers[0].uFace = 17;
-  v1->pPlayers[0].field_1924 = 17;
-  v1->pPlayers[0].uVoiceID = 17;
-  v1->pPlayers[0].SetInitialStats();
+  pPlayers[0].uFace = 17;
+  pPlayers[0].field_1924 = 17;
+  pPlayers[0].uVoiceID = 17;
+  pPlayers[0].SetInitialStats();
   v6 = 0;
-  switch ( v1->pPlayers[0].uVoiceID )
+  switch ( pPlayers[0].uVoiceID )
   {
     case 0u:
     case 1u:
@@ -602,15 +602,15 @@
     default:
       break;
   }
-  v1->pPlayers[0].uSex = v6;
-  v1->pPlayers[0].RandomizeName();
-  strcpy(v1->pPlayers[0].pName, pGlobalTXT_LocalizationStrings[509]);
-  v1->pPlayers[1].uFace = 3;
-  v1->pPlayers[1].field_1924 = 3;
-  v1->pPlayers[1].uVoiceID = 3;
-  v1->pPlayers[1].SetInitialStats();
+  pPlayers[0].uSex = v6;
+  pPlayers[0].RandomizeName();
+  strcpy(pPlayers[0].pName, pGlobalTXT_LocalizationStrings[509]);
+  pPlayers[1].uFace = 3;
+  pPlayers[1].field_1924 = 3;
+  pPlayers[1].uVoiceID = 3;
+  pPlayers[1].SetInitialStats();
   v7 = 0;
-  switch ( v1->pPlayers[1].uVoiceID )
+  switch (pPlayers[1].uVoiceID)
   {
     case 0u:
     case 1u:
@@ -645,13 +645,13 @@
   }
   pPlayers[1].uSex = v7;
   pPlayers[1].RandomizeName();
-  strcpy(v1->pPlayers[1].pName, pGlobalTXT_LocalizationStrings[506]);
+  strcpy(pPlayers[1].pName, pGlobalTXT_LocalizationStrings[506]);
   pPlayers[2].uFace = 14;
   pPlayers[2].field_1924 = 14;
   pPlayers[2].uVoiceID = 14;
   pPlayers[2].SetInitialStats();
   v8 = 0;
-  switch ( v1->pPlayers[2].uVoiceID )
+  switch (pPlayers[2].uVoiceID)
   {
     case 0u:
     case 1u:
@@ -686,13 +686,13 @@
   }
   pPlayers[2].uSex = v8;
   pPlayers[2].RandomizeName();
-  strcpy(v1->pPlayers[2].pName, pGlobalTXT_LocalizationStrings[508]);
+  strcpy(pPlayers[2].pName, pGlobalTXT_LocalizationStrings[508]);
   pPlayers[3].uFace = 10;
   pPlayers[3].field_1924 = 10;
   pPlayers[3].uVoiceID = 10;
   pPlayers[3].SetInitialStats();
   v9 = 0;
-  switch ( v1->pPlayers[3].uVoiceID )
+  switch (pPlayers[3].uVoiceID)
   {
     case 0u:
     case 1u:
@@ -725,9 +725,9 @@
     default:
       break;
   }
-  v1->pPlayers[3].uSex = v9;
+  pPlayers[3].uSex = v9;
   pPlayers[3].RandomizeName();
-  strcpy(v1->pPlayers[3].pName, pGlobalTXT_LocalizationStrings[507]);
+  strcpy(pPlayers[3].pName, pGlobalTXT_LocalizationStrings[507]);
   v10 = &::pPlayers[1];
   do
   {
@@ -751,7 +751,7 @@
     ++v10;
   }
   while ( (signed int)v10 <= (signed int)&pPlayers[4] );
-  v14 = &v1->pPartyBuffs[1];
+  v14 = &pPartyBuffs[1];
   v15 = 19;
   do
   {
@@ -761,8 +761,8 @@
   }
   while ( v15 );
   pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100;
-  v1->uFlags = 0;
-  v16 = (char *)v1->_award_bits;
+  uFlags = 0;
+  v16 = (char *)_award_bits;
   _449B7E_toggle_bit(v16, 1, 1u);
   _449B7E_toggle_bit(v16, 2, 1u);
   _449B7E_toggle_bit(v16, 3, 1u);