mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

ZAPD update: Gotta go fast! (#877)

Browse source 
* copy over the xml

* Rename anims

* A bunch of renames

* minor extract_assets fixes

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "820678b4e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "820678b4e"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Change rgb5a1 to rgba16

* eye and eyebrows

* some dlists

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "6be9af65d"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "6be9af65d"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
This commit is contained in:
Anghelo Carvajal 2021-07-27 22:16:03 -04:00 • committed by GitHub
parent d1a5ea5110
commit 5c147e5e03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
226 changed files with 2350 additions and 1492 deletions
Download patch file Download diff file Expand all files Collapse all files

34
assets/xml/objects/object_jya_obj.xml
View file

@ -2,8 +2,8 @@
<File Name="object_jya_obj" Segment="6">
<DList Name="g1fliftDL" Offset="0x1F0"/>
<Collision Name="g1fliftCol" Offset="0x4A8" />
<Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgb5a1" Width="32" Height="32" Offset="0x1B940"/>
<Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgb5a1" Width="32" Height="32" Offset="0x17540"/>
<Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
<Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
<DList Name="gAmishutterDL" Offset="0xC0A0"/>
<Collision Name="gAmishutterCol" Offset="0xC4C8" />
<DList Name="gBigMirror1DL" Offset="0xBC70"/>
@ -17,27 +17,27 @@
<DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
<DList Name="gBombiwaDL" Offset="0xE490"/>
<DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
<Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgb5a1" Width="32" Height="64" Offset="0x18B40"/>
<Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
<Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
<Collision Name="gBombiwaCol" Offset="0xE710" />
<DList Name="gCobra1DL" Offset="0x10790"/>
<DList Name="gCobra2DL" Offset="0x10C20"/>
<Collision Name="gCobraCol" Offset="0x1167C" />
<DList Name="gCobra3DL" Offset="0x117D0"/>
<Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgb5a1" Width="32" Height="32" Offset="0x13D40"/>
<Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgb5a1" Width="16" Height="16" Offset="0x15D40"/>
<Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgb5a1" Width="32" Height="32" Offset="0x15540"/>
<Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgb5a1" Width="32" Height="8" Offset="0x15F40"/>
<Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
<Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
<Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
<Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
<Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
<Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
<DList Name="gKanaamiDL" Offset="0xF000"/>
<Collision Name="gKanaamiCol" Offset="0xF208" />
<Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgb5a1" Width="32" Height="64" Offset="0x12540"/>
<Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgb5a1" Width="32" Height="32" Offset="0x13540"/>
<Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
<Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
<DList Name="gLiftDL" Offset="0xCCE0"/>
<Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgb5a1" Width="16" Height="32" Offset="0x17D40"/>
<Texture Name="gLiftTopTex" OutName="lift_top" Format="rgb5a1" Width="16" Height="64" Offset="0x18140"/>
<Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgb5a1" Width="8" Height="32" Offset="0x18940"/>
<Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
<Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
<Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
<Collision Name="gLiftCol" Offset="0xD7E8" />
<DList Name="gMegami1DL" Offset="0x5780"/>
<Collision Name="GMegamiCol" Offset="0x5C4C" />
@ -55,14 +55,14 @@
<DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
<DList Name="gMegamiPiece12DL" Offset="0xA978"/>
<DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
<Texture Name="gMegami1TLUT" OutName="megami_palette_1" Format="rgb5a1" Width="4" Height="4" Offset="0x5C80"/>
<Texture Name="gMegami1TLUT" OutName="megami_palette_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
<Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8"/>
<Texture Name="gMegami2TLUT" OutName="megami_palette_2" Format="rgb5a1" Width="4" Height="4" Offset="0xAC50"/>
<Texture Name="gMegami2TLUT" OutName="megami_palette_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
<Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8"/>
<Texture Name="gMegami3TLUT" OutName="megami_palette_3" Format="rgb5a1" Width="4" Height="64" Offset="0x6CE8"/>
<Texture Name="gMegami3TLUT" OutName="megami_palette_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
<Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8"/>
<Texture Name="gMegami4TLUT" OutName="megami_palette_4" Format="rgb5a1" Width="4" Height="4" Offset="0x5CA0"/>
<Texture Name="gMegami5TLUT" OutName="megami_palette_5" Format="rgb5a1" Width="4" Height="4" Offset="0xAC70"/>
<Texture Name="gMegami4TLUT" OutName="megami_palette_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
<Texture Name="gMegami5TLUT" OutName="megami_palette_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
<Texture Name="gMeagmiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00"/>
<Texture Name="gMeagmiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00"/>
<Texture Name="gMeagmiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500"/>