use MemoryAccessorAliases to build AddAddress chains in ScriptBuilderContext

Source/Parser/Expressions/Trigger/MemoryAccessorExpression.cs

@@ -237,6 +237,12 @@ internal override void AppendString(StringBuilder builder)
             if (_rememberPointer != null)
             {
                 _rememberPointer.AppendString(builder);
+
+                if (Field.Value != 0)
+                {
+                    builder.Append(" + ");
+                    builder.AppendFormat("0x{0:X2}", Field.Value);
+                }
             }
             else if (_pointerChain != null)
             {
@@ -253,7 +259,7 @@ internal override void AppendString(StringBuilder builder)
                     if (i == 0)
                         builder.AppendFormat("0x{0:X6}", _pointerChain[i].Left.Value);
                     else if (_pointerChain[i].Left.Value != 0)
-                        builder.Append(_pointerChain[i].Left.Value);
+                        builder.AppendFormat("0x{0:X2}", _pointerChain[i].Left.Value);
                     else
                         builder.Length -= 3;
 
@@ -292,7 +298,7 @@ internal override void AppendString(StringBuilder builder)
                 }
 
                 if (Field.Value != 0)
-                    builder.Append(Field.Value);
+                    builder.AppendFormat("0x{0:X2}", Field.Value);
                 else
                     builder.Length -= 3;
             }

Source/Parser/Expressions/Trigger/MemoryValueExpression.cs

@@ -1327,8 +1327,6 @@ private MemoryAccessorExpression ConvertToMemoryAccessor()
 
         public ExpressionBase ClearConstant()
         {
-            Debug.Assert(!IsReadOnly);
-
             if (_memoryAccessors == null)
                 return new IntegerConstantExpression(0);
 

Source/Parser/Functions/MemoryAccessorFunction.cs

@@ -111,8 +111,10 @@ private static MemoryAccessorExpression CreateMemoryAccessorExpression(MemoryVal
 
             if (needRemember)
             {
-                memoryAccessor = new MemoryAccessorExpression(FieldType.MemoryAddress, size, 0U);
-                memoryAccessor.RememberPointer = new RememberRecallExpression(memoryValue);
+                memoryAccessor = new MemoryAccessorExpression(FieldType.MemoryAddress, size, (uint) memoryValue.IntegerConstant);
+                memoryAccessor.RememberPointer = memoryValue.HasConstant ?
+                    new RememberRecallExpression((MemoryValueExpression)memoryValue.ClearConstant()) :
+                    new RememberRecallExpression(memoryValue);
             }
             else
             {

Source/Parser/MemoryAccessorAlias.cs

@@ -212,6 +212,15 @@ public string GetAlias(FieldSize size)
             return alias;
         }
 
+        public void SetAlias(FieldSize size, string alias)
+        {
+            if (size != PrimarySize && HasReferencedSize(size))
+            {
+                _aliases ??= new Dictionary<FieldSize, string>();
+                _aliases[size] = alias;
+            }
+        }
+
         public void UpdateAliasFromNote(NameStyle style)
         {
             _aliases = null;
@@ -513,10 +522,10 @@ private static MemoryAccessorAlias GetMemoryAccessor(MemoryAccessorAlias parentM
             if (index < 0)
             {
                 CodeNote note = null;
-                if (parentNote == null)
-                    codeNotes.TryGetValue(field.Value, out note);
-                else
+                if (parentNote != null)
                     note = parentNote.OffsetNotes.FirstOrDefault(n => n.Address == field.Value);
+                else if (parentMemoryAccessor.Address == 0 && parentMemoryAccessor.PrimarySize == FieldSize.None)
+                    codeNotes.TryGetValue(field.Value, out note);
 
                 if (note != null)
                     memoryAccessor.SetNote(note);