Merge branch 'main' of https://github.com/SuperDude88/TWWHD-Randomizer into barren-fix

Author: gymnast86

.github/workflows/build_mac.yml

@@ -39,6 +39,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
+          fetch-tags: true
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v4

.github/workflows/build_wiiu.yml

@@ -38,6 +38,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
+          fetch-tags: true
 
       - name: Set Debug Flags
         if: inputs.build_type == 'Debug'

.github/workflows/build_windows.yml

@@ -48,6 +48,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
+          fetch-tags: true
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v4

asm/patch_diffs/make_game_nonlinear_diff.yaml

@@ -3,6 +3,8 @@ Data:
   0x2190EF4: [0x48, 0x00, 0x00, 0x18]
   0x219264C: [0x60, 0x00, 0x00, 0x00]
   0x21A4B4C: [0x41, 0x82, 0x00, 0xDC]
+  0x21B0BC0: [0x38, 0x60, 0x00, 0x03, 0x48, 0x36, 0xFE, 0xC1]
+  0x21B51CC: [0x38, 0x60, 0x00, 0x03, 0x48, 0x36, 0xB8, 0xB5]
   0x21CA1A8: [0x48, 0x00, 0x00, 0x68]
   0x21CD230: [0x48, 0x00, 0x00, 0x68]
   0x21F3F1C: [0x38, 0x60, 0x00, 0x01]
@@ -48,6 +50,8 @@ Data:
   0x237305C: [0x4B, 0xFF, 0xFF, 0x1C]
   0x2374648: [0x60, 0x00, 0x00, 0x00]
   0x23746CC: [0x60, 0x00, 0x00, 0x00]
+  0x2386BA0: [0x38, 0x60, 0x00, 0x03, 0x48, 0x19, 0x9E, 0xE1]
+  0x2387500: [0x38, 0x60, 0x00, 0x03, 0x48, 0x19, 0x95, 0x81]
   0x23A4A98: [0x60, 0x00, 0x00, 0x00]
   0x24731E8: [0x38, 0x60, 0x00, 0x01]
   0x247348C: [0x38, 0x60, 0x00, 0x01]
@@ -58,6 +62,7 @@ Data:
   0x24B22F4: [0x48, 0x44, 0x84, 0x24]
   0x24B2798: [0x48, 0x00, 0x00, 0x1C]
   0x24D4F1C: [0x60, 0x00, 0x00, 0x00]
+  0x24EA7E8: [0x38, 0x60, 0x00, 0x03, 0x48, 0x03, 0x62, 0x99]
   0x25221F0: [0x4E, 0x80, 0x00, 0x20]
   0x25224A4: [0x4E, 0x80, 0x00, 0x20]
   0x2522C60: [0x4E, 0x80, 0x00, 0x20]

asm/patches/make_game_nonlinear.asm

@@ -522,3 +522,27 @@ tag_photo_check_lenzo_flag_order:
   b 0x024B22F8
 skip_setting_pictograph_gallery_flag:
   b 0x024B2300 ; Return without setting the next flag
+
+
+
+; Change the wind in the pond area outside DRC to disappear once Gohma is defeated
+; Normally it checks for Din's Pearl
+.org 0x021B0BC0 ; in daKytag05_Create
+  li r3, 3 ; DRC stage ID
+  bl isStageBossEnemy
+; Also do the same for the quake (shake/vibration) triggers
+.org 0x02386BA0 ; in daObjQuake_c::_create
+  li r3, 3 ; DRC stage ID
+  bl isStageBossEnemy
+; Also do the same for the heat effect in the pond area
+.org 0x024EA7E8 ; in daYkgr_c::_create
+  li r3, 3 ; DRC stage ID
+  bl isStageBossEnemy
+; The cloud around DRI normally sets an event bit when it fades away (in the cutscene after warping out of DRC)
+; Change this to check for defeating Gohma too
+.org 0x02387500 ; in daObjRcloud_c::_create
+  li r3, 3 ; DRC stage ID
+  bl isStageBossEnemy
+.org 0x021B51CC ; in daLodbg_c::createModelData
+  li r3, 3 ; DRC stage ID
+  bl isStageBossEnemy

gui/desktop/generate_qrc_file.py

@@ -5,28 +5,29 @@
 import sys
 import argparse
 
+import xml.etree.cElementTree as ET
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("data_dir")
     args = parser.parse_args(sys.argv[1:])
 
     data_root = args.data_dir
     individual_files = []
-    with open('data.qrc', 'w') as qrc:
-        qrc.write('<RCC>\n')
-        qrc.write('    <qresource prefix="/">\n')
-        for root, dirs, files in os.walk(data_root):
-            for file in files:
-                f = os.path.join(root, file)
-                if os.path.isfile(f):
-                    f = f.replace('\\', '/')
-                    individual_files.append(f)
 
-        for file in individual_files:
-            embed_path = file.replace(data_root, '')
-            qrc.write('        <file alias=\"' + embed_path + '\">' + file + '</file>\n')
+    rcc = ET.Element("RCC")
+    resources = ET.SubElement(rcc, "qresource", prefix="/")
+    for root, dirs, files in os.walk(data_root):
+        for file in files:
+            f = os.path.join(root, file)
+            if os.path.isfile(f):
+                f = f.replace('\\', '/')
+                individual_files.append(f)
+
+    for file in individual_files:
+        embed_path = file.replace(data_root, '')
+        ET.SubElement(resources, "file", alias=embed_path).text = file
 
-        qrc.write('    </qresource>\n')
-        qrc.write('</RCC>')
+    ET.ElementTree(rcc).write("data.qrc")
 
 main()

gui/desktop/mainwindow.ui

@@ -69,7 +69,7 @@
            <string notr="true"/>
           </property>
           <property name="currentIndex">
-           <number>6</number>
+           <number>0</number>
           </property>
           <widget class="QWidget" name="getting_started_tab">
            <attribute name="title">
@@ -2462,13 +2462,16 @@ color: lightgray</string>
               </property>
               <property name="minimumSize">
                <size>
-                <width>364</width>
+                <width>346</width>
                 <height>346</height>
                </size>
               </property>
               <property name="cursor">
                <cursorShape>ArrowCursor</cursorShape>
               </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
               <property name="styleSheet">
                <string notr="true"/>
               </property>