Merge pull request UnderminersTeam#1751 from colinator27/2024_bytecod…

…e_weirdness

Add support for new bytecode weirdness

UndertaleModLib/Decompiler/Assembler.cs

@@ -227,8 +227,19 @@ public static UndertaleInstruction AssembleOne(string source, IList<UndertaleFun
                         instr.Value = breakId;
                         if (breakId == -11) // pushref
                         {
-                            // parse additional int argument
-                            instr.IntArgument = Int32.Parse(line);
+                            // Parse additional int argument
+                            if (Int32.TryParse(line, out int intArgument))
+                            {
+                                instr.IntArgument = intArgument;
+                            }
+                            else
+                            {
+                                // Or alternatively parse function!
+                                var f = data.Functions.ByName(line);
+                                if (f == null)
+                                    throw new Exception("Function in pushref not found: " + line);
+                                instr.Function = new UndertaleInstruction.Reference<UndertaleFunction>(f);
+                            }
                         }
                     }
                     else

UndertaleModLib/Decompiler/Decompiler.cs

@@ -706,6 +706,11 @@ assign.Value is FunctionDefinition funcDef &&
                                     // Note that this operator peeks from the stack, it does not pop directly.
                                     break;
                                 case -11: // GM 2023.8+, pushref
+                                    if (instr.Function != null)
+                                    {
+                                        stack.Push(new ExpressionConstant(UndertaleInstruction.DataType.Int32, instr.Function));
+                                        break;
+                                    }
                                     stack.Push(new ExpressionAssetRef(instr.IntArgument));
                                     break;
                             }

UndertaleModLib/Decompiler/Disassembler.cs

@@ -11,7 +11,7 @@ public static class Disassembler
     {
         private static void AppendLocalVarDefinitionsToStringBuilder(StringBuilder sb, UndertaleCode code, IList<UndertaleVariable> vars, UndertaleCodeLocals locals)
         {
-            if (code.WeirdLocalFlag)
+            if (code.WeirdLocalFlag && locals is null)
             {
                 return;
             }

UndertaleModLib/Models/UndertaleCode.cs

@@ -363,10 +363,18 @@ public static void ParseReferenceChain(UndertaleReader reader, T obj)
     public Reference<T> GetReference<T>(bool allowResolve = false) where T : class, UndertaleObject, ReferencedObject
     {
         Reference<T> res = (Destination as Reference<T>) ?? (Function as Reference<T>) ?? (Value as Reference<T>);
-        if (allowResolve && res == null && Value is int val)
+        if (allowResolve && res == null)
         {
-            Value = new Reference<T>(val);
-            return (Reference<T>)Value;
+            if (Kind == Opcode.Break && Value is short breakType && breakType == -11 /* pushref */)
+            {
+                Function = new Reference<UndertaleFunction>(IntArgument);
+                return Function as Reference<T>;
+            }
+            if (Value is int val)
+            {
+                Value = new Reference<T>(val);
+                return (Reference<T>)Value;
+            }
         }
         return res;
     }
@@ -563,7 +571,13 @@ public void Serialize(UndertaleWriter writer)
                 writer.Write((short)Value);
                 writer.Write((byte)Type1);
                 writer.Write((byte)Kind);
-                if (Type1 == DataType.Int32) writer.Write(IntArgument);
+                if (Type1 == DataType.Int32)
+                {
+                    if (Function != null)
+                        writer.WriteUndertaleObject(Function);
+                    else
+                        writer.Write(IntArgument);
+                }
             }
                 break;
 
@@ -1008,7 +1022,10 @@ public void ToString(StringBuilder stringBuilder, UndertaleCode code, List<uint>
                 if (Type1 == DataType.Int32)
                 {
                     sbh.Append(stringBuilder, ' ');
-                    sbh.Append(stringBuilder, IntArgument);
+                    if (Function != null)
+                        sbh.Append(stringBuilder, Function);
+                    else
+                        sbh.Append(stringBuilder, IntArgument);
                 }
                 break;
         }