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

En_Tite OK (#555)

Browse source 
* EnTite_Update matching

* Fixes to update

* made good progress, func_80B1A2A0 is in a good place to be matching soon

* Merge stuff

* func_80B19E94 done, func_80B18CC4 done

* EnTite_Destroy and EnTite_Init done

* Commenting out sDamageTable and EnTite_Init until all the data matches

* Some more small functions done

* more progress

* func_80B19918 done

* func_80B18E7C done

* func_80B19524 done

* more progress

* EnTite_Draw equiv but nonmatching, file otherwise done

* Found some unstaged changed on old laptop

* Draw matching: File fully matching!

* Documentation

* finished documentation

* deleted data files

* update spec

* fixed waterY -> yDistToWater rename after merge

* ran format.sh

* fixing accidental renames in camera

* Fixed some obvious number/comment formatting issues

* Removed unecessary prototypes

* merge

* running format.sh

* suggestions

* more pr comment changes

* format to push

* one more change

* more renames (see pr comments)

* merge

* renames

* format.sh

* fix renames

* function comment formatting

* merge + format

* endless merge fixes

* merge fixes until  die

* yet again a merge fix

* pr suggestions
This commit is contained in:
AdamKiddle 2020-12-31 20:00:30 +00:00 • committed by GitHub
parent 5a2bd7a035
commit 600bad1f20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
147 changed files with 1431 additions and 3642 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -249,13 +249,13 @@ void func_80A020A4(EnElf* this, GlobalContext* globalCtx) {
}
void func_80A0214C(EnElf* this, GlobalContext* globalCtx) {
f32 xzDistFromLink;
f32 xzDistToLink;
if (this->unk_2C0 > 0) {
this->unk_2C0--;
} else {
xzDistFromLink = this->actor.xzDistFromLink;
if (xzDistFromLink < 50.0f) {
xzDistToLink = this->actor.xzDistToLink;
if (xzDistToLink < 50.0f) {
if (Rand_ZeroOne() < 0.2f) {
this->unk_2A8 = 2;
this->unk_2AC = 0x400;
@ -267,16 +267,16 @@ void func_80A0214C(EnElf* this, GlobalContext* globalCtx) {
this->unk_2C0 = 10;
}
} else {
if (xzDistFromLink > 150.0f) {
xzDistFromLink = 150.0f;
if (xzDistToLink > 150.0f) {
xzDistToLink = 150.0f;
}
xzDistFromLink = ((xzDistFromLink - 50.0f) * 0.95f) + 0.05f;
xzDistToLink = ((xzDistToLink - 50.0f) * 0.95f) + 0.05f;
if (Rand_ZeroOne() < xzDistFromLink) {
if (Rand_ZeroOne() < xzDistToLink) {
this->unk_2A8 = 3;
this->unk_2AC = 0x200;
this->unk_2B8 = (xzDistFromLink * 2.0f) + 1.0f;
this->unk_2B8 = (xzDistToLink * 2.0f) + 1.0f;
this->func_2C8 = func_80A01FE0;
this->unk_2C0 = (s16)Rand_ZeroFloat(16.0f) + 0x10;
} else {