Extract unused scene headers (#1930)

* Extract unused scene headers

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "1300a4f36"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "1300a4f36"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* Add more unused arguments to CS_LIGHT_SETTING

tools/ZAPD/.github/workflows/main.yml

@@ -22,40 +22,51 @@ jobs:
 
     - name: Checkout oot
       run: |
+        cd ../
+        rm -rf oot/
         git clone https://github.com/zeldaret/oot.git
         cd oot
+        echo $(pwd)
         git submodule update --init --recursive
 
     - name: Checkout mm
       run: |
+        cd ../
+        rm -rf mm/
         git clone https://github.com/zeldaret/mm.git
         cd mm
+        echo $(pwd)
 
     - name: Set up repos
       run: echo "Set up repos"
 
     - name: Setup OOT
       run: |
+        cd ../
         cd oot
+        echo $(pwd)
         mkdir -p baseroms/gc-eu-mq-dbg/segments
         cp ~/baserom_original.z64 ./baseroms/gc-eu-mq-dbg/baserom.z64
-        make venv
-        make -C tools -j
-        cp ../ZAPD.out tools/ZAPD/
-        .venv/bin/python3 tools/decompress_baserom.py gc-eu-mq-dbg
-        .venv/bin/python3 tools/extract_baserom.py baseroms/gc-eu-mq-dbg/baserom-decompressed.z64 -o baseroms/gc-eu-mq-dbg/segments --dmadata-start 0x12f70 --dmadata-names baseroms/gc-eu-mq-dbg/dmadata_names.txt
-        .venv/bin/python3 extract_assets.py -j 4
-        .venv/bin/python3 tools/msgdis.py --text-out assets/text/message_data.h --staff-text-out assets/text/message_data_staff.h
+        cd tools
+        rm -rf ZAPD/
+        ln -s ../../ZAPD 
+        cd ../
+        make -j $(nproc) setup
 
     - name: Setup MM
       run: |
+        cd ../
         cd mm
+        echo $(pwd)
         python3 -m venv .mm-env
         source .mm-env/bin/activate 
         python3 -m pip install -r requirements.txt
         cp ~/baserom.mm.us.rev1.z64 ./baserom.mm.us.rev1.z64
+        cd tools
+        rm -rf ZAPD/
+        ln -s ../../ZAPD
+        cd ../
         make -C tools -j
-        cp ../ZAPD.out tools/ZAPD/
         python3 tools/fixbaserom.py
         python3 tools/extract_baserom.py
         python3 tools/decompress_yars.py
@@ -66,13 +77,17 @@ jobs:
 
     - name: Build oot
       run: |
+        cd ../
         cd oot
+        echo $(pwd)
         make venv
         make -j
 
     - name: Build mm
       run: |
+        cd ../
         cd mm
+        echo $(pwd)
         python3 -m venv .mm-env
         source .mm-env/bin/activate 
         python3 -m pip install -r requirements.txt

tools/ZAPD/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/zeldaret/ZAPD.git
 	branch = master
-	commit = b3bfa14cf432115a0a675d243f3a1b3197f17cbd
-	parent = 59017f201eae4a1bc9212ea2c7dc51d4a036108b
+	commit = 1300a4f36584627aa784cbc252d1c8ecd7b40e68
+	parent = 4522ee2cae12b2d23b7ef0134f24f7c3e26935f0
 	method = merge
 	cmdver = 0.4.6

tools/ZAPD/ZAPD/OtherStructs/CutsceneOoT_Commands.cpp

@@ -15,7 +15,7 @@ const std::unordered_map<CutsceneOoT_CommandType, CsCommandListDescriptor> csCom
 	{CutsceneOoT_CommandType::CS_CMD_MISC,
      {"CS_MISC", "(%s, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}},
 	{CutsceneOoT_CommandType::CS_CMD_LIGHT_SETTING,
-     {"CS_LIGHT_SETTING", "(0x%02X, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}},
+     {"CS_LIGHT_SETTING", "(0x%02X, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}},
 	{CutsceneOoT_CommandType::CS_CMD_START_SEQ,
      {"CS_START_SEQ", "(%s, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}},
 	{CutsceneOoT_CommandType::CS_CMD_STOP_SEQ,

tools/ZAPD/ZAPD/ZCutscene.cpp

@@ -24,7 +24,7 @@ std::string ZCutscene::GetBodySourceCode() const
 {
 	std::string output = "";
 
-	output += StringHelper::Sprintf("    CS_BEGIN_CUTSCENE(%i, %i),\n", commands.size(), endFrame);
+	output += StringHelper::Sprintf("    CS_BEGIN_CUTSCENE(%i, %i),\n", numCommands, endFrame);
 
 	for (size_t i = 0; i < commands.size(); i++)
 	{
@@ -32,7 +32,7 @@ std::string ZCutscene::GetBodySourceCode() const
 		output += "    " + cmd->GenerateSourceCode();
 	}
 
-	output += StringHelper::Sprintf("    CS_END(),", commands.size(), endFrame);
+	output += StringHelper::Sprintf("    CS_END(),");
 
 	return output;
 }

tools/csdis.py

@@ -491,7 +491,7 @@ cutscene_command_macros = {
               "CS_MISC(%h2:1:e4, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x, %w1:10:x, %w1:11:x, %w1:12:x)", 12),
     4:
         ("CS_LIGHT_SETTING_LIST(%w1:1:s)", 2, None, 0,
-              "CS_LIGHT_SETTING(%h2:1:x-1, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x)", 12),
+              "CS_LIGHT_SETTING(%h2:1:x-1, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x, %w1:10:x, %w1:11:x, %w1:12:x)", 12),
     86:
         ("CS_START_SEQ_LIST(%w1:1:s)", 2, None, 0,
               "CS_START_SEQ(%h2:1:e3, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x)", 12),