diff --git a/.gitignore b/.gitignore
index 9f929d2529..edc1570626 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ tools/ido7.1_compiler/
 tools/qemu-mips
 tools/ido_recomp/* binary
 ctx.c
+graphs/
 
 # Assets
 *.png
diff --git a/diff.py b/diff.py
new file mode 120000
index 0000000000..9f7d52b4db
--- /dev/null
+++ b/diff.py
@@ -0,0 +1 @@
+tools/asm-differ/diff.py
\ No newline at end of file
diff --git a/diff.sh b/diff.sh
deleted file mode 100755
index deded7daa9..0000000000
--- a/diff.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [ "$#" -ne "1" ];
-then
-    echo "usage: $0 func_name"
-    exit 1
-fi
-
-tools/asm-differ/diff.py -mwo $1
diff --git a/tools/graphovl/.gitignore b/tools/graphovl/.gitignore
new file mode 100644
index 0000000000..fee5bc55ac
--- /dev/null
+++ b/tools/graphovl/.gitignore
@@ -0,0 +1,141 @@
+# https://github.com/github/gitignore/blob/master/Python.gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
diff --git a/tools/graphovl/.gitrepo b/tools/graphovl/.gitrepo
new file mode 100644
index 0000000000..ba58c7963d
--- /dev/null
+++ b/tools/graphovl/.gitrepo
@@ -0,0 +1,12 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = https://github.com/AngheloAlf/graphovl.git
+	branch = master
+	commit = 577e71592b2169fe891cabbe4c59c07d3b511662
+	parent = 187573b8f0c93e41f56baa965ea1267a0ae15c64
+	method = merge
+	cmdver = 0.4.3
diff --git a/tools/graphovl/graphovl.py b/tools/graphovl/graphovl.py
new file mode 100755
index 0000000000..79f24a7ba5
--- /dev/null
+++ b/tools/graphovl/graphovl.py
@@ -0,0 +1,354 @@
+#!/usr/bin/env python3
+#
+# Generates graphs for actor overlay files
+#
+
+from graphviz import Digraph
+import argparse, os, re
+from configparser import ConfigParser
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
+config = ConfigParser()
+
+func_names = None
+func_definitions = list()
+line_numbers_of_functions = list()
+
+# Make actor source file path from actor name
+def actor_src_path(name):
+    filename = "src/overlays/actors/ovl_"
+    if name != "player":
+        filename += name
+    else:
+        filename += name + "_actor"
+    filename += "/z_" + name.lower() + ".c"
+
+    return filename
+
+func_call_regexpr = re.compile(r'[a-zA-Z_\d]+\([^\)]*\)(\.[^\)]*\))?')
+func_defs_regexpr = re.compile(r'[a-zA-Z_\d]+\([^\)]*\)(\.[^\)]*\))? {[^}]')
+macrosRegexpr = re.compile(r'#define\s+([a-zA-Z_\d]+)(\([a-zA-Z_\d]+\))?\s+(.+?)(\n|//|/\*)')
+enumsRegexpr = re.compile(r'enum\s+\{([^\}]+?)\}')
+
+# Capture all function calls in the block, including arguments
+def capture_calls(content):
+    return [x.group() for x in re.finditer(func_call_regexpr, content)]
+
+# Capture all function calls in the block, name only
+def capture_call_names(content):
+    return [x.group().split("(")[0] for x in re.finditer(func_call_regexpr, content)]
+
+# Capture all function definitions in the block, including arguments
+def capture_definitions(content):
+    return [x.group() for x in re.finditer(func_defs_regexpr, content)]
+
+# Capture all function definitions in the block, name only
+def capture_definition_names(content):
+    return [x.group().split("(")[0] for x in re.finditer(func_defs_regexpr, content)]
+
+setupaction_regexpr = re.compile(r"_SetupAction+\([^\)]*\)(\.[^\)]*\))?;")
+
+# Capture all calls to the setupaction function
+def capture_setupaction_calls(content):
+    return [x.group() for x in re.finditer(setupaction_regexpr, content)]
+
+# Captures the function name of a setupaction call
+def capture_setupaction_call_arg(content):
+    return [x.group().split(",")[1].strip().split(");")[0].strip() for x in re.finditer(setupaction_regexpr, content)]
+
+# Search for the function definition by supplied function name
+def definition_by_name(content, name):
+    for definition in capture_definitions(content):
+        if name == definition.split("(")[0]:
+            return definition.split("{")[0].strip()
+
+# Obtain the entire code body of the function
+def get_code_body(content, funcname) -> str:
+    line_num = line_numbers_of_functions[index_of_func(funcname)]
+    if line_num <= 0:
+        return ""
+    code = ""
+    bracket_count = 1
+
+    all_lines = content.splitlines(True)
+    for raw_line in all_lines[line_num:len(all_lines)]:
+        if raw_line.count("{") > 0:
+            bracket_count += raw_line.count("{")
+        if raw_line.count("}") > 0:
+            bracket_count -= raw_line.count("}")
+        if bracket_count == 0:
+            break
+        else:
+            code += raw_line
+    return code
+
+def getMacrosDefinitions(contents):
+    macrosDefs = dict()
+    for x in re.finditer(macrosRegexpr, contents):
+        macroName = x.group(1).strip()
+        macroParamsAux = x.group(2)
+        macroBody = x.group(3).strip()
+
+        macroParams = []
+        if macroParamsAux is not None:
+            for x in macroParamsAux.strip("(").strip(")").split(","):
+                macroParams.append(x.strip())
+        macrosDefs[macroName] = (macroParams, macroBody)
+    return macrosDefs
+
+def parseMacro(macros, macroExpr):
+    macroCall = func_call_regexpr.match(macroExpr)
+    if macroCall is not None:
+        macroName, macroArgs = macroCall.group().split(")")[0].split("(")
+        if macroName not in macros:
+            print("Unknown macro: " + macroName)
+            return None
+        macroParams, macroBody = macros[macroName]
+        argsList = [x.strip() for x in macroArgs.split(",")]
+
+        macroBody = str(macroBody)
+        for i, x in enumerate(macroParams):
+            macroBody = macroBody.replace(x, argsList[i])
+        return str(eval(macroBody))
+    elif macroExpr in macros:
+        macroParams, macroBody = macros[macroExpr]
+        return str(eval(macroBody))
+    return None
+
+def getEnums(contents):
+    enums = dict()
+    for x in re.finditer(enumsRegexpr, contents):
+        enumValue = 0
+        for var in x.group(1).split(","):
+            if "/*" in var and "*/" in var:
+                start = var.index("/*")
+                end = var.index("*/") + len("*/")
+                var = var[:start] + var[end:]
+            if "//" in var:
+                var = var[:var.index("//")]
+            var = var.strip()
+            if len(var) == 0:
+                continue
+
+            enumName = var
+            exprList = var.split("=")
+            if len(exprList) > 1:
+                enumName = exprList[0].strip()
+                enumValue = int(exprList[1], 0)
+
+            enums[enumName] = enumValue
+            enumValue +=1
+
+    return enums
+
+def index_of_func(func_name):
+    return func_names.index(func_name)
+
+def action_var_setups_in_func(content, func_name, action_var):
+    code_body = get_code_body(content, func_name)
+    if action_var not in code_body:
+        return None
+    return [x.group() for x in re.finditer(r'(' + action_var + r' = (.)*)', code_body)]
+
+def action_var_values_in_func(code_body, action_var, macros, enums):
+    if action_var not in code_body:
+        return list()
+
+    regex = re.compile(r'(' + action_var + r' = (.)*)')
+    transition = []
+    for x in re.finditer(regex, code_body):
+        index = x.group().split(" = ")[1].split(";")[0].strip()
+
+        macroValue = parseMacro(macros, index)
+        if macroValue is not None:
+            index = macroValue
+        elif index in enums:
+            index = str(enums[index])
+
+        transition.append(index)
+    return transition
+
+def setup_line_numbers(content, func_names):
+    global line_numbers_of_functions
+    for line_no, line in enumerate(content.splitlines(True),1):
+        for func_name in func_names:
+            # Some functions have definitions on multiple lines, take the last
+            if func_definitions[index_of_func(func_name)].split("\n")[-1] in line:
+                line_numbers_of_functions.append(line_no)
+
+def setup_func_definitions(content, func_names):
+    global func_definitions
+    for func_name in func_names:
+        func_definitions.append(definition_by_name(content, func_name)+" {")
+
+
+def addFunctionTransitionToGraph(dot, index: int, func_name: str, action_transition: str):
+    fontColor = config.get("colors", "fontcolor")
+    bubbleColor = config.get("colors", "bubbleColor")
+    indexStr = str(index)
+    funcIndex = str(index_of_func(action_transition))
+
+    dot.node(indexStr, func_name, fontcolor=fontColor, color=bubbleColor)
+    dot.node(funcIndex, action_transition, fontcolor=fontColor, color=bubbleColor)
+    edgeColor = config.get("colors", "actionFunc")
+    if func_name.endswith("_Init"):
+        edgeColor = config.get("colors", "actionFuncInit")
+    dot.edge(indexStr, funcIndex, color=edgeColor)
+
+def addCallNamesToGraph(dot, func_names: list, index: int, code_body: str, setupAction=False, rawActorFunc=False):
+    edgeColor = config.get("colors", "funcCall")
+    fontColor = config.get("colors", "fontcolor")
+    bubbleColor = config.get("colors", "bubbleColor")
+
+    indexStr = str(index)
+    seen = set()
+    for call in capture_call_names(code_body):
+        if call not in func_names:
+            continue
+        if call in seen:
+            continue
+
+        if setupAction and "_SetupAction" in call:
+            continue
+        seen.add(call)
+
+        if rawActorFunc:
+            dot.node(indexStr, func_names[index], fontcolor=fontColor, color=bubbleColor)
+
+        calledFuncIndex = str(index_of_func(call))
+
+        dot.node(calledFuncIndex, call, fontcolor=fontColor, color=bubbleColor)
+        dot.edge(indexStr, calledFuncIndex, color=edgeColor)
+
+
+def loadConfigFile(selectedStyle):
+    # For a list of colors, see https://www.graphviz.org/doc/info/colors.html
+    # Hex colors works too!
+    stylesFolder = os.path.join(script_dir, "graphovl_styles")
+    configFilename = os.path.join(stylesFolder, "graphovl_config.ini")
+
+    # Set defaults, just in case.
+    config.add_section('colors')
+    config.set('colors', 'background', 'white')
+    config.set('colors', 'funcCall', 'blue')
+    config.set('colors', 'actionFuncInit', 'green')
+    config.set('colors', 'actionFunc', 'Black')
+    config.set('colors', 'fontColor', 'Black')
+    config.set('colors', 'bubbleColor', 'Black')
+
+    if os.path.exists(configFilename):
+        config.read(configFilename)
+    else:
+        print("Warning! Config file not found.")
+
+    style = config.get("config", "defaultStyle") + ".ini"
+    if selectedStyle is not None:
+        style = selectedStyle + ".ini"
+    styleFilename = os.path.join(stylesFolder, style)
+
+    if os.path.exists(styleFilename):
+        config.read(styleFilename)
+    else:
+        print(f"Warning! Style {style} not found.")
+
+
+def main():
+    global func_names
+    parser = argparse.ArgumentParser(description="Creates a graph of action functions (black and green arrows) and function calls (blue arrows) for a given overlay file")
+    parser.add_argument("filename", help="Filename without the z_ or ovl_ prefix, e.x. Door_Ana")
+    parser.add_argument("--loners", help="Include functions that are not called or call any other overlay function", action="store_true")
+    parser.add_argument("-s", "--style", help="Use a color style defined in graphovl_styles folder. i.e. solarized")
+    args = parser.parse_args()
+
+    loadConfigFile(args.style)
+    fontColor = config.get("colors", "fontcolor")
+    bubbleColor = config.get("colors", "bubbleColor")
+
+    fname = args.filename
+    dot = Digraph(comment = fname, format = 'png')
+    dot.attr(bgcolor=config.get("colors", "background"))
+    contents = ""
+
+    with open(actor_src_path(fname), "r") as infile:
+        contents = infile.read()
+
+    func_names = capture_definition_names(contents)
+    setup_func_definitions(contents, func_names)
+    setup_line_numbers(contents, func_names)
+    macros = getMacrosDefinitions(contents)
+    enums = getEnums(contents)
+    func_prefix = ""
+    for index, func_name in enumerate(func_names):
+        # Init is chosen because all actors are guaranteed to have an Init function.
+        # This check is however required as not all functions may have been renamed yet.
+        if func_name.endswith("_Init"): 
+            func_prefix = func_name.split("_")[0]
+            dot.node(str(index), func_name, fontcolor=fontColor, color=bubbleColor)
+        elif (func_name.endswith("_Destroy") or func_name.endswith("_Update") or func_name.endswith("_Draw")):
+            dot.node(str(index), func_name, fontcolor=fontColor, color=bubbleColor)
+
+    action_func_type = func_prefix + "ActionFunc"
+    match_obj = re.search(re.compile(action_func_type + r' (.+)\[\] = {'), contents)
+    actionIdentifier = "this->actionFunc"
+
+    setupAction = func_prefix + "_SetupAction" in func_names
+    arrayActorFunc = match_obj is not None
+    rawActorFunc = actionIdentifier in contents
+
+    if not setupAction and not arrayActorFunc and not rawActorFunc:
+        print("No actor action-based structure found")
+        os._exit(1)
+
+    action_functions = []
+    action_var = ""
+    if arrayActorFunc:
+        action_func_array = re.search(action_func_type + r' (.+)\[\] = \{([^}]*?)\};', contents)
+        if action_func_array is None:
+            print("Invalid array-based actor.")
+            print("Call action func array not found.")
+            os._exit(1)
+        actionFuncArrayElements = action_func_array.group(2).split(",")
+        action_functions = [x.strip() for x in actionFuncArrayElements]
+
+        action_func_array_name = match_obj.group(1).strip()
+        actionVarMatch = re.search(action_func_array_name + r'\[(.*)\]\(', contents)
+        if actionVarMatch is None:
+            print("Invalid ActorFunc array-based actor.")
+            print("Call to array function not found.")
+            os._exit(1)
+        action_var = actionVarMatch.group(1).strip()
+
+    for index, func_name in enumerate(func_names):
+        indexStr = str(index)
+        if args.loners:
+            dot.node(indexStr, func_name, fontcolor=fontColor, color=bubbleColor)
+        code_body = get_code_body(contents, func_name)
+
+        transitionList = []
+        if setupAction:
+            """
+            Create all edges for SetupAction-based actors
+            """
+            transitionList = capture_setupaction_call_arg(code_body)
+        elif arrayActorFunc:
+            """
+            Create all edges for ActorFunc array-based actors
+            """
+            transitionIndexes = action_var_values_in_func(code_body, action_var, macros, enums)
+            transitionList = [action_functions[int(index, 0)] for index in transitionIndexes]
+        elif rawActorFunc:
+            """
+            Create all edges for raw ActorFunc-based actors
+            """
+            transitionList = action_var_values_in_func(code_body, actionIdentifier, macros, enums)
+
+        for action_transition in transitionList:
+            addFunctionTransitionToGraph(dot, index, func_name, action_transition)
+
+        addCallNamesToGraph(dot, func_names, index, code_body, setupAction, rawActorFunc)
+
+    # print(dot.source)
+    dot.render("graphs/" + fname + ".gv")
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/graphovl/graphovl_styles/.gitignore b/tools/graphovl/graphovl_styles/.gitignore
new file mode 100644
index 0000000000..aea641f174
--- /dev/null
+++ b/tools/graphovl/graphovl_styles/.gitignore
@@ -0,0 +1 @@
+custom.ini
diff --git a/tools/graphovl/graphovl_styles/classic.ini b/tools/graphovl/graphovl_styles/classic.ini
new file mode 100644
index 0000000000..3264ad34a2
--- /dev/null
+++ b/tools/graphovl/graphovl_styles/classic.ini
@@ -0,0 +1,7 @@
+[colors]
+background = white
+funcCall = blue
+actionFuncInit = green
+actionFunc = Black
+fontColor = Black
+bubbleColor = Black
diff --git a/tools/graphovl/graphovl_styles/graphovl_config.ini b/tools/graphovl/graphovl_styles/graphovl_config.ini
new file mode 100644
index 0000000000..6ef9217ddd
--- /dev/null
+++ b/tools/graphovl/graphovl_styles/graphovl_config.ini
@@ -0,0 +1,2 @@
+[config]
+defaultStyle = solarized_dark
diff --git a/tools/graphovl/graphovl_styles/soft.ini b/tools/graphovl/graphovl_styles/soft.ini
new file mode 100644
index 0000000000..61cb50a8a3
--- /dev/null
+++ b/tools/graphovl/graphovl_styles/soft.ini
@@ -0,0 +1,7 @@
+[colors]
+background = silver
+funccall = royalblue2
+actionfuncinit = seagreen1
+actionfunc = Black
+fontColor = Black
+bubbleColor = Black
diff --git a/tools/graphovl/graphovl_styles/solarized_dark.ini b/tools/graphovl/graphovl_styles/solarized_dark.ini
new file mode 100644
index 0000000000..5e4f28e2b4
--- /dev/null
+++ b/tools/graphovl/graphovl_styles/solarized_dark.ini
@@ -0,0 +1,7 @@
+[colors]
+background = #002b36
+funcCall = #839496
+actionFuncInit = #dc322f
+actionFunc = #b58900
+fontColor = #839496
+bubbleColor = #839496
diff --git a/tools/graphovl/graphovl_styles/solarized_light.ini b/tools/graphovl/graphovl_styles/solarized_light.ini
new file mode 100644
index 0000000000..6eb37973ac
--- /dev/null
+++ b/tools/graphovl/graphovl_styles/solarized_light.ini
@@ -0,0 +1,7 @@
+[colors]
+background = #fdf6e3
+funcCall = #657b83
+actionFuncInit = #dc322f
+actionFunc = #b58900
+fontColor = #657b83
+bubbleColor = #657b83