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

EnFish, OK and documented (#795)

Browse source 
* Matching

* Some naming

* spec

* Name another function

* Name animations, clarify use of GI_MAX and GI_NONE

* Documented bottle range functions

* Simplify squared distance function in EnIceHono, actor descriptions

* Functions for dropped fish

* More naming

* Change 65535.5f to (0xFFFF + 0.5f)

* Change 65535.5f to (0xFFFF + 0.5f)

* name phases

* Named other types, Docile functions

* Naming complete

* delete asm

* format, remove outdated comment

* Fix a few DrawFlexOpa arguments

* Review changes

* Change back to original playSound

* Function comments per review
This commit is contained in:
EllipticEllipsis 2021-05-02 17:41:05 +01:00 • committed by GitHub
parent 2ee1fd4668
commit ce44541d33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 812 additions and 2426 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -955,7 +955,7 @@ void func_80A40B1C(EnGo* this, GlobalContext* globalCtx) {
void EnGo_GetItem(EnGo* this, GlobalContext* globalCtx) {
f32 xzDist;
f32 yDist;
s32 getItem;
s32 getItemId;
if (Actor_HasParent(&this->actor, globalCtx)) {
this->unk_1E0.unk_00 = 2;
@ -965,24 +965,24 @@ void EnGo_GetItem(EnGo* this, GlobalContext* globalCtx) {
this->unk_20C = 0;
if ((this->actor.params & 0xF0) == 0x90) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK) {
getItem = GI_SWORD_BGS;
getItemId = GI_SWORD_BGS;
this->unk_20C = 1;
}
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) {
getItem = GI_CLAIM_CHECK;
getItemId = GI_CLAIM_CHECK;
}
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_SWORD_BROKEN) {
getItem = GI_PRESCRIPTION;
getItemId = GI_PRESCRIPTION;
}
}
if ((this->actor.params & 0xF0) == 0) {
getItem = GI_TUNIC_GORON;
getItemId = GI_TUNIC_GORON;
}
yDist = fabsf(this->actor.yDistToPlayer) + 1.0f;
xzDist = this->actor.xzDistToPlayer + 1.0f;
func_8002F434(&this->actor, globalCtx, getItem, xzDist, yDist);
func_8002F434(&this->actor, globalCtx, getItemId, xzDist, yDist);
}
}