Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

N64 PAL 1.0 support #3182

Merged
merged 11 commits into from
Oct 4, 2023
Merged

N64 PAL 1.0 support #3182

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
395a053
initial n64 pal 1.0 support - hashes and rominfo
Archez Sep 11, 2023
6ab2f44
initial xml copy pal 1.0
Archez Sep 11, 2023
df886dd
initial offset fixes
Archez Sep 11, 2023
81db372
update title copyright to be platform based
Archez Sep 11, 2023
5119203
bump lus for clearMtx
Archez Sep 11, 2023
e6a7e9b
add scripted xml definitions
Archez Sep 11, 2023
2c81688
offset fixes and xml fixups
Archez Sep 12, 2023
1f782c4
Merge remote-tracking branch 'origin/develop' into n64-pal-10-support
Archez Sep 15, 2023
7c298a7
Merge remote-tracking branch 'origin/develop' into n64-pal-10-support
Archez Sep 19, 2023
53af926
rename and sort pal mq definition
Archez Sep 19, 2023
f0d8ce7
more offset fixes
Archez Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions OTRExporter/rom_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def __init__(self, file_table_path, file_table_off, xml_ver):
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_10] = RomVersion("CFG/filelists/pal_oot.txt", 0x7950, "N64_PAL_10")
ROM_INFO_TABLE[Checksums.OOT_PAL_11] = RomVersion("CFG/filelists/pal_oot.txt", 0x7950, "N64_PAL_11")

class RomDmaEntry:
Expand Down
4 changes: 4 additions & 0 deletions docs/supportedHashes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[
{
"name": "PAL 1.0",
"sha1": "328a1f1beba30ce5e178f031662019eb32c5f3b5"
},
{
"name": "PAL 1.1",
"sha1": "cfbb98d392e4a9d39da8285d10cbef3974c2f012"
Expand Down
14 changes: 14 additions & 0 deletions scripts/linux/appimage/soh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
d6342c59007e57c1194661ec6880b2f078403f4e) # n64
ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4
;;
d0bdc2eb320668b4ba6893b9aefe4040a73123ff) # v64
ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5
;;
4946ab250f6ac9b32d76b21f309ebb8ebc8103d2) # n64
ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5
;;
663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64
ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012
;;
Expand Down Expand Up @@ -99,6 +105,14 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
continue
fi
;;
328a1f1beba30ce5e178f031662019eb32c5f3b5)
if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
ROM=N64_PAL_10
OTRNAME="oot.otr"
else
continue
fi
;;
cfbb98d392e4a9d39da8285d10cbef3974c2f012)
if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
ROM=N64_PAL_11
Expand Down
8 changes: 8 additions & 0 deletions soh/assets/extractor/Config_N64_PAL_10.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/N64_PAL_10/"/>
<TexturePool File="TexturePool.xml"/>
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
</Root>
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_D/objects/object_md.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Mido DisplayList Textures -->
<Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0" TlutOffset="0x02E0"/>
<Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
<Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="32" Height="4" Offset="0xDA0" TlutOffset="0x02E0"/>
<Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0" TlutOffset="0x02E0"/>
<Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20" TlutOffset="0x02E0"/>
<Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
<Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18E00" Static="Off"/>
<Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19A00" Static="Off"/>

<Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="ci8" Width="32" Height="64" Offset="0xFD38" Static="Off"/>
<Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFD38" Static="Off"/>

<DList Name="gGanondorfLightStreak1DL" Offset="0x1FCF0" Static="Off"/>
<DList Name="gGanondorfLightStreak2DL" Offset="0x1FD28" Static="Off"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<File Name="ddan_boss_room_1" Segment="3">
<Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
<Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
<Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="64" Height="32" Offset="0x21D8"/>
<Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/>
<Room Name="ddan_boss_room_1" Offset="0x0"/>
</File>
</Root>
6 changes: 3 additions & 3 deletions soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
<Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
<Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
<Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="i4" Width="48" Height="16" Offset="0xF00"/>
<Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
<Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
<Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
<Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
Expand Down Expand Up @@ -39,7 +39,7 @@
<Texture Name="gDiveDoActionGERTex" OutName="dive_ger" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
<Texture Name="gFasterDoActionGERTex" OutName="faster_ger" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
<Texture Name="gThrowDoActionGERTex" OutName="throw_ger" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
<Texture Name="gUnusedNaviDoActionGERTex" OutName="navi_unused_ger" Format="i4" Width="48" Height="16" Offset="0x3A80"/>
<Texture Name="gUnusedNaviDoActionGERTex" OutName="navi_unused_ger" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
<Texture Name="gClimbDoActionGERTex" OutName="climb_ger" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
<Texture Name="gDropDoActionGERTex" OutName="drop_ger" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
<Texture Name="gDownDoActionGERTex" OutName="down_ger" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
Expand Down Expand Up @@ -68,7 +68,7 @@
<Texture Name="gDiveDoActionFRATex" OutName="dive_fra" Format="ia4" Width="48" Height="16" Offset="0x6180"/>
<Texture Name="gFasterDoActionFRATex" OutName="faster_fra" Format="ia4" Width="48" Height="16" Offset="0x6300"/>
<Texture Name="gThrowDoActionFRATex" OutName="throw_fra" Format="ia4" Width="48" Height="16" Offset="0x6480"/>
<Texture Name="gUnusedNaviDoActionFRATex" OutName="navi_unused_fra" Format="i4" Width="48" Height="16" Offset="0x6600"/>
<Texture Name="gUnusedNaviDoActionFRATex" OutName="navi_unused_fra" Format="ia4" Width="48" Height="16" Offset="0x6600"/>
<Texture Name="gClimbDoActionFRATex" OutName="climb_fra" Format="ia4" Width="48" Height="16" Offset="0x6780"/>
<Texture Name="gDropDoActionFRATex" OutName="drop_fra" Format="ia4" Width="48" Height="16" Offset="0x6900"/>
<Texture Name="gDownDoActionFRATex" OutName="down_fra" Format="ia4" Width="48" Height="16" Offset="0x6A80"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Mido DisplayList Textures -->
<Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
<Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
<Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="32" Height="4" Offset="0xDA0"/>
<Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
<Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
<Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
<Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18B10" Static="Off"/>
<Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19710" Static="Off"/>

<Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="ci8" Width="32" Height="64" Offset="0xFA48" Static="Off"/>
<Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA48" Static="Off"/>

<DList Name="gGanondorfLightStreak1DL" Offset="0x1FA00" Static="Off"/>
<DList Name="gGanondorfLightStreak2DL" Offset="0x1FA38" Static="Off"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<File Name="ddan_boss_room_1" Segment="3">
<Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
<Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
<Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="64" Height="32" Offset="0x21D8"/>
<Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/>
<Room Name="ddan_boss_room_1" Offset="0x0"/>
</File>
</Root>
6 changes: 3 additions & 3 deletions soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
<Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
<Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
<Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="i4" Width="48" Height="16" Offset="0xF00"/>
<Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
<Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
<Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
<Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
Expand Down Expand Up @@ -39,7 +39,7 @@
<Texture Name="gDiveDoActionGERTex" OutName="dive_ger" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
<Texture Name="gFasterDoActionGERTex" OutName="faster_ger" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
<Texture Name="gThrowDoActionGERTex" OutName="throw_ger" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
<Texture Name="gUnusedNaviDoActionGERTex" OutName="navi_unused_ger" Format="i4" Width="48" Height="16" Offset="0x3A80"/>
<Texture Name="gUnusedNaviDoActionGERTex" OutName="navi_unused_ger" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
<Texture Name="gClimbDoActionGERTex" OutName="climb_ger" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
<Texture Name="gDropDoActionGERTex" OutName="drop_ger" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
<Texture Name="gDownDoActionGERTex" OutName="down_ger" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
Expand Down Expand Up @@ -68,7 +68,7 @@
<Texture Name="gDiveDoActionFRATex" OutName="dive_fra" Format="ia4" Width="48" Height="16" Offset="0x6180"/>
<Texture Name="gFasterDoActionFRATex" OutName="faster_fra" Format="ia4" Width="48" Height="16" Offset="0x6300"/>
<Texture Name="gThrowDoActionFRATex" OutName="throw_fra" Format="ia4" Width="48" Height="16" Offset="0x6480"/>
<Texture Name="gUnusedNaviDoActionFRATex" OutName="navi_unused_fra" Format="i4" Width="48" Height="16" Offset="0x6600"/>
<Texture Name="gUnusedNaviDoActionFRATex" OutName="navi_unused_fra" Format="ia4" Width="48" Height="16" Offset="0x6600"/>
<Texture Name="gClimbDoActionFRATex" OutName="climb_fra" Format="ia4" Width="48" Height="16" Offset="0x6780"/>
<Texture Name="gDropDoActionFRATex" OutName="drop_fra" Format="ia4" Width="48" Height="16" Offset="0x6900"/>
<Texture Name="gDownDoActionFRATex" OutName="down_fra" Format="ia4" Width="48" Height="16" Offset="0x6A80"/>
Expand Down
Loading