From ec232b0ed8b501cccd8254146c35650c41eb6635 Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Thu, 21 Mar 2024 23:37:27 -0400
Subject: [PATCH] Use symlinks for ZAPD in OOT/MM repos

---
 .github/workflows/main.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 31a0f635..15733c65 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,12 +22,14 @@ jobs:
 
     - name: Checkout oot
       run: |
+        cd ../
         git clone https://github.com/zeldaret/oot.git
         cd oot
         git submodule update --init --recursive
 
     - name: Checkout mm
       run: |
+        cd ../
         git clone https://github.com/zeldaret/mm.git
         cd mm
 
@@ -36,26 +38,27 @@ jobs:
 
     - name: Setup OOT
       run: |
+        cd ../
         cd oot
         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
+        ln -s ../../ZAPD 
+        cd ../
+        make -j $(nproc) setup
 
     - name: Setup MM
       run: |
+        cd ../
         cd mm
         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
+        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,12 +69,14 @@ jobs:
 
     - name: Build oot
       run: |
+        cd ../
         cd oot
         make venv
         make -j
 
     - name: Build mm
       run: |
+        cd ../
         cd mm
         python3 -m venv .mm-env
         source .mm-env/bin/activate