From 498909ea18f97d9ffb89bf0b0ca87b180b2102b1 Mon Sep 17 00:00:00 2001
From: Kenix <kenixwhisperwind@gmail.com>
Date: Thu, 23 Jan 2020 22:20:33 -0500
Subject: [PATCH] Splits out z_scene for decompilation.

---
 linker_scripts/code_script.txt    |  2 +-
 src/code/z_scene.c                | 89 +++++++++++++++++++++++++++++++
 tables/files_with_nonmatching.txt |  1 +
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 src/code/z_scene.c

diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt
index 99c1b16114..931947cfc9 100644
--- a/linker_scripts/code_script.txt
+++ b/linker_scripts/code_script.txt
@@ -302,7 +302,7 @@ SECTIONS
         build/asm/z_rcp.o(.text)
         build/src/code/z_room.o(.text)
         build/asm/code_0x8012EC80.o(.text)
-        build/asm/z_scene.o(.text)
+        build/src/code/z_scene.o(.text)
         build/src/code/z_scene_proc.o(.text)
         build/asm/z_scene_table.o(.text)
         build/asm/code_0x801323D0.o(.text)
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
new file mode 100644
index 0000000000..edb68059a0
--- /dev/null
+++ b/src/code/z_scene.c
@@ -0,0 +1,89 @@
+#include <ultra64.h>
+#include <global.h>
+
+GLOBAL_ASM("./asm/nonmatching/Scene_LoadObject.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_Init.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_ReloadUnloadedObjects.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_FindSceneObjectIndex.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_IsObjectLoaded.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_DmaAllObjects.asm")
+
+GLOBAL_ASM("./asm/nonmatching/func_8012F73C.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand00.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand01.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand02.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand03.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand04.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand06.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand07.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand08.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand0A.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand0B.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand0C.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand0D.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand0E.asm")
+
+GLOBAL_ASM("./asm/nonmatching/func_8012FEBC.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand0F.asm")
+
+GLOBAL_ASM("./asm/nonmatching/func_8012FF10.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand11.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand12.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand10.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand05.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand13.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand09.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand15.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand16.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand18.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand17.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand1B.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand1C.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand1D.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand1E.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand19.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_HeaderCommand1A.asm")
+
+GLOBAL_ASM("./asm/nonmatching/func_801306A4.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_ProcessHeader.asm")
+
+GLOBAL_ASM("./asm/nonmatching/Scene_CreateEntrance.asm")
+
+GLOBAL_ASM("./asm/nonmatching/func_80130784.asm")
+
diff --git a/tables/files_with_nonmatching.txt b/tables/files_with_nonmatching.txt
index 1e8aac8381..964bd95279 100644
--- a/tables/files_with_nonmatching.txt
+++ b/tables/files_with_nonmatching.txt
@@ -12,3 +12,4 @@ z_lights
 z_room
 z_scene_proc
 z_std_dma
+z_scene