Support explicit statement ID.

decompiler/__init__.py

@@ -827,10 +827,14 @@ def say_belongs_to_menu(self, say, menu):
 
     @dispatch(renpy.ast.Say)
     def print_say(self, ast, inmenu=False):
+        # if this say statement precedes a menu statement, postpone emitting it until we're handling
+        # the menu
         if (not inmenu and self.index + 1 < len(self.block) and
             self.say_belongs_to_menu(ast, self.block[self.index + 1])):
             self.say_inside_menu = ast
             return
+
+        # else just write it.
         self.indent()
         self.write(say_get_code(ast, inmenu))
 

decompiler/util.py

@@ -558,11 +558,20 @@ def say_get_code(ast, inmenu=False):
     if not ast.interact and not inmenu:
         rv.append("nointeract")
 
-    if ast.with_:
-        rv.append("with")
-        rv.append(ast.with_)
+    # explicit_identifier was only added in 7.7/8.2.
+    if hasattr(ast, "explicit_identifier") and ast.explicit_identifier:
+        rv.append("id")
+        rv.append(ast.identifier)
+    # identifier was added in 7.4.1. But the way ren'py processed it
+    # means it doesn't stored it in the pickle unless explicitly set
+    elif hasattr(ast, "identifier") and ast.identifier is not None:
+        rv.append(ast.identifier)
 
     if hasattr(ast, 'arguments') and ast.arguments is not None:
         rv.append(reconstruct_arginfo(ast.arguments))
 
+    if ast.with_:
+        rv.append("with")
+        rv.append(ast.with_)
+
     return " ".join(rv)