mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-23 23:41:24 +00:00
Even more objects (#913)
* 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
GitHub
parent
0f58b15b27
commit
665283432b
86 changed files with 1568 additions and 1452 deletions
|
|
@ -208,7 +208,7 @@ void func_80B4ED2C(EnZl2* this, GlobalContext* globalCtx) {
|
|||
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
|
||||
}
|
||||
|
||||
s32 EnZl2_FrameUpdateMatrix(EnZl2* this) {
|
||||
s32 EnZl2_UpdateSkelAnime(EnZl2* this) {
|
||||
return SkelAnime_Update(&this->skelAnime);
|
||||
}
|
||||
|
||||
|
|
@ -987,7 +987,7 @@ void func_80B50BEC(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -996,7 +996,7 @@ void func_80B50C40(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FDD4(this);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B500E0(this, globalCtx);
|
||||
func_80B503DC(this, globalCtx);
|
||||
}
|
||||
|
|
@ -1005,7 +1005,7 @@ void func_80B50CA8(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1013,13 +1013,13 @@ void func_80B50CFC(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B4EA40(this);
|
||||
func_80B50488(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B50488(this, EnZl2_UpdateSkelAnime(this));
|
||||
}
|
||||
|
||||
void func_80B50D50(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1027,14 +1027,14 @@ void func_80B50D94(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B4EAF4(this);
|
||||
func_80B5053C(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B5053C(this, EnZl2_UpdateSkelAnime(this));
|
||||
}
|
||||
|
||||
void func_80B50DE8(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1042,14 +1042,14 @@ void func_80B50E3C(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
func_80B505D4(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B505D4(this, EnZl2_UpdateSkelAnime(this));
|
||||
}
|
||||
|
||||
void func_80B50E90(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1057,7 +1057,7 @@ void func_80B50EE4(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1065,7 +1065,7 @@ void func_80B50F38(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1074,7 +1074,7 @@ void func_80B50F8C(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FE10(globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1082,14 +1082,14 @@ void func_80B50FE8(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4FE10(globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B5073C(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B5073C(this, EnZl2_UpdateSkelAnime(this));
|
||||
}
|
||||
|
||||
void func_80B51034(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4FE10(globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1097,14 +1097,14 @@ void func_80B51080(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4FE10(globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B507E8(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B507E8(this, EnZl2_UpdateSkelAnime(this));
|
||||
}
|
||||
|
||||
void func_80B510CC(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4FE10(globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1112,14 +1112,14 @@ void func_80B51118(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4FE10(globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B50880(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B50880(this, EnZl2_UpdateSkelAnime(this));
|
||||
}
|
||||
|
||||
void func_80B51164(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4FE10(globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1127,13 +1127,13 @@ void func_80B511B0(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4FE10(globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B50928(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B50928(this, EnZl2_UpdateSkelAnime(this));
|
||||
}
|
||||
|
||||
void func_80B511FC(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B5008C(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
}
|
||||
|
|
@ -1142,7 +1142,7 @@ void func_80B51250(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4FE48(this);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B500E0(this, globalCtx);
|
||||
func_80B5008C(this);
|
||||
func_80B50A04(this, globalCtx);
|
||||
|
|
@ -1151,7 +1151,7 @@ void func_80B51250(EnZl2* this, GlobalContext* globalCtx) {
|
|||
void func_80B512B8(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B501E8(this, globalCtx);
|
||||
func_80B509A0(this, globalCtx);
|
||||
}
|
||||
|
|
@ -1377,7 +1377,7 @@ void func_80B51A8C(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B51418(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B51948(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1385,7 +1385,7 @@ void func_80B51AE4(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
func_80B51644(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B51644(this, EnZl2_UpdateSkelAnime(this));
|
||||
func_80B51948(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1393,7 +1393,7 @@ void func_80B51B44(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B5149C(this, globalCtx);
|
||||
func_80B516D0(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B516D0(this, EnZl2_UpdateSkelAnime(this));
|
||||
func_80B51948(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1401,7 +1401,7 @@ void func_80B51BA8(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B514F8(this, globalCtx);
|
||||
func_80B5175C(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B5175C(this, EnZl2_UpdateSkelAnime(this));
|
||||
func_80B51948(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1409,13 +1409,13 @@ void func_80B51C0C(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B5146C(this, globalCtx);
|
||||
func_80B517E0(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B517E0(this, EnZl2_UpdateSkelAnime(this));
|
||||
}
|
||||
|
||||
void func_80B51C64(EnZl2* this, GlobalContext* globalCtx) {
|
||||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B51948(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1423,7 +1423,7 @@ void func_80B51CA8(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
func_80B5154C(this, globalCtx);
|
||||
func_80B5187C(this, EnZl2_FrameUpdateMatrix(this));
|
||||
func_80B5187C(this, EnZl2_UpdateSkelAnime(this));
|
||||
func_80B51948(this, globalCtx);
|
||||
}
|
||||
|
||||
|
|
@ -1542,7 +1542,7 @@ void func_80B52098(EnZl2* this, GlobalContext* globalCtx) {
|
|||
func_80B4FCCC(this, globalCtx);
|
||||
func_80B4ED2C(this, globalCtx);
|
||||
EnZl2_UpdateEyes(this);
|
||||
EnZl2_FrameUpdateMatrix(this);
|
||||
EnZl2_UpdateSkelAnime(this);
|
||||
func_80B51D24(this, globalCtx);
|
||||
func_80B51F38(this, globalCtx);
|
||||
func_80B51DA4(this, globalCtx);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue