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

Docs for the Anime part of SkelAnime (#517)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* more names

* so many names

* we got subsystems now

* slight cleanup

* merge part 2

* new naming scheme

* slight adjustment

* no limit

* syms maybe

* step one

* OK, it's fixed

* table

* some names and such

* comments**

* update zap

* gitkeep to please jenkins

* ZAP

* fixer

* fixer2

* fixer3

* zap

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
petrie911 2020-12-29 16:46:46 -06:00 • committed by GitHub
parent e4d88bf942
commit 2dfa188706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1187 changed files with 5434 additions and 5367 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
View file

@ -66,8 +66,7 @@ void EnReeba_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.unk_1F = 3;
this->actor.gravity = -3.5f;
this->actor.posRot2.pos = this->actor.posRot.pos;
SkelAnime_Init(globalCtx, &this->skelanime, &D_06001EE8, &D_060001E4, this->limbDrawTable,
this->transitionDrawTable, 18);
SkelAnime_Init(globalCtx, &this->skelanime, &D_06001EE8, &D_060001E4, this->jointTable, this->morphTable, 18);
this->actor.colChkInfo.mass = 0xFE;
this->actor.colChkInfo.health = 4;
Collider_InitCylinder(globalCtx, &this->collider);
@ -123,11 +122,11 @@ void EnReeba_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80AE4F40(EnReeba* this, GlobalContext* globalCtx) {
f32 frames = SkelAnime_GetFrameCount(&D_060001E4);
f32 frames = Animation_GetLastFrame(&D_060001E4);
Player* player = PLAYER;
s16 playerSpeed;
SkelAnime_ChangeAnim(&this->skelanime, &D_060001E4, 2.0f, 0.0f, frames, 0, -10.0f);
Animation_Change(&this->skelanime, &D_060001E4, 2.0f, 0.0f, frames, 0, -10.0f);
playerSpeed = fabsf(player->linearVelocity);
this->unk_278 = 20 - playerSpeed * 2;
@ -154,7 +153,7 @@ void func_80AE5054(EnReeba* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
f32 playerLinearVel;
SkelAnime_FrameUpdateMatrix(&this->skelanime);
SkelAnime_Update(&this->skelanime);
if ((globalCtx->gameplayFrames % 4) == 0) {
func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, this->actor.shape.unk_10, 1, 8.0f, 500, 10, 1);
@ -202,7 +201,7 @@ void func_80AE5054(EnReeba* this, GlobalContext* globalCtx) {
void func_80AE5270(EnReeba* this, GlobalContext* globalCtx) {
s32 surfaceType;
SkelAnime_FrameUpdateMatrix(&this->skelanime);
SkelAnime_Update(&this->skelanime);
if (this->actor.shape.unk_10 < 12.0f) {
Math_ApproachF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f);
@ -233,7 +232,7 @@ void func_80AE53AC(EnReeba* this, GlobalContext* globalCtx) {
s16 yaw;
s32 surfaceType;
SkelAnime_FrameUpdateMatrix(&this->skelanime);
SkelAnime_Update(&this->skelanime);
if (this->actor.shape.unk_10 < 12.0f) {
Math_ApproachF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f);
@ -293,7 +292,7 @@ void func_80AE5688(EnReeba* this, GlobalContext* globalCtx) {
void func_80AE56E0(EnReeba* this, GlobalContext* globalCtx) {
Math_ApproachZeroF(&this->actor.shape.unk_10, 1.0f, 0.3f);
Math_ApproachZeroF(&this->actor.speedXZ, 0.1f, 0.3f);
SkelAnime_FrameUpdateMatrix(&this->skelanime);
SkelAnime_Update(&this->skelanime);
if ((this->unk_284 + 10.0f) <= this->actor.shape.unk_08) {
if ((globalCtx->gameplayFrames % 4) == 0) {
@ -317,7 +316,7 @@ void func_80AE57F0(EnReeba* this, GlobalContext* globalCtx) {
}
void func_80AE5854(EnReeba* this, GlobalContext* globalCtx) {
SkelAnime_FrameUpdateMatrix(&this->skelanime);
SkelAnime_Update(&this->skelanime);
if (this->actor.speedXZ < 0.0f) {
this->actor.speedXZ += 1.0f;
@ -620,7 +619,7 @@ void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_OPA_DISP++, 0x0, 0x01, 255, 255, 255, 255);
}
SkelAnime_DrawOpa(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, NULL, this);
SkelAnime_DrawOpa(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, NULL, NULL, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_reeba.c", 1088);

4
src/overlays/actors/ovl_En_Reeba/z_en_reeba.h
View file

@ -11,8 +11,8 @@ typedef void (*EnReebaActionFunc)(struct EnReeba*, GlobalContext*);
typedef struct EnReeba {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelanime;
/* 0x0190 */ Vec3s limbDrawTable[18];
/* 0x01FC */ Vec3s transitionDrawTable[18];
/* 0x0190 */ Vec3s jointTable[18];
/* 0x01FC */ Vec3s morphTable[18];
/* 0x0268 */ char unk_268[0x4];
/* 0x026C */ EnReebaActionFunc actionfunc;
/* 0x0270 */ s16 unk_270;