mirror of
https://github.com/zeldaret/oot.git
synced 2025-10-19 21:19:54 +00:00
En_Zl4 (#590)
* significant progress * cutscene data * match * docs * dist from link * compiler warnings * cutscene and such * object decomp * stuff * cleanup * name some things * stuff * cutscenes fixed * 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" * 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" * reorder * unused content * documented cutscene dlists * enviewer update * Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * formatter Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
parent
7ee8c8011c
commit
da55eaa2d8
41 changed files with 1708 additions and 3861 deletions
6
spec
6
spec
|
@ -3203,8 +3203,7 @@ endseg
|
|||
beginseg
|
||||
name "ovl_En_Zl4"
|
||||
include "build/src/overlays/actors/ovl_En_Zl4/z_en_zl4.o"
|
||||
include "build/data/overlays/actors/z_en_zl4.data.o"
|
||||
include "build/data/overlays/actors/z_en_zl4.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Zl4/ovl_En_Zl4_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
@ -5883,7 +5882,8 @@ endseg
|
|||
beginseg
|
||||
name "object_zl4"
|
||||
romalign 0x1000
|
||||
include "build/baserom/object_zl4.o"
|
||||
include "build/assets/objects/object_zl4/object_zl4.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue