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

Gorons: En_Go & En_Go2 OK (#556)

Browse source 
* moved en_go rodata

* EnGo 20/45 functions decompiled

* EnGo 25/45 functions decompiled

* EnGo 28/45 functions decompiled

* EnGo 32/45 functions decompiled

* minor attempts

* init Goron 2 6/98 decompiled (baby functions)

* Goron2 14/98 func decompiled

* Goron2 30/98 func decompiled

* EnGo 34/45 functions decompiled

* EnGo 38/45 functions decompiled

* Goron2 44/98 functions decompiled

* Goron2 58/98 functions decompiled

* Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled

* EnGo EnGo2: 38/45, 65/98 functions decompiled

* EnGo EnGo2: 38/45, 70/98 functions decompiled

* EnGo EnGo2: 39/45, 72/98 functions decompiled

* EnGo EnGo2: 39/45, 80/98 functions decompiled

* EnGo EnGo2: 39/45, 88/98 functions decompiled

* EnGo EnGo2: 39/45, 92/98 functions decompiled

* typo in GoronType

* EnGo EnGo2: 40/45, 93/98 functions decompiled

* EnGo EnGo2: 45/45, 93/98 functions decompiled

* EnGo EnGo2 fully decomped

* begin cleanup

* the cleanup continues

* continue cleaning

* Documentation and renaming attempt

* more cleanup

* more cleanup

* Apply suggestions from code review

Committing suggestions

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>

* more pr suggestions

* more pr and gns feedback

* fixed comment

* cleanup

* update math & skelAnime names

* goron1

* goron2

* relocs

* review

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
engineer124 2021-02-01 05:02:28 +11:00 • committed by GitHub
parent 9f3e8cbf97
commit 8e8421fdec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
158 changed files with 3365 additions and 10877 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Kz/z_en_kz.c
View file

@ -419,7 +419,7 @@ void EnKz_Wait(EnKz* this, GlobalContext* globalCtx) {
}
void EnKz_SetupGetItem(EnKz* this, GlobalContext* globalCtx) {
s32 getItemID;
s32 getItemId;
f32 xzRange;
f32 yRange;
@ -428,10 +428,10 @@ void EnKz_SetupGetItem(EnKz* this, GlobalContext* globalCtx) {
this->unk_1E0.unk_00 = 1;
this->actionFunc = EnKz_StartTimer;
} else {
getItemID = this->isTrading == true ? GI_FROG : GI_TUNIC_ZORA;
getItemId = this->isTrading == true ? GI_FROG : GI_TUNIC_ZORA;
yRange = fabsf(this->actor.yDistToPlayer) + 1.0f;
xzRange = this->actor.xzDistToPlayer + 1.0f;
func_8002F434(&this->actor, globalCtx, getItemID, xzRange, yRange);
func_8002F434(&this->actor, globalCtx, getItemId, xzRange, yRange);
}
}