1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00

Demo_Kekkai, its object, and its cutscenes (#627)

* first pass

* scene

* object

* name

* git subrepo pull --force tools/ZAPD

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

* now with cutscenes

* one last name

* git subrepo pull --force tools/ZAPD

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

* ZAPD works

* git subrepo pull --force tools/ZAPD

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

* now with vtx arrays

* revert zap changes

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
petrie911 2021-02-01 13:52:23 -06:00 committed by GitHub
parent 1fbc0f1943
commit 6615d212eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 455 additions and 1410 deletions

View file

@ -0,0 +1,41 @@
<Root>
<File Name="object_demo_kekkai" Segment="6">
<!-- Demo_Kekkai -->
<DList Name="gTowerBarrierDL" Offset="0x4930"/>
<DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
<Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
<Vtx/>
</Array>
<DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
<DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
<!-- Bg_Gnd_Darkmeiro -->
<DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
<DList Name="gClearBlockDL" Offset="0xBEC0"/>
<Collision Name="gClearBlockCol" Offset="0xC080"/>
<!-- Bg_Gnd_Firemeiro -->
<DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
<Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
<!-- Bg_Gnd_Iceblock -->
<DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
<Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
<!-- Bg_Gnd_Nisekabe -->
<DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
<DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
<DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
<!-- Bg_Gnd_Soulmeiro -->
<DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
<DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
<DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
<!-- Object_Kankyo -->
<DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
<!-- Door_Shutter -->
<DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
</File>
</Root>