Merged develop/2.1.0

.github/workflows/format.yml

@@ -0,0 +1,44 @@
+name: Format check
+
+on: [push, pull_request]
+
+jobs:
+  check-main:
+    if: ${{ github.event_name == 'push' }}
+    name: Check all files
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.ref }}
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Check file's formatting
+      run: python tools/check_format.py
+
+  check-pr:
+    if: ${{ github.event_name == 'pull_request' }}
+    name: Check modified files
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.ref }}
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        git remote add upstream https://github.com/HackerN64/HackerOoT.git
+        git fetch upstream
+    - name: Check file's formatting
+      run: python tools/check_format.py --verbose --compare-to upstream/develop/2.1.0

.gitignore

@@ -31,11 +31,15 @@ build/*/cache/
 *.map
 *.dump
 *.wad
+*.iso
 out.txt
 *.ram
 *.bin
+*.blend1
 F3DEX3/*.code
 F3DEX3/*.data
+wadextract/
+isoextract/
 
 # Tool artifacts
 tools/mipspro7.2_compiler/

.vscode/c_cpp_properties.json

@@ -22,7 +22,7 @@
                 "RELEASE_ROM=0",
                 "COMPRESS_YAZ=1"
             ],
-            "cStandard": "gnu89", // C89 + some GNU extensions from C99 like C++ comments
+            "cStandard": "gnu11",
             "cppStandard": "${default}" // Only ZAPD uses C++, so doesn't really matter
         }
     ],

.vscode/settings.json

@@ -6,4 +6,13 @@
         "build/**": true,
         "expected/**": true,
     },
+    "files.associations": {
+        "*.c": "c",
+        "*.h": "c",
+        "*.inc": "c",
+        "*.inc.c": "c",
+    },
+    "editor.rulers": [
+        120
+    ],
 }

INSTALLATION.md

@@ -20,7 +20,7 @@ For Windows 10 or 11, install WSL and a distribution by following this
 [WSL Installation Guide](https://docs.microsoft.com/en-us/windows/wsl/install).
 We recommend using Ubuntu 20.04 as the Linux distribution.
 
-For older versions of Windows, install a Linux VM or refer to either [Cygwin](docs/BUILDING_CYGWIN.md) or [Docker](docs/BUILDING_DOCKER.md) instructions.
+For older versions of Windows, install a Linux VM or refer to [Docker](docs/BUILDING_DOCKER.md) instructions.
 
 
 ### Linux (Native or under WSL / VM)

Jenkinsfile

@@ -24,21 +24,21 @@ pipeline {
                 sh 'python3 tools/check_format.py --verbose --compare-to origin/main'
             }
         }
-        stage('Setup') {
+        stage('Setup gc-eu-mq-dbg') {
             steps {
-                sh 'cp /usr/local/etc/roms/baserom_oot.z64 baseroms/gc-eu-mq-dbg/baserom.z64'
+                sh 'cp /usr/local/etc/roms/oot-gc-eu-mq-dbg.z64 baseroms/gc-eu-mq-dbg/baserom.z64'
                 sh 'make -j setup'
             }
         }
-        stage('Build (qemu-irix)') {
+        stage('Build gc-eu-mq-dbg (qemu-irix)') {
             when {
                 branch 'main'
             }
             steps {
                 sh 'make -j ORIG_COMPILER=1'
             }
         }
-        stage('Build') {
+        stage('Build gc-eu-mq-dbg') {
             when {
                 not {
                     branch 'main'
@@ -48,6 +48,30 @@ pipeline {
                 sh 'make -j RUN_CC_CHECK=0'
             }
         }
+        stage('Setup gc-eu-mq') {
+            steps {
+                sh 'cp /usr/local/etc/roms/oot-gc-eu-mq.z64 baseroms/gc-eu-mq/baserom.z64'
+                sh 'make -j setup VERSION=gc-eu-mq'
+            }
+        }
+        stage('Build gc-eu-mq (qemu-irix)') {
+            when {
+                branch 'main'
+            }
+            steps {
+                sh 'make -j VERSION=gc-eu-mq ORIG_COMPILER=1'
+            }
+        }
+        stage('Build gc-eu-mq') {
+            when {
+                not {
+                    branch 'main'
+                }
+            }
+            steps {
+                sh 'make -j VERSION=gc-eu-mq RUN_CC_CHECK=0'
+            }
+        }
         stage('Report Progress') {
             when {
                 branch 'main'