mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-20 05:30:26 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* 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
commit 6615d212eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 455 additions and 1410 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec
View file

@ -1543,8 +1543,7 @@ endseg
beginseg
name "ovl_Demo_Kekkai"
include "build/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.o"
include "build/data/overlays/actors/z_demo_kekkai.data.o"
include "build/data/overlays/actors/z_demo_kekkai.reloc.o"
include "build/src/overlays/actors/ovl_Demo_Kekkai/ovl_Demo_Kekkai_reloc.o"
endseg
beginseg
@ -5657,7 +5656,8 @@ endseg
beginseg
name "object_demo_kekkai"
romalign 0x1000
include "build/baserom/object_demo_kekkai.o"
include "build/assets/objects/object_demo_kekkai/object_demo_kekkai.o"
number 6
endseg
beginseg