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
parent fcc4a8190d
commit 2810aa2b9c
75 changed files with 1584 additions and 3802 deletions
+4 -1
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