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

ObjTimeblock OK (#421)

Browse source 
* ObjTimeblock: move data in source file

* ObjTimeblock: decomp Init()

* ObjTimeblock: decomp Destroy()

* ObjTimeblock: decomp func_80BA0058()/spawnDemoEffect()

* ObjTimeblock: decomp func_80B9FFA0()

* ObjTimeblock: decomp func_80BA040C()/mainActionFunc()

* ObjTimeblock: decomp func_80BA032C()

* ObjTimeblock: decomp func_80BA0480()

* ObjTimeblock: decomp func_80BA0514()

* ObjTimeblock: decomp func_80BA0524()

* ObjTimeblock: decomp func_80BA00CC()/toggleSceneSwitch()

* ObjTimeblock: decomp func_80BA04F8()

* ObjTimeblock: decomp func_80BA0508()/doNothing()

* ObjTimeblock: decomp func_80BA0758()

* ObjTimeblock: decomp func_80BA0768()

* ObjTimeblock: decomp func_80BA06AC()

* ObjTimeblock: decomp func_80BA083C()

* ObjTimeblock: decomp func_80BA084C()

* ObjTimeblock: decomp ObjTimeblock_Update()

* ObjTimeblock: decomp ObjTimeblock_Draw()

* ObjTimeblock: document the most obvious

* ObjTimeblock: use compiled reloc data

* ObjTimeblock: apply suggestions from mzxrules

* review

Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
Peppers1612 2020-12-03 16:52:26 -05:00 • committed by GitHub
parent 579b87dceb
commit 80c803b9ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 330 additions and 921 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -5,13 +5,13 @@
#define THIS ((EnDh*)thisx)
typedef enum {
DH_WAIT,
DH_RETREAT,
DH_BURROW,
DH_WALK,
DH_ATTACK,
DH_DEATH,
DH_DAMAGE
/* 0 */ DH_WAIT,
/* 1 */ DH_RETREAT,
/* 2 */ DH_BURROW,
/* 3 */ DH_WALK,
/* 4 */ DH_ATTACK,
/* 5 */ DH_DEATH,
/* 6 */ DH_DAMAGE
} EnDhAction;
void EnDh_Init(Actor* this, GlobalContext* globalCtx);
@ -96,7 +96,7 @@ void EnDh_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
this->actor.colChkInfo.damageTable = &D_809EC620;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007E88, &D_06005880, this->limbDrawTable, this->limbRotTable,
16);
16);
ActorShape_Init(&this->actor.shape, 0.0f, &ActorShadow_DrawFunc_Circle, 64.0f);
this->actor.params = ENDH_WAIT_UNDERGROUND;
this->actor.colChkInfo.mass = 0xFE;
@ -502,13 +502,13 @@ void EnDh_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]);
POLY_OPA_DISP =
SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl,
this->skelAnime.dListCount, NULL, EnDh_PostLimbDraw, &this->actor, POLY_OPA_DISP);
this->skelAnime.dListCount, NULL, EnDh_PostLimbDraw, &this->actor, POLY_OPA_DISP);
} else {
func_80093D84(globalCtx->state.gfxCtx);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
gSPSegment(POLY_XLU_DISP++, 0x08, &D_80116280[0]);
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl,
this->skelAnime.dListCount, NULL, NULL, &this->actor, POLY_XLU_DISP);
this->skelAnime.dListCount, NULL, NULL, &this->actor, POLY_XLU_DISP);
}
if (this->drawDirtWave) {
func_80093D84(globalCtx->state.gfxCtx);