mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +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

10
src/overlays/actors/ovl_En_Rd/z_en_rd.c
View file

@ -216,7 +216,7 @@ void func_80AE2744(EnRd* this, GlobalContext* globalCtx) {
}
this->unk_305 = 0;
if ((this->actor.xzDistFromLink <= 150.0f) && func_8002DDE4(globalCtx)) {
if ((this->actor.xzDistToLink <= 150.0f) && func_8002DDE4(globalCtx)) {
if ((this->actor.params != 2) && (this->unk_305 == 0)) {
func_80AE37BC(this);
} else {
@ -298,7 +298,7 @@ void func_80AE2C1C(EnRd* this, GlobalContext* globalCtx) {
player->actor.freezeTimer = 40;
func_8008EEAC(globalCtx, &this->actor);
PLAYER->unk_684 = &this->actor;
func_800AA000(this->actor.xzDistFromLink, 0xFF, 0x14, 0x96);
func_800AA000(this->actor.xzDistToLink, 0xFF, 0x14, 0x96);
}
this->unk_306 = 0x3C;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_AIM);
@ -447,7 +447,7 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) {
Animation_PlayLoop(&this->skelAnime, &D_06004268);
this->unk_304++;
globalCtx->damagePlayer(globalCtx, -8);
func_800AA000(this->actor.xzDistFromLink, 0xFF, 1, 0xC);
func_800AA000(this->actor.xzDistToLink, 0xFF, 1, 0xC);
this->unk_319 = 0x14;
case 0:
Math_SmoothStepToS(&this->unk_30E, 0, 1, 0x5DC, 0);
@ -481,7 +481,7 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) {
if (this->unk_319 == 0) {
globalCtx->damagePlayer(globalCtx, -8);
func_800AA000(this->actor.xzDistFromLink, 0xF0, 1, 0xC);
func_800AA000(this->actor.xzDistToLink, 0xF0, 1, 0xC);
this->unk_319 = 0x14;
func_8002F7DC(&player->actor, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->unk_92);
}
@ -520,7 +520,7 @@ void func_80AE3834(EnRd* this, GlobalContext* globalCtx) {
if (ABS(temp_v0) < 0x2008) {
if (!(this->unk_312 & 0x80)) {
player->actor.freezeTimer = 60;
func_800AA000(this->actor.xzDistFromLink, 0xFF, 0x14, 0x96);
func_800AA000(this->actor.xzDistToLink, 0xFF, 0x14, 0x96);
func_8008EEAC(globalCtx, &this->actor);
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_AIM);