Skip to content

Commit ecfea3c

Browse files
inspectredcinspectredc
committed
ntsc 12 extraction
1 parent 9072289 commit ecfea3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+299
-297
lines changed

‎OTRExporter

‎ZAPDTR

‎soh/assets/extractor/Config_N64_NTSC_12.xml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Root>
2+
<SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
3+
<ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
4+
<ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
5+
<ExternalXMLFolder Path="assets/extractor/xmls/N64_NTSC_12/"/>
6+
<TexturePool File="TexturePool.xml"/>
7+
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
8+
</Root>

‎soh/assets/xml/N64_NTSC_12/audio/Audio.xml

+43-55
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Root>
22
<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12CBB0">
3-
<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x102860" SequenceTableOffset="0x102C90" SampleBankTableOffset="0x103380" SequenceFontTableOffset="0x102AD0">
3+
<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x102710" SequenceTableOffset="0x102B40" SampleBankTableOffset="0x103230" SequenceFontTableOffset="0x102980">
44
<Sequences>
55
<Sequence Name="000_Sound_Effects"/>
66
<Sequence Name="001_Ambient_Effects"/>
@@ -1304,137 +1304,125 @@
13041304
<Sample Name="Clap" SampleRate="24000">
13051305
<Offset Version="MQDebug" At="0x35C900"/>
13061306
</Sample>
1307-
<!-- ntsc start -->
1308-
<!-- todo: document sample names -->
1309-
<Sample Name="Sample_590">
1310-
<Offset Version="MQDebug" At="0x35D100"/>
1311-
</Sample>
1312-
<Sample Name="Sample_591">
1313-
<Offset Version="MQDebug" At="0x365DB0"/>
1314-
</Sample>
1315-
<Sample Name="Islamic Chant">
1316-
<Offset Version="MQDebug" At="0x36C840"/>
1317-
</Sample>
1318-
<!-- ntsc end -->
13191307
<Sample Name="Resonant Bass Marimba" SampleRate="18541">
1320-
<Offset Version="MQDebug" At="0x37A4B0"/>
1308+
<Offset Version="MQDebug" At="0x35D100"/>
13211309
</Sample>
13221310
<Sample Name="Haunting Wind">
1323-
<Offset Version="MQDebug" At="0x381930"/>
1311+
<Offset Version="MQDebug" At="0x364580"/>
13241312
</Sample>
13251313
<Sample Name="Off Hi-Hat" SampleRate="26000">
1326-
<Offset Version="MQDebug" At="0x38D230"/>
1314+
<Offset Version="MQDebug" At="0x36FE80"/>
13271315
</Sample>
13281316
<Sample Name="Drum and Sitar" SampleRate="20000">
1329-
<Offset Version="MQDebug" At="0x391FD0"/>
1317+
<Offset Version="MQDebug" At="0x374C20"/>
13301318
</Sample>
13311319
<Sample Name="Percussive Resonance" SampleRate="23973">
1332-
<Offset Version="MQDebug" At="0x395710"/>
1320+
<Offset Version="MQDebug" At="0x378360"/>
13331321
</Sample>
13341322
<Sample Name="Clarinet">
1335-
<Offset Version="MQDebug" At="0x397A60"/>
1323+
<Offset Version="MQDebug" At="0x37A6B0"/>
13361324
</Sample>
13371325
<Sample Name="Harpsichord (High)" SampleRate="42714">
1338-
<Offset Version="MQDebug" At="0x398650"/>
1326+
<Offset Version="MQDebug" At="0x37B2A0"/>
13391327
</Sample>
13401328
<Sample Name="Marimba 1" SampleRate="28508">
1341-
<Offset Version="MQDebug" At="0x39FBE0"/>
1329+
<Offset Version="MQDebug" At="0x382830"/>
13421330
</Sample>
13431331
<Sample Name="Marimba 2" SampleRate="14254">
1344-
<Offset Version="MQDebug" At="0x3A2280"/>
1332+
<Offset Version="MQDebug" At="0x384ED0"/>
13451333
</Sample>
13461334
<Sample Name="Crystal Synth" SampleRate="26939">
1347-
<Offset Version="MQDebug" At="0x3A4410"/>
1335+
<Offset Version="MQDebug" At="0x387060"/>
13481336
</Sample>
13491337
<Sample Name="Sitar" SampleRate="57017">
1350-
<Offset Version="MQDebug" At="0x3AC3B0"/>
1338+
<Offset Version="MQDebug" At="0x38F000"/>
13511339
</Sample>
13521340
<Sample Name="Koto" SampleRate="28508">
1353-
<Offset Version="MQDebug" At="0x3AFA80"/>
1341+
<Offset Version="MQDebug" At="0x3926D0"/>
13541342
</Sample>
13551343
<Sample Name="Some Manner of Drum" SampleRate="32000">
1356-
<Offset Version="MQDebug" At="0x3B4330"/>
1344+
<Offset Version="MQDebug" At="0x396F80"/>
13571345
</Sample>
13581346
<Sample Name="Another Type of Drum" SampleRate="32000">
1359-
<Offset Version="MQDebug" At="0x3B5350"/>
1347+
<Offset Version="MQDebug" At="0x397FA0"/>
13601348
</Sample>
13611349
<Sample Name="Quick Drum" SampleRate="32000">
1362-
<Offset Version="MQDebug" At="0x3B6B40"/>
1350+
<Offset Version="MQDebug" At="0x399790"/>
13631351
</Sample>
13641352
<Sample Name="Gong" SampleRate="32000">
1365-
<Offset Version="MQDebug" At="0x3B7A60"/>
1353+
<Offset Version="MQDebug" At="0x39A6B0"/>
13661354
</Sample>
13671355
<Sample Name="Windchimes">
1368-
<Offset Version="MQDebug" At="0x3C1F90"/>
1356+
<Offset Version="MQDebug" At="0x3A4BE0"/>
13691357
</Sample>
13701358
<Sample Name="Goron Drum">
1371-
<Offset Version="MQDebug" At="0x3C7A90"/>
1359+
<Offset Version="MQDebug" At="0x3AA6E0"/>
13721360
</Sample>
13731361
<Sample Name="Melodic Wooden Clacking" SampleRate="32000">
1374-
<Offset Version="MQDebug" At="0x3C9FD0"/>
1362+
<Offset Version="MQDebug" At="0x3ACC20"/>
13751363
</Sample>
13761364
<Sample Name="Vocal Ohs">
1377-
<Offset Version="MQDebug" At="0x3CB570"/>
1365+
<Offset Version="MQDebug" At="0x3AE1C0"/>
13781366
</Sample>
13791367
<Sample Name="Flute and Voice" SampleRate="32000">
1380-
<Offset Version="MQDebug" At="0x3D1980"/>
1368+
<Offset Version="MQDebug" At="0x3B45D0"/>
13811369
</Sample>
13821370
<Sample Name="Off-Kilter Flute" SampleRate="32000">
1383-
<Offset Version="MQDebug" At="0x3D2840"/>
1371+
<Offset Version="MQDebug" At="0x3B5490"/>
13841372
</Sample>
13851373
<Sample Name="Voice" SampleRate="32000">
1386-
<Offset Version="MQDebug" At="0x3D37A0"/>
1374+
<Offset Version="MQDebug" At="0x3B63F0"/>
13871375
</Sample>
13881376
<Sample Name="Drum 1" SampleRate="32000">
1389-
<Offset Version="MQDebug" At="0x3D45A0"/>
1377+
<Offset Version="MQDebug" At="0x3B71F0"/>
13901378
</Sample>
13911379
<Sample Name="Drum 2" SampleRate="32000">
1392-
<Offset Version="MQDebug" At="0x3D6860"/>
1380+
<Offset Version="MQDebug" At="0x3B94B0"/>
13931381
</Sample>
13941382
<Sample Name="Slap Bass" SampleRate="32000">
1395-
<Offset Version="MQDebug" At="0x3D9030"/>
1383+
<Offset Version="MQDebug" At="0x3BBC80"/>
13961384
</Sample>
13971385
<Sample Name="Shaker">
1398-
<Offset Version="MQDebug" At="0x3DBB00"/>
1386+
<Offset Version="MQDebug" At="0x3BE750"/>
13991387
</Sample>
14001388
<Sample Name="Cowbell" SampleRate="32000">
1401-
<Offset Version="MQDebug" At="0x3DCA50"/>
1389+
<Offset Version="MQDebug" At="0x3BF6A0"/>
14021390
</Sample>
14031391
<Sample Name="Guitar (Low)" SampleRate="19000">
1404-
<Offset Version="MQDebug" At="0x3DD710"/>
1392+
<Offset Version="MQDebug" At="0x3C0360"/>
14051393
</Sample>
14061394
<Sample Name="Guitar">
1407-
<Offset Version="MQDebug" At="0x3DFEF0"/>
1395+
<Offset Version="MQDebug" At="0x3C2B40"/>
14081396
</Sample>
14091397
<Sample Name="Guitar (High)" SampleRate="10690">
1410-
<Offset Version="MQDebug" At="0x3E20B0"/>
1398+
<Offset Version="MQDebug" At="0x3C4D00"/>
14111399
</Sample>
14121400
<Sample Name="Viola" SampleRate="19027">
1413-
<Offset Version="MQDebug" At="0x3E3F80"/>
1401+
<Offset Version="MQDebug" At="0x3C6BD0"/>
14141402
</Sample>
14151403
<Sample Name="Church Bell">
1416-
<Offset Version="MQDebug" At="0x3E8000"/>
1404+
<Offset Version="MQDebug" At="0x3CAC50"/>
14171405
</Sample>
14181406
<Sample Name="Goron Oh (High)">
1419-
<Offset Version="MQDebug" At="0x3ECC50"/>
1407+
<Offset Version="MQDebug" At="0x3CF8A0"/>
14201408
</Sample>
14211409
<Sample Name="Goron Oh">
1422-
<Offset Version="MQDebug" At="0x3ED4F0"/>
1410+
<Offset Version="MQDebug" At="0x3D0140"/>
14231411
</Sample>
14241412
<Sample Name="Banjo (Low)" SampleRate="57017">
1425-
<Offset Version="MQDebug" At="0x3EDFB0"/>
1413+
<Offset Version="MQDebug" At="0x3D0C00"/>
14261414
</Sample>
14271415
<Sample Name="Banjo" SampleRate="38054">
1428-
<Offset Version="MQDebug" At="0x3F0DF0"/>
1416+
<Offset Version="MQDebug" At="0x3D3A40"/>
1417+
</Sample>
1418+
<Sample Name="Islamic Chant">
1419+
<Offset Version="MQDebug" At="0x3D62E0"/>
14291420
</Sample>
1430-
<!-- ntsc start -->
1431-
<!-- Islamic Chant offset moved to earlier block in ntsc -->
1432-
<!-- ntsc end -->
14331421
<Sample Name="Steel Drum">
1434-
<Offset Version="MQDebug" At="0x3F3690"/>
1422+
<Offset Version="MQDebug" At="0x3E3F50"/>
14351423
</Sample>
14361424
<Sample Name="Steel Drum (High)" SampleRate="14254">
1437-
<Offset Version="MQDebug" At="0x3F82F0"/>
1425+
<Offset Version="MQDebug" At="0x3E8BB0"/>
14381426
</Sample>
14391427
</Samples>
14401428

‎soh/assets/xml/N64_NTSC_12/code/fbdemo_circle.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Root>
2-
<File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEC268" RangeEnd="0xED488">
3-
<Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEC268"/>
4-
<Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEC668"/>
5-
<Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xECA68"/>
6-
<Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xECE68"/>
7-
<Array Name="sTransCircleVtx" Count="34" Offset="0xED268">
2+
<File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEC0B8" RangeEnd="0xED2D8">
3+
<Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEC0B8"/>
4+
<Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEC4B8"/>
5+
<Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEC8B8"/>
6+
<Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xECCB8"/>
7+
<Array Name="sTransCircleVtx" Count="34" Offset="0xED0B8">
88
<Vtx/>
99
</Array>
1010
<!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
11-
<!--<DList Name="sCircleWipeDL" Offset="0xED488"/>-->
11+
<!--<DList Name="sCircleWipeDL" Offset="0xED2D8"/>-->
1212
</File>
1313
</Root>

‎soh/assets/xml/N64_NTSC_12/code/fbdemo_triforce.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Root>
2-
<File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEB6F0" RangeEnd="0xEB7C0">
3-
<DList Name="sTransTriforceDL" Offset="0xEB6F0"/>
4-
<Array Name="sTransTriforceVtx" Count="10" Offset="0xEB720">
2+
<File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEB540" RangeEnd="0xEB610">
3+
<DList Name="sTransTriforceDL" Offset="0xEB540"/>
4+
<Array Name="sTransTriforceVtx" Count="10" Offset="0xEB570">
55
<Vtx/>
66
</Array>
77
</File>

‎soh/assets/xml/N64_NTSC_12/code/fbdemo_wipe1.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Root>
22
<!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
3-
<File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEB7C0" RangeEnd="0xEC150" Segment="0">
4-
<Array Name="sTransWipeVtx" Count="25" Offset="0xEB7C0">
3+
<File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEB610" RangeEnd="0xEBFA0" Segment="0">
4+
<Array Name="sTransWipeVtx" Count="25" Offset="0xEB610">
55
<Vtx/>
66
</Array>
7-
<Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEB950"/>
8-
<!-- <DList Name="sWipe1DL" Offset="0xEC150"/>-->
7+
<Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEB7A0"/>
8+
<!-- <DList Name="sWipe1DL" Offset="0xEBFA0"/>-->
99
</File>
1010
</Root>

‎soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Fire.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Root>
2-
<File Name="ovl_Arrow_Fire" BaseAddress="0x80A5E9F0" RangeStart="0x960" RangeEnd="0x1DF0">
2+
<File Name="ovl_Arrow_Fire" BaseAddress="0x80A5ECC0" RangeStart="0x960" RangeEnd="0x1DF0">
33
<Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x960" Static="On"/>
44
<Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1160" Static="On"/>
55
<Array Name="sVtx" Count="43" Offset="0x1960" Static="On">

‎soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Ice.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Root>
2-
<File Name="ovl_Arrow_Ice" BaseAddress="0x80A608B0" RangeStart="0x980" RangeEnd="0x1E10">
2+
<File Name="ovl_Arrow_Ice" BaseAddress="0x80A60B80" RangeStart="0x980" RangeEnd="0x1E10">
33
<Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
44
<Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
55
<Array Name="sVtx" Count="43" Offset="0x1980" Static="On">

‎soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Light.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Root>
2-
<File Name="ovl_Arrow_Light" BaseAddress="0x80A62790" RangeStart="0x990" RangeEnd="0x1DD0">
2+
<File Name="ovl_Arrow_Light" BaseAddress="0x80A62A60" RangeStart="0x990" RangeEnd="0x1DD0">
33
<Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x990" Static="On"/>
44
<Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x1190" Static="On"/>
55
<Array Name="sVtx" Count="43" Offset="0x1990" Static="On">

‎soh/assets/xml/N64_NTSC_12/overlays/ovl_Bg_Ganon_Otyuka.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Root>
2-
<File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80A53F30" RangeStart="0x1110" RangeEnd="0x24EC">
2+
<File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80A54200" RangeStart="0x1110" RangeEnd="0x24EC">
33
<Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1110"/>
44

55
<Array Name="sPlatformTopVtx" Count="4" Offset="0x1918">

‎soh/assets/xml/N64_NTSC_12/overlays/ovl_Bg_Jya_Cobra.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Root>
2-
<File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x80A325A0" RangeStart="0x1830" RangeEnd="0x19C8">
2+
<File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x80A32870" RangeStart="0x1830" RangeEnd="0x19C8">
33
<Array Name="sShadowVtx" Count="4" Offset="0x1830">
44
<Vtx/>
55
</Array>

‎soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Dodongo.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Root>
2-
<File Name="ovl_Boss_Dodongo" BaseAddress="0x8089D8C0" RangeStart="0x61C8" RangeEnd="0x91C8">
2+
<File Name="ovl_Boss_Dodongo" BaseAddress="0x8089D9F0" RangeStart="0x61C8" RangeEnd="0x91C8">
33
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61C8"/>
44
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81C8"/>
55
</File>

0 commit comments

Comments
 (0)