Merge remote-tracking branch 'upstream/main' into decomp_merge

.gitattributes

@@ -1,5 +1,18 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Apply LF only to known text/code file types
+*.c      text eol=lf
+*.h      text eol=lf
+*.cpp    text eol=lf
+*.hpp    text eol=lf
+*.sh     text eol=lf
+*.py     text eol=lf
+*.js     text eol=lf
+*.json   text eol=lf
+*.md     text eol=lf
+*.txt    text eol=lf
+*.make   text eol=lf
+*.mk     text eol=lf
+Makefile text eol=lf
+
 # Set browser syntax highlighting for certain files
 *.inc linguist-language=gas
 *.seq linguist-language=gas

.github/workflows/build.yml

@@ -13,12 +13,16 @@ jobs:
         include:
           - name: "Debug, No F3DEX3"
             args: DEBUG_FEATURES=1 CPP_DEFINES=-DENABLE_F3DEX3=0
+            version: gc-eu-mq-dbg
           - name: "Debug, F3DEX3"
             args: DEBUG_FEATURES=1 CPP_DEFINES=-DENABLE_F3DEX3=1
+            version: ntsc-1.2
           - name: "Release, No F3DEX3"
             args: DEBUG_FEATURES=0 CPP_DEFINES=-DENABLE_F3DEX3=0
+            version: ntsc-1.2
           - name: "Release, F3DEX3"
             args: DEBUG_FEATURES=0 CPP_DEFINES=-DENABLE_F3DEX3=1
+            version: gc-eu-mq-dbg
     defaults:
       run:
         shell: bash
@@ -49,8 +53,8 @@ jobs:
 
     # Setup the project
     - name: Setup
-      run: make setup -j$(nproc)
+      run: make setup -j$(nproc) VERSION=${{ matrix.version }}
 
     # Build the project
     - name: Build
-      run: ${{ matrix.args }} make -j$(nproc)
+      run: ${{ matrix.args }} make -j$(nproc) VERSION=${{ matrix.version }}

.make_hackeroot.mk

@@ -190,7 +190,7 @@ patch:
 # Create F3DEX3 bps patches
 # Steps:
 #		- run Flips and create the patches
-create_f3dex3_patches: F3DEX3/f3dzex2.code F3DEX3/f3dzex2.data
+create_f3dex3_patches: $(F3DEX3_DIR)/f3dzex2.code $(F3DEX3_DIR)/f3dzex2.data
 	$(call print_no_args,Creating F3DEX3 patches...)
 	$(V)$(FLIPS) --create --bps $(F3DEX3_DIR)/f3dzex2.code $(F3DEX3_DIR)/F3DEX3_BrW.code $(F3DEX3_DIR)/F3DEX3_BrW.code.bps
 	$(V)$(FLIPS) --create --bps $(F3DEX3_DIR)/f3dzex2.data $(F3DEX3_DIR)/F3DEX3_BrW.data $(F3DEX3_DIR)/F3DEX3_BrW.data.bps