From 021fb1e0e9154392c62ebd31272a4e9210c92f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 3 Apr 2010 01:17:35 +0200
Subject: [PATCH] Small Memory.xml fixes

---
 output/Memory.xml | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/output/Memory.xml b/output/Memory.xml
index 412f73623..b38aaa0c1 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -3082,6 +3082,8 @@
         0x17f5ac8
         0x17f5ad0
 
+        GUI State
+        =========
         <Address name="pause_state">0x146e45f</Address>
         Found addresses:
         0x146e45f <!-- looks like a dword -->
@@ -3120,7 +3122,7 @@
         <Address name="region_y">0x016ad754</Address>
         <Address name="region_z">0x016ad758</Address>
 
-        name struct
+        Name struct
         ===========
         <Offset name="name_firstname">0x0</Offset>
         <Offset name="name_nickname">0x1C</Offset>
@@ -3128,7 +3130,7 @@
 
         Creatures
         =========
-        <Address name="creature_vector">0x0166eccc</Address>
+        <Address name="creature_vector">0x0166ecc4</Address>
         <Offset name="creature_name">0x0</Offset>
         <Offset name="creature_position">0x90</Offset>
         <Offset name="creature_flags1">0xF8</Offset>
@@ -3137,24 +3139,42 @@
         <Offset name="creature_id">0x114</Offset>
         <Offset name="creature_artifact_name">0x6D0</Offset>
         <Offset name="creature_labors">0x770</Offset>
+        <Offset name="creature_happiness">0x830</Offset>
       
         Materials
         =========
         <!-- Number vectors are vector <uint32_t> -->
         <!-- Others are vector<object *> -->
+        <!-- first member of 'object' is a STL string with the name of said object -->
         <Address name="mat_system_start">0x16afcec</Address>
         <Address name="mat_templates">0x16afcec</Address>
+        
+        <!-- soil, stone, metal -->
         <Address name="mat_inorganics">0x16afd04</Address>
+        
+        <!-- wood and plant matter -->
         <Address name="mat_organics_all">0x16afd1C</Address>
+        
+        <!-- plant matter -->
         <Address name="mat_organics_plants">0x16afd34</Address>
-        <Address name="mat_unk1_numbers">0x16afd4C</Address> <!-- maybe maps beween organics_all and organics_plants -->
+        
+        <!-- maybe maps beween organics_all and organics_plants -->
+        <Address name="mat_unk1_numbers">0x16afd4C</Address> 
+        
+        <!-- wood -->
         <Address name="mat_organics_trees">0x16afd64</Address>
-        <Address name="mat_unk2_numbers">0x16afd7C</Address> <!-- maybe maps beween organics_all and organics_trees -->
+        
+        <!-- maybe maps beween organics_all and organics_trees -->
+        <Address name="mat_unk2_numbers">0x16afd7C</Address> 
+        
+        <!-- body material stuff -->
         <Address name="mat_body_material_templates">0x16AFD94</Address>
         <Address name="mat_body_detail_plans">0x16AFDAC</Address>
         <Address name="mat_bodies">0x16AFDC4</Address>
         <Address name="mat_bodygloss">0x16AFDDC</Address>
         <Address name="mat_creature_variations">0x16AFDF4</Address>
+        
+        <!-- creature types -->
         <Address name="mat_creature_types">0x16AFE0C</Address>
         
         <!--