GC PAL MQ Retail support (HarbourMasters#3167)

* initial pal mq retail support * more mq pal support * pal mq support in the launch scripts * more offset fixes * match tluts with mq debug * update support hashes doc * target lus commit for playtesting * more offset fixes * add hashes for other formats * decomp name sync * add scripted texture definitions * fix up from other xml changes * update name
garrettjoecox · Sep 19, 2023 · bb64366 · bb64366
1 parent df6c017
commit bb64366
Show file tree

Hide file tree

Showing 558 changed files with 25,170 additions and 20 deletions.
diff --git a/OTRExporter/rom_info.py b/OTRExporter/rom_info.py
@@ -35,6 +35,7 @@ def __init__(self, file_table_path, file_table_off, xml_ver):
 
 ROM_INFO_TABLE = dict()
 ROM_INFO_TABLE[Checksums.OOT_PAL_GC] = RomVersion("CFG/filelists/gamecube_pal.txt", 0x7170, "GC_NMQ_PAL_F")
+ROM_INFO_TABLE[Checksums.OOT_PAL_MQ] = RomVersion("CFG/filelists/gamecube_pal.txt", 0x7170, "GC_MQ_PAL_F")
 ROM_INFO_TABLE[Checksums.OOT_PAL_GC_DBG1] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_NMQ_D")
 ROM_INFO_TABLE[Checksums.OOT_PAL_GC_MQ_DBG] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_MQ_D")
 ROM_INFO_TABLE[Checksums.OOT_PAL_11] = RomVersion("CFG/filelists/pal_oot.txt", 0x7950, "N64_PAL_11")

diff --git a/docs/supportedHashes.json b/docs/supportedHashes.json
@@ -7,6 +7,10 @@
         "name": "PAL GC",
         "sha1": "0227d7c0074f2d0ac935631990da8ec5914597b4"
     },
+    {
+        "name": "PAL MQ",
+        "sha1": "f46239439f59a2a594ef83cf68ef65043b1bffe2"
+    },
     {
         "name": "PAL GC (Debug)",
         "sha1": "cee6bc3c2a634b41728f2af8da54d9bf8cc14099"

diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh
@@ -31,7 +31,7 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
                 cd "$ASSETDIR"
                 ROMHASH=$(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }')
 
-                # Remap v64 and n64 hashes to their z64 has equivalent
+                # Remap v64 and n64 hashes to their z64 hash equivalent
                 # ZAPD will handle converting the data into z64 format
                 case "$ROMHASH" in
                 a9059b56e761c9034fbe02fe4c24985aaa835dac) # v64
@@ -52,6 +52,12 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
                 24c73d378b0620a380ce5ef9f2b186c6c157a68b) # n64
                     ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012
                     ;;
+                8ebf2e29313f44f2d49e5b4191971d09919e8e48) # v64
+                    ROMHASH=f46239439f59a2a594ef83cf68ef65043b1bffe2
+                    ;;
+                4264bf7b875737b8fae77d52322a5099d051fc11) # n64
+                    ROMHASH=f46239439f59a2a594ef83cf68ef65043b1bffe2
+                    ;;
                 973bc6fe56010a8d646166a1182a81b4f13b8cf9) # v64
                     ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03
                     ;;
@@ -101,6 +107,14 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
                         continue
                     fi
                     ;;
+                f46239439f59a2a594ef83cf68ef65043b1bffe2)
+                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
+                        ROM=GC_MQ_PAL_F
+                        OTRNAME="oot-mq.otr"
+                    else
+                        continue
+                    fi
+                    ;;
                 50bebedad9e0f10746a52b07239e47fa6c284d03)
                     if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
                         ROM=GC_MQ_D

diff --git a/soh/assets/extractor/Config_GC_MQ_PAL_F.xml b/soh/assets/extractor/Config_GC_MQ_PAL_F.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/extractor/xmls/GC_MQ_PAL_F/"/>
+    <TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>