link_animetion xml, and ExternalFile config (#1011)

* Automatic XML for link_animetion

* Make sure tutorial images are not gitignored

* OK

* Correct ovl_Boss_Sst RangeEnd

* ExternalFiles

* Remove Segment="128"

* Remove segments from place_title_cards

* format, newlines, remove previous xml
This commit is contained in:
EllipticEllipsis
2021-11-07 17:13:44 +00:00
committed by GitHub
parent 5ad7cf9dbb
commit fd512f02e9
18 changed files with 599 additions and 20 deletions

3
.gitignore vendored
View File

@@ -49,5 +49,8 @@ graphs/
!*_custom*
.extracted-assets.json
# Docs
!docs/tutorial/
# Per-user configuration
.python-version

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
<File Name="gameplay_keep" Segment="4">
<Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
<Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>

View File

@@ -1,4 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
<File Name="object_bdoor" Segment="6">
<Blob Name="object_bdoor_Blob_000000" Size="0x1000" Offset="0x0"/>
<DList Name="object_bdoor_DL_0010C0" Offset="0x10C0"/>

View File

@@ -1,4 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
<File Name="object_syokudai" Segment="6">
<DList Name="gGoldenTorchDL" Offset="0x3A0"/>
<DList Name="gWoodenTorchDL" Offset="0x870"/>

View File

@@ -1,4 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
<File Name="object_wood02" Segment="6">
<DList Name="object_wood02_DL_000090" Offset="0x90"/>
<DList Name="object_wood02_DL_000160" Offset="0x160"/>

View File

@@ -1,5 +1,5 @@
<Root>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x6238" RangeEnd="0x9238" Segment="128">
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x6238" RangeEnd="0x9238">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
</File>

View File

@@ -1,5 +1,5 @@
<Root>
<File Name="ovl_Boss_Ganon2" BaseAddress="0x808FCF40" RangeStart="0xA2C8" RangeEnd="0x10778" Segment="128">
<File Name="ovl_Boss_Ganon2" BaseAddress="0x808FCF40" RangeStart="0xA2C8" RangeEnd="0x10778">
<Texture Name="ovl_Boss_Ganon2_Tex_00A2C8" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x00A2C8"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00B2C8">
<Vtx/>

View File

@@ -1,5 +1,5 @@
<Root>
<File Name="ovl_Boss_Sst" BaseAddress="0x8092C5D0" RangeStart="0xA3C0" RangeEnd="0xAD40" Segment="128">
<File Name="ovl_Boss_Sst" BaseAddress="0x8092C5D0" RangeStart="0xA3C0" RangeEnd="0xAD70">
<DList Name="sBodyStaticDList" Offset="0xA3C0"/>
<DList Name="sHandTrailDList" Offset="0xA3D8"/>
<DList Name="sIntroVanishDList" Offset="0xA838"/>

View File

@@ -1,5 +1,5 @@
<Root>
<File Name="ovl_En_Clear_Tag" BaseAddress="0x809D35B0" RangeStart="0x26F0" RangeEnd="0x89F0" Segment="128">
<File Name="ovl_En_Clear_Tag" BaseAddress="0x809D35B0" RangeStart="0x26F0" RangeEnd="0x89F0">
<DList Name="gArwingDL" Offset="0x26F0"/>
<DList Name="gArwingLaserDL" Offset="0x6388"/>
<DList Name="gArwingBackfireDL" Offset="0x6688"/>

View File

@@ -1,5 +1,5 @@
<Root>
<File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A23D60" RangeStart="0x1218" RangeEnd="0x4118" Segment="128">
<File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A23D60" RangeStart="0x1218" RangeEnd="0x4118">
<Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x1218"/>
<Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x2218"/>

View File

@@ -1,5 +1,5 @@
<Root>
<File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A28000" RangeStart="0x3E0" RangeEnd="0x6F70" Segment="128">
<File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A28000" RangeStart="0x3E0" RangeEnd="0x6F70">
<Texture Name="gGanondorfRoomCarpetTex" OutName="ganondorf_room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x3E8"/>
<Texture Name="gGanondorfRoomOrganPipeTex" OutName="ganondorf_room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xBE8"/>
<Texture Name="gGanondorfRoomOrganCorbelsTex" OutName="ganondorf_room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xDE8"/>

View File

@@ -1,5 +1,5 @@
<Root>
<File Name="ovl_En_Jsjutan" BaseAddress="0x80A897A0" RangeStart="0x12F8" RangeEnd="0x4C88" Segment="128">
<File Name="ovl_En_Jsjutan" BaseAddress="0x80A897A0" RangeStart="0x12F8" RangeEnd="0x4C88">
<!-- D_80A8AA98. Carpet texture. -->
<Texture Name="gJsjutanCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12F8"/>

View File

@@ -1,5 +1,5 @@
<Root>
<File Name="ovl_Magic_Dark" BaseOffset="0x80B873D0" RangeStart="0xD10" RangeEnd="0x1740" Segment="128">
<File Name="ovl_Magic_Dark" BaseOffset="0x80B873D0" RangeStart="0xD10" RangeEnd="0x1740">
<!--Symbol Name="gEffUnknown10Tex" Offset="0x04032490"/-->
<Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xD10"/>
<!--<DList Name="sDiamondTexDL" Offset="0x1650"/>

View File

@@ -1,7 +0,0 @@
<Root>
<File Name="link_animetion" Segment="7">
<Array Name="firstAnim" Count="20" Offset="0x000000">
<Vector Type="s16" Dimensions="3"/>
</Array>
</File>
</Root>

View File

@@ -1,6 +1,5 @@
<Root>
<!-- These dont actually go into Segment 0 but its needed to prevent an error from ZAPD -->
<File Name="g_pn_01">
<File Name="g_pn_01" >
<Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0x0"/>
<Texture Name="gForestTempleTitleCardGERTex" OutName="forest_temple_ger" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
<Texture Name="gForestTempleTitleCardFRATex" OutName="forest_temple_fra" Format="ia8" Width="144" Height="24" Offset="0x1B00"/>
@@ -85,7 +84,7 @@
<Texture Name="gMarketTitleCardGERTex" OutName="market_ger" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
<Texture Name="gMarketTitleCardFRATex" OutName="market_fra" Format="ia8" Width="144" Height="24" Offset="0x1B00"/>
</File>
<File Name="g_pn_18" Segment="0">
<File Name="g_pn_18">
<Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0x0"/>
<Texture Name="gBackAlleyTitleCardGERTex" OutName="back_alley_ger" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
<Texture Name="gBackAlleyTitleCardFRATex" OutName="back_alley_fra" Format="ia8" Width="144" Height="24" Offset="0x1B00"/>

3
spec
View File

@@ -133,7 +133,8 @@ endseg
beginseg
name "link_animetion"
include "build/baserom/link_animetion.o"
include "build/assets/misc/link_animetion/link_animetion.o"
number 7
endseg
beginseg

View File

@@ -2,4 +2,6 @@
<SymbolMap File="SymbolMap_OoTMqDbg.txt"/>
<ActorList File="ActorList_OoTMqDbg.txt"/>
<ObjectList File="ObjectList_OoTMqDbg.txt"/>
</Root>
<ExternalXMLFolder Path="assets/xml/"/>
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
</Root>