mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Even more objects (#913)

Browse source 
* malon adult limbs and enum

* malon adult animations

* Malon Adult textures

* Object_ma2 OK

* Cleanup undefined syms file

* more cleanup

* object_in OK

* change

* Object_TA limbs and Limb DLs ok

* Textures in DLs OK

* Object TA animations OK

* Object TA OK

* clean up the xml

* almost done with impa textures

* name impa draw funcs

* fix globalCtx2 in talon_init

* more progress in impa

* eye texture stuff

* impa OK

* remove files

* fix messed up merge

* Switch MA2 blink timer from hex

* Name a function

* Fix skelanime fixer

* Missing malon adult TLUT

* add some missing symbols in DemoEc

* Fix conflicts, part2

* Clean up TLUT related stuff and some minor things

* Remove unused externs from z_demo_ec

* Remove unused symbols from undefined_syms.txt

* PR fixes (Dragorn)

* Dragorn fixes

* Fix various texture-related issues in object_link_child

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix ingo and the rest of Dragorns fix

* impa fixes

* fix ingo again

* fix windmill man missing TLUT

* Fix impa in viewer

* Roman's fixes

* Add limb

* Missed an animation

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-11-24 13:37:36 -05:00 • committed by GitHub
parent 0f58b15b27
commit 665283432b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 1568 additions and 1452 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -191,7 +191,7 @@ void func_8097CCE0(DemoGo* this, GlobalContext* globalCtx) {
}
}
s32 DemoGo_FrameUpdateMatrix(DemoGo* this) {
s32 DemoGo_UpdateSkelAnime(DemoGo* this) {
return SkelAnime_Update(&this->skelAnime);
}
@ -278,7 +278,7 @@ void func_8097D088(DemoGo* this, GlobalContext* globalCtx) {
s32 something;
func_8097CA30(this, globalCtx);
something = DemoGo_FrameUpdateMatrix(this);
something = DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097CF20(this, globalCtx, something);
}
@ -287,7 +287,7 @@ void func_8097D0D0(DemoGo* this, GlobalContext* globalCtx) {
func_8097CCE0(this, globalCtx);
func_8097CCC0(this);
func_8097CA30(this, globalCtx);
DemoGo_FrameUpdateMatrix(this);
DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097C9DC(this);
func_8097CF9C(this);
@ -296,7 +296,7 @@ void func_8097D130(DemoGo* this, GlobalContext* globalCtx) {
func_8097CCE0(this, globalCtx);
func_8097CC08(this);
func_8097CA30(this, globalCtx);
DemoGo_FrameUpdateMatrix(this);
DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097C9DC(this);
}