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

ovl_En_Owl (#573)

* begin En_Owl

* EnOwl wip

* fix conflicts

* owl wip

* wip

* cleanup

* more cleanup

* remove unused asm

* run formatter

* match EnOwl_Init

* formatting

* pr updates

* forgot the enum values in WaitZoraRiver

* merge fixes

* Fix merge issues

* review changes + more

* name

Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
krimtonz 2021-01-14 14:17:03 -06:00 committed by GitHub
commit 2810aa2b9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 1584 additions and 3802 deletions

5
spec
View file

@ -2784,8 +2784,11 @@ endseg
beginseg
name "ovl_En_Owl"
include "build/src/overlays/actors/ovl_En_Owl/z_en_owl.o"
include "build/data/overlays/actors/z_en_owl.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Owl/ovl_En_Owl_reloc.o"
#else
include "build/data/overlays/actors/z_en_owl.reloc.o"
#endif
endseg
beginseg