1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-20 13:40:02 +00:00

z_En_Ossan and dependencies (#824)

* fix colliderinit typo

* fix initchain

* reloc

* progress

* progress

* Pick off a few easy functions, reduce number of warnings

* more tough OKs

* Getting closer to all OK, fix en_girla header

* some hard OKs, 7 to go

* two funcs remaining

* func_80AC7094 OK!

* Fix warnings, begin documentation

* get most of object_ossan documented, document some of en_ossan

* improve en_girla function names

* more EnOssan documentation

* more documentation

* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements

* delete TIME ITSELF

* object_oF1d_map OK

* more names, fixed a poition typo

* Nearly all en_ossan functions named, all variables named

* format.sh

* forgot to delete data

* implement pr changes

* EnOssan OK! implement most of Roman's suggestions

* ugh

* implement figs suggestions

* implement roman's suggestion

* Can't tell my left from my other left

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
mzxrules 2021-07-04 11:23:18 -04:00 committed by GitHub
commit 3fd05c9147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3479 additions and 7998 deletions

9
spec
View file

@ -2708,8 +2708,7 @@ endseg
beginseg
name "ovl_En_Ossan"
include "build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o"
include "build/data/overlays/actors/z_en_ossan.data.o"
include "build/data/overlays/actors/z_en_ossan.reloc.o"
include "build/src/overlays/actors/ovl_En_Ossan/ovl_En_Ossan_reloc.o"
endseg
beginseg
@ -4017,7 +4016,8 @@ endseg
beginseg
name "object_ossan"
romalign 0x1000
include "build/baserom/object_ossan.o"
include "build/assets/objects/object_ossan/object_ossan.o"
number 6
endseg
beginseg
@ -4687,7 +4687,8 @@ endseg
beginseg
name "object_oF1d_map"
romalign 0x1000
include "build/baserom/object_oF1d_map.o"
include "build/assets/objects/object_oF1d_map/object_oF1d_map.o"
number 6
endseg
beginseg