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

object_torch2, object_blkobj, and object_geldb (#592)

* objects are fun

* more objects

* again

* fixes to geldb

* one more thing

* forgot s

* type fix

* some formatting

* change Gerudo 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"

* organize xmls

* outname

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
petrie911 2021-01-30 13:16:18 -06:00 committed by GitHub
parent 3db87244b4
commit 9607ce34fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 153 additions and 105 deletions

View file

@ -10,4 +10,4 @@
<Collision Name="gUnknownUnusedBox4Col" Offset="0x15D0"/>
<Texture Name="gUnknownUnusedBoxTex" OutName="unknown_unused_box" Format="rgb5a1" Width="32" Height="32" Offset="0xCC8"/>
</File>
</Root>
</Root>