mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-01 01:41:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove submodule and use subrepo for ZAPD (#591)

Browse Source 
* remove zap

* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "cd4a8760b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "cd4a8760b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* remove thanks.md

* zap2 -> zapd and spec changes

* remove submodule init
This commit is contained in:
fig02
2021-01-01 23:24:29 -05:00
committed by GitHub
parent ae5a8f2700
commit ba0c6965ca
220 changed files with 85641 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/gameplay_field_keep.xml.ignore
+3 -3
View File
@@ -13,7 +13,7 @@
<Texture Name="Tex_Graveyard_Flower_Leaf" Format="rgb5a1" Width="32" Height="32"/>
<DList Name="Gfx_Grotto_Hole" Offset="0x1390"/>
<Texture Name="Tex_Grotto_Hole" Format="ia16" Width="32" Height="64"/>
<!--<Hierarchy Name="Hier_Butterfly" Offset="0x2474" Type="Standard"/>-->
<!--<Skeleton Name="Hier_Butterfly" Offset="0x2474" Type="Standard"/>-->
<DList Name="Gfx_Butterfly_Wing_R" Offset="0x2480"/>
<DList Name="Gfx_Butterfly_Wing_R_Ref" Offset="0x2520"/>
<DList Name="Gfx_Butterfly_Wing_R_Ref_Ref" Offset="0x2530"/>
@@ -21,7 +21,7 @@
<DList Name="Gfx_Butterfly_Wing_L_Ref" Offset="0x2620"/>
<DList Name="Gfx_Butterfly_Wing_L_Ref_Ref" Offset="0x2630"/>
<!--<Texture Name="Tex_Butterfly_Wing" Format="rgb5a1" Width="32" Height="64"/>-->
<!--<Hierarchy Name="Hier_Bombable_Wall" Offset="0x36EC"/>-->
<!--<Skeleton Name="Hier_Bombable_Wall" Offset="0x36EC"/>-->
<!--<Palette Name="Pal_Bombable_Wall" Format="rgb5a1" Offset="0x3700" Width="16" Height="16"/>-->
<!--<Texture Name="Tex_Bombable_Wall" Format="ci4" Palette="Pal_Bombable_Wall" Width="32" Height="64"/>-->
<!--<Texture Name="Tex_Bombable_Wall_Broken" Format="ci4" Palette="Pal_Bombable_Wall" Width="32" Height="64"/>-->
@@ -42,7 +42,7 @@
<DList Name="Gfx_Orange_Fish_Tail_Ref_Ref" Offset="0x6458"/>
<Texture Name="Tex_Orange_Fish_Body" Format="rgb5a1" Width="64" Height="64"/>
<Texture Name="Tex_Orange_Body_Tail" Format="rgb5a1" Width="32" Height="16"/>
<!--<Hierarchy Name="Hier_Fish" Offset="0x88F4"/>-->
<!--<Skeleton Name="Hier_Fish" Offset="0x88F4"/>-->
<Texture Name="Tex_Beehive" Format="rgb5a1" Width="32" Height="32" Offset="0x8900"/>
<Gfx Name="Gfx_Beehive" Offset="0x95B0"/>
<Texture Name="Tex_Beehive_Fragment" Format="rgb5a1" Width="16" Height="16" Offset="0x9710"/>
assets/xml/objects/object_sk2.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<Limb Name="gStalfosJawLimb" Type="Standard" Offset="0x78D4"/>
<Limb Name="gStalfosHeadLimb" Type="Standard" Offset="0x78E0"/>
<Limb Name="gStalfosEntryFirstVertebLimb" Type="Standard" Offset="0x78EC"/>
<Hierarchy Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
<Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
<Animation Name="gStalfosBackDamageAnim" Offset="0x444"/>
<Animation Name="gStalfosBackDownAnim" Offset="0x1420"/>
<Animation Name="gStalfosBackJumpAnim" Offset="0x1978"/>