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

34
src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
View file

@ -156,7 +156,7 @@ void func_8098E5C8(DemoSa* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
s32 DemoSa_FrameUpdateMatrix(DemoSa* this) {
s32 DemoSa_UpdateSkelAnime(DemoSa* this) {
return SkelAnime_Update(&this->skelAnime);
}
@ -325,30 +325,30 @@ void func_8098EBD8(DemoSa* this, GlobalContext* globalCtx) {
void func_8098EBF8(DemoSa* this, GlobalContext* globalCtx) {
func_8098E944(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098EA3C(this);
}
void func_8098EC28(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098EA68(this, globalCtx);
}
void func_8098EC60(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
func_8098EB00(this, DemoSa_FrameUpdateMatrix(this));
func_8098EB00(this, DemoSa_UpdateSkelAnime(this));
}
void func_8098EC94(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098EB6C(this, globalCtx);
}
void func_8098ECCC(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
}
void func_8098ECF4(DemoSa* this, GlobalContext* globalCtx) {
@ -442,7 +442,7 @@ void func_8098F0E8(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F118(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098EEFC(this, globalCtx);
func_8098E554(this, globalCtx);
@ -450,7 +450,7 @@ void func_8098F118(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F16C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098EDB0(this);
func_8098F050(this, globalCtx);
func_8098E554(this, globalCtx);
@ -489,7 +489,7 @@ void func_8098F390(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F3F0(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
}
@ -578,7 +578,7 @@ void func_8098F714(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F734(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F480(this);
func_8098F544(this);
@ -586,14 +586,14 @@ void func_8098F734(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F77C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F654(this, globalCtx);
}
void func_8098F7BC(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F654(this, globalCtx);
}
@ -602,7 +602,7 @@ void func_8098F7FC(DemoSa* this, GlobalContext* globalCtx) {
s32 sp1C;
func_8098E5C8(this, globalCtx);
sp1C = DemoSa_FrameUpdateMatrix(this);
sp1C = DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F610(this, sp1C);
}
@ -726,26 +726,26 @@ void func_8098FC44(DemoSa* this, GlobalContext* globalCtx) {
void func_8098FC64(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098F8F8(this);
func_8098FA2C(this);
}
void func_8098FC9C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098FB68(this, globalCtx);
}
void func_8098FCD4(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098FB68(this, globalCtx);
}
void func_8098FD0C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
func_8098FB34(this, DemoSa_FrameUpdateMatrix(this));
func_8098FB34(this, DemoSa_UpdateSkelAnime(this));
func_8098FB68(this, globalCtx);
}