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

14
src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
View file

@ -203,19 +203,19 @@ void func_80A906C4(EnKakasi2* this, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
}
void EnKakasi2_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnKakasi2_Update(Actor* thisx, GlobalContext* globalCtx2) {
EnKakasi2* this = THIS;
GlobalContext* globalCtx2 = globalCtx;
GlobalContext* globalCtx = globalCtx2;
this->actor.world.rot = this->actor.shape.rot;
Actor_SetFocus(&this->actor, this->height);
this->actionFunc(this, globalCtx2);
this->actionFunc(this, globalCtx);
Actor_MoveForward(&this->actor);
if (this->actor.shape.yOffset == 0.0f) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetAC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base);
CollisionCheck_SetOC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base);
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
if (BREG(0) != 0) {
if (BREG(5) != 0) {
@ -229,12 +229,12 @@ void EnKakasi2_Update(Actor* thisx, GlobalContext* globalCtx) {
if ((this->unk_194 % 2) == 0) {
DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z,
1.0f, 1.0f, 1.0f, 70, 70, 70, 255, 4, globalCtx2->state.gfxCtx);
1.0f, 1.0f, 1.0f, 70, 70, 70, 255, 4, globalCtx->state.gfxCtx);
}
} else {
DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, 1.0f,
1.0f, 1.0f, 0, 255, 255, 255, 4, globalCtx2->state.gfxCtx);
1.0f, 1.0f, 0, 255, 255, 255, 4, globalCtx->state.gfxCtx);
}
}
}