mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 05:51:18 +00:00
Code Issues Projects Releases Wiki Activity

Big cleanup (#775)

Browse source 
* Adult and child2 macros OK

* ICHAIN cleanup

* almost all overlay data

* format.sh

* func_8002FBAC NON_EQUIVALENT

* PR fixes (MZXrules)

* fix

* change //@ bug to //! @bug

* merge master and missed a //@bug

* fix ruto

* some more cleanup (#2)

* more `! @bug` formatting cleanup

* parenthesis cleanup

* hex naviEnemyId

* run formatter

* replace `IS_NOT_` macros with `!IS_`

* run formatter

* run formatter

* PR fixes (fig)

* Missed something

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-08-21 19:12:57 -04:00 • committed by GitHub
parent 17c79a8f60
commit 556cdad7eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 902 additions and 862 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

@ -159,11 +159,11 @@ void EnRd_Init(Actor* thisx, GlobalContext* globalCtx) {
if (thisx->params >= -1) {
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600E778, &D_060087D0, this->jointTable, this->morphTable,
26);
thisx->naviEnemyId = 42;
thisx->naviEnemyId = 0x2A;
} else {
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06003DD8, &D_060087D0, this->jointTable, this->morphTable,
26);
thisx->naviEnemyId = 45;
thisx->naviEnemyId = 0x2D;
}
Collider_InitCylinder(globalCtx, &this->collider);
@ -509,7 +509,7 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) {
return;
}
if (LINK_IS_CHILD) {
if (!LINK_IS_ADULT) {
Math_SmoothStepToF(&this->actor.shape.yOffset, -1500.0f, 1.0f, 150.0f, 0.0f);
}
@ -535,12 +535,12 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) {
}
break;
case 3:
if (LINK_IS_CHILD) {
if (!LINK_IS_ADULT) {
Math_SmoothStepToF(&this->actor.shape.yOffset, 0, 1.0f, 400.0f, 0.0f);
}
break;
case 4:
if (LINK_IS_CHILD) {
if (!LINK_IS_ADULT) {
Math_SmoothStepToF(&this->actor.shape.yOffset, 0, 1.0f, 400.0f, 0.0f);
}
this->actor.targetMode = 0;