mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Decompiled ovl_En_Ru1 (#72)

Browse source 
* Decompiled ovl_En_Ru1

* Formatting

* Actor/TransitionDrawTable struct fixes

* addressing PR comments

* addressing PR comments (2)
This commit is contained in:
Ethan Roseman 2020-04-18 04:50:41 -04:00 • committed by GitHub
parent 62864ba11d
commit cb5a604ea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
221 changed files with 2616 additions and 7208 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -84,14 +84,14 @@ const ActorInit En_Ru2_InitVars = {
(ActorFunc)EnRu2_Draw,
};
extern AnimationHeader* D_060004CC;
extern SkeletonHeader* D_0600C700;
extern AnimationHeader* D_0600D3DC;
extern AnimationHeader* D_0600DCAC;
extern AnimationHeader* D_06000DE8;
extern AnimationHeader* D_0600E630;
extern AnimationHeader* D_0600F03C;
extern AnimationHeader* D_0600F8B8;
extern AnimationHeader D_060004CC;
extern SkeletonHeader D_0600C700;
extern AnimationHeader D_0600D3DC;
extern AnimationHeader D_0600DCAC;
extern AnimationHeader D_06000DE8;
extern AnimationHeader D_0600E630;
extern AnimationHeader D_0600F03C;
extern AnimationHeader D_0600F8B8;
void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) {
EnRu2* thisLocal = this;
@ -304,7 +304,8 @@ void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.state != 0) {
csCmdActorAction = globalCtx->csCtx.actorActions[3];
if (csCmdActorAction != NULL && csCmdActorAction->action == 3) {
SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f);
SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&animation->genericHeader), 2, 0.0f);
this->action = 4;
}
}
@ -756,7 +757,7 @@ void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) {
void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f);
func_80AF2550(this, globalCtx);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600C700, NULL, &this->unk_190, &this->unk_21A, 0x17);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600C700, NULL, &this->actorDrawTable, &this->transitionDrawTable, 23);
switch (func_80AF26A0(this)) {
case 2:

6
src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
View file

@ -7,10 +7,8 @@
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ s8 unk_190; // likely a struct
/* 0x0191 */ char unk_191[0x89];
/* 0x021A */ s8 unk_21A; // another of the same struct
/* 0x021B */ char unk_21B[0x89];
/* 0x0190 */ Vec3s actorDrawTable[23];
/* 0x021A */ Vec3s transitionDrawTable[23];
/* 0x02A4 */ s16 unk_2A4;
/* 0x02A6 */ s16 unk_2A6;
/* 0x02A8 */ s32 action;