Merge branch 'unlink-faron-woods-and-ffw-bird-statues' of https://git…

…hub.com/CovenEsme/sshd-rando into unlink-faron-woods-and-ffw-bird-statues
mint-choc-chip-skyblade · Jul 24, 2024 · 8a32363 · 8a32363
2 parents 6f9146f + 737d8ab
commit 8a32363
Show file tree

Hide file tree

Showing 19 changed files with 556 additions and 418 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -119,13 +119,13 @@ jobs:
       # Archive and upload artifacts
       - name: Tar Files if not Windows Build
         if: runner.os != 'Windows'
-        run: tar -C "dist/release_archive_${{ steps.read_toml.outputs.value }}_${{ matrix.artifact }}/" -cvf "Skyward Sword HD Randomizer v${{ steps.read_toml.outputs.value }} (${{ matrix.artifact }}${{ matrix.artifact_suffix }}).tar" .
+        run: tar -C "dist/release_archive_${{ steps.read_toml.outputs.value }}_${{ matrix.artifact }}/" -cvf "Skyward_Sword_HD_Randomizer_v${{ steps.read_toml.outputs.value }}_${{ matrix.artifact }}${{ matrix.artifact_suffix }}.tar" .
       - name: Upload non-Windows Artifact
         if: runner.os != 'Windows'
         uses: actions/upload-artifact@v4
         with:
           name: Skyward Sword HD Randomizer v${{ steps.read_toml.outputs.value }} (${{ matrix.artifact }}${{ matrix.artifact_suffix }})
-          path: Skyward Sword HD Randomizer v${{ steps.read_toml.outputs.value }} (${{ matrix.artifact }}${{ matrix.artifact_suffix }}).tar
+          path: Skyward_Sword_HD_Randomizer_v${{ steps.read_toml.outputs.value }}_${{ matrix.artifact }}${{ matrix.artifact_suffix }}.tar
       - name: Upload Windows Artifact
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -29,14 +29,27 @@ jobs:
         with:
           run-id: ${{ github.run_id }}
           github-token: ${{ github.token }}
-          merge-multiple: true
+
+      - name: Read Version
+        uses: SebRollen/[email protected]
+        id: read_toml
+        with:
+          file: "constants/randoconstants.py"
+          field: "VERSION"
+
+      - name: Zip windows build
+        run: |
+          cd "Skyward Sword HD Randomizer v${{ steps.read_toml.outputs.value }} (windows)"
+          zip "Skyward_Sword_HD_Randomizer_v${{ steps.read_toml.outputs.value }}_windows.zip" ./* -r
+          rm *.exe
+          cd ..
       
       # filter the artifacts by name, ignoring the version
       - name: Filter artifacts
         id: filter_artifacts
         run: |
           echo 'builds<<EOF' >> $GITHUB_OUTPUT
-          echo "$(find . -name "Skyward Sword HD Randomizer*")" >> $GITHUB_OUTPUT
+          echo "$(find . -name "Skyward_Sword_HD_Randomizer*")" >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
   
       # create a release

diff --git a/asm/additions/diffs/additions-landingpad-diff.yaml b/asm/additions/diffs/additions-landingpad-diff.yaml
@@ -1,39 +1,39 @@
 0x712E0A5500: [0x1F, 0x01, 0x00, 0x71, 0x60, 0xC4, 0x03, 0x54, 0x1F, 0x05, 0x00, 0x71,
   0xA0, 0x7F, 0x00, 0x54, 0x1F, 0x09, 0x00, 0x71, 0xE0, 0x76, 0x01, 0x54, 0x1F, 0x0D,
   0x00, 0x71, 0xA0, 0x4B, 0x01, 0x54, 0x1F, 0x11, 0x00, 0x71, 0x00, 0xEF, 0x03, 0x54,
-  0x1F, 0x15, 0x00, 0x71, 0xA0, 0x85, 0x05, 0x54, 0x1F, 0x19, 0x00, 0x71, 0x40, 0x0E,
-  0x05, 0x54, 0x1F, 0x1D, 0x00, 0x71, 0x80, 0x41, 0x05, 0x54, 0x1F, 0x21, 0x00, 0x71,
+  0x1F, 0x15, 0x00, 0x71, 0x80, 0x85, 0x05, 0x54, 0x1F, 0x19, 0x00, 0x71, 0x40, 0x0E,
+  0x05, 0x54, 0x1F, 0x1D, 0x00, 0x71, 0x60, 0x41, 0x05, 0x54, 0x1F, 0x21, 0x00, 0x71,
   0xE0, 0x5F, 0x01, 0x54, 0x1F, 0x25, 0x00, 0x71, 0x80, 0x54, 0x01, 0x54, 0x1F, 0x29,
-  0x00, 0x71, 0xC0, 0x4E, 0x01, 0x54, 0x1F, 0x2D, 0x00, 0x71, 0x60, 0x52, 0x05, 0x54,
+  0x00, 0x71, 0xC0, 0x4E, 0x01, 0x54, 0x1F, 0x2D, 0x00, 0x71, 0x40, 0x52, 0x05, 0x54,
   0x1F, 0x31, 0x00, 0x71, 0xA0, 0x51, 0x04, 0x54, 0x1F, 0x35, 0x00, 0x71, 0xC0, 0xB7,
   0x03, 0x54, 0x1F, 0x39, 0x00, 0x71, 0x80, 0xF2, 0x04, 0x54, 0x1F, 0x3D, 0x00, 0x71,
-  0xC0, 0x05, 0x05, 0x54, 0x1F, 0x41, 0x00, 0x71, 0x80, 0x7B, 0x05, 0x54, 0x1F, 0x45,
-  0x00, 0x71, 0xE0, 0x23, 0x04, 0x54, 0x1F, 0x49, 0x00, 0x71, 0x20, 0x8A, 0x05, 0x54,
-  0x1F, 0x4D, 0x00, 0x71, 0xE0, 0x8A, 0x05, 0x54, 0x1F, 0x51, 0x00, 0x71, 0x80, 0x72,
-  0x05, 0x54, 0x1F, 0x55, 0x00, 0x71, 0x60, 0x41, 0x05, 0x54, 0x1F, 0x59, 0x00, 0x71,
-  0x40, 0x90, 0x05, 0x54, 0x1F, 0x5D, 0x00, 0x71, 0xA0, 0xCE, 0x03, 0x54, 0x1F, 0x61,
+  0xC0, 0x05, 0x05, 0x54, 0x1F, 0x41, 0x00, 0x71, 0x60, 0x7B, 0x05, 0x54, 0x1F, 0x45,
+  0x00, 0x71, 0xE0, 0x23, 0x04, 0x54, 0x1F, 0x49, 0x00, 0x71, 0x00, 0x8A, 0x05, 0x54,
+  0x1F, 0x4D, 0x00, 0x71, 0xC0, 0x8A, 0x05, 0x54, 0x1F, 0x51, 0x00, 0x71, 0x60, 0x72,
+  0x05, 0x54, 0x1F, 0x55, 0x00, 0x71, 0x40, 0x41, 0x05, 0x54, 0x1F, 0x59, 0x00, 0x71,
+  0x20, 0x90, 0x05, 0x54, 0x1F, 0x5D, 0x00, 0x71, 0xA0, 0xCE, 0x03, 0x54, 0x1F, 0x61,
   0x00, 0x71, 0x00, 0x14, 0x02, 0x54, 0x1F, 0x65, 0x00, 0x71, 0xA0, 0x17, 0x02, 0x54,
   0x1F, 0x69, 0x00, 0x71, 0xC0, 0x14, 0x02, 0x54, 0x1F, 0x6D, 0x00, 0x71, 0x40, 0x08,
   0x02, 0x54, 0x1F, 0x71, 0x00, 0x71, 0x20, 0xC1, 0x01, 0x54, 0x1F, 0x75, 0x00, 0x71,
   0x80, 0x29, 0x04, 0x54, 0x1F, 0x79, 0x00, 0x71, 0x00, 0xE8, 0x00, 0x54, 0x1F, 0x7D,
-  0x00, 0x71, 0x20, 0x98, 0x05, 0x54, 0x1F, 0x81, 0x00, 0x71, 0xC0, 0x58, 0x04, 0x54,
-  0x1F, 0x85, 0x00, 0x71, 0x60, 0x7B, 0x05, 0x54, 0x1F, 0x89, 0x00, 0x71, 0x60, 0x9A,
+  0x00, 0x71, 0x00, 0x98, 0x05, 0x54, 0x1F, 0x81, 0x00, 0x71, 0xC0, 0x58, 0x04, 0x54,
+  0x1F, 0x85, 0x00, 0x71, 0x40, 0x7B, 0x05, 0x54, 0x1F, 0x89, 0x00, 0x71, 0x60, 0x9A,
   0x03, 0x54, 0x1F, 0x8D, 0x00, 0x71, 0x80, 0x9E, 0x03, 0x54, 0x1F, 0x91, 0x00, 0x71,
   0x40, 0xAF, 0x03, 0x54, 0x1F, 0x95, 0x00, 0x71, 0xA0, 0xF1, 0x00, 0x54, 0x1F, 0x99,
   0x00, 0x71, 0x20, 0xF3, 0x00, 0x54, 0x1F, 0x9D, 0x00, 0x71, 0x80, 0xB3, 0x01, 0x54,
-  0x1F, 0xA1, 0x00, 0x71, 0x00, 0x97, 0x05, 0x54, 0x1F, 0xA5, 0x00, 0x71, 0xE0, 0x5C,
+  0x1F, 0xA1, 0x00, 0x71, 0xE0, 0x96, 0x05, 0x54, 0x1F, 0xA5, 0x00, 0x71, 0xE0, 0x5C,
   0x01, 0x54, 0x1F, 0xA9, 0x00, 0x71, 0x80, 0xB9, 0x01, 0x54, 0x1F, 0xAD, 0x00, 0x71,
   0xA0, 0x2C, 0x04, 0x54, 0x1F, 0xB1, 0x00, 0x71, 0x80, 0x48, 0x04, 0x54, 0x1F, 0xB5,
   0x00, 0x71, 0x60, 0x84, 0x04, 0x54, 0x1F, 0xB9, 0x00, 0x71, 0x00, 0xC3, 0x04, 0x54,
   0x1F, 0xBD, 0x00, 0x71, 0xC0, 0xCB, 0x04, 0x54, 0x1F, 0xC1, 0x00, 0x71, 0xC0, 0xD3,
-  0x04, 0x54, 0x1F, 0xC5, 0x00, 0x71, 0x40, 0xD5, 0x05, 0x54, 0x1F, 0xC9, 0x00, 0x71,
-  0x00, 0xE7, 0x05, 0x54, 0x1F, 0xCD, 0x00, 0x71, 0x40, 0x13, 0x02, 0x54, 0x1F, 0xD1,
+  0x04, 0x54, 0x1F, 0xC5, 0x00, 0x71, 0x20, 0xD5, 0x05, 0x54, 0x1F, 0xC9, 0x00, 0x71,
+  0xE0, 0xE6, 0x05, 0x54, 0x1F, 0xCD, 0x00, 0x71, 0x40, 0x13, 0x02, 0x54, 0x1F, 0xD1,
   0x00, 0x71, 0x00, 0x14, 0x02, 0x54, 0x1F, 0xD5, 0x00, 0x71, 0x00, 0x15, 0x02, 0x54,
   0x1F, 0xD9, 0x00, 0x71, 0xC0, 0xF1, 0x00, 0x54, 0x1F, 0xDD, 0x00, 0x71, 0xC0, 0x49,
-  0x04, 0x54, 0x1F, 0xE1, 0x00, 0x71, 0xA0, 0x50, 0x05, 0x54, 0x1F, 0xE5, 0x00, 0x71,
-  0x00, 0x58, 0x05, 0x54, 0x1F, 0xE9, 0x00, 0x71, 0xE0, 0x49, 0x05, 0x54, 0x1F, 0xED,
-  0x00, 0x71, 0x40, 0x4B, 0x04, 0x54, 0x1F, 0xF1, 0x00, 0x71, 0x40, 0xC0, 0x05, 0x54,
+  0x04, 0x54, 0x1F, 0xE1, 0x00, 0x71, 0x80, 0x50, 0x05, 0x54, 0x1F, 0xE5, 0x00, 0x71,
+  0xE0, 0x57, 0x05, 0x54, 0x1F, 0xE9, 0x00, 0x71, 0xC0, 0x49, 0x05, 0x54, 0x1F, 0xED,
+  0x00, 0x71, 0x40, 0x4B, 0x04, 0x54, 0x1F, 0xF1, 0x00, 0x71, 0x20, 0xC0, 0x05, 0x54,
   0x1F, 0xF5, 0x00, 0x71, 0x20, 0xE0, 0x04, 0x54, 0x1F, 0xF9, 0x00, 0x71, 0xC0, 0xE2,
-  0x04, 0x54, 0x1F, 0xFD, 0x00, 0x71, 0xA0, 0xC6, 0x05, 0x54, 0x1F, 0x01, 0x01, 0x71,
-  0x80, 0xCD, 0x05, 0x54, 0x1F, 0x05, 0x01, 0x71, 0x20, 0xA5, 0x01, 0x54, 0xC0, 0x03,
+  0x04, 0x54, 0x1F, 0xFD, 0x00, 0x71, 0x80, 0xC6, 0x05, 0x54, 0x1F, 0x01, 0x01, 0x71,
+  0x60, 0xCD, 0x05, 0x54, 0x1F, 0x05, 0x01, 0x71, 0x20, 0xA5, 0x01, 0x54, 0xC0, 0x03,
   0x5F, 0xD6]