mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +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

4
src/overlays/actors/ovl_En_Dha/z_en_dha.c
View file

@ -255,7 +255,7 @@ void EnDha_Die(EnDha* this, GlobalContext* globalCtx) {
Vec3f vector;
Player* player = PLAYER;
if ((player->stateFlags2 & 0x80) && (&this->actor == player->actor.parent)) {
if ((player->stateFlags2 & 0x80) && (&this->actor == player->actor.parent)) {
player->stateFlags2 &= ~0x80;
player->actor.parent = NULL;
player->unk_850 = 200;
@ -305,7 +305,7 @@ void EnDha_UpdateHealth(EnDha* this, GlobalContext* globalCtx) {
}
}
}
if ((this->actor.parent != NULL) && (this->actor.parent->params == ENDH_DEATH)) {
if ((this->actor.parent != NULL) && (this->actor.parent->params == ENDH_DEATH)) {
EnDha_SetupDeath(this);
}
}