mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Actor Struct Changes (and a few related things) (#617)

Browse source 
* reformat header

* type -> category

* done for now i think

* some more stuff

* first -> head

* focus

* flag comment

* ground -> floor

* remove asm, name wrapper funcs

* name func, format

* review

* targetPriority, format

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0305ec2c2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0305ec2c2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* comment

* review

* feet flags

* horse shadow
This commit is contained in:
fig02 2021-01-18 16:04:04 -05:00 • committed by GitHub
parent 20206fba0d
commit 00a5edea71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
697 changed files with 8157 additions and 7942 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
View file

@ -352,7 +352,7 @@ void func_809AA230(EffectSs* this, GlobalContext* globalCtx) {
if (this->rReg8 == 0) {
if ((((this->rReg4 >> 4) & 1) * 0x10) == 0x10) {
if (this->pos.y <= (player->actor.groundY - ((this->rReg4 >> 2) & 3))) {
if (this->pos.y <= (player->actor.floorHeight - ((this->rReg4 >> 2) & 3))) {
this->rReg9 = 0;
this->rReg0 = 0;
this->rReg4 &= ~0x60;
@ -362,7 +362,7 @@ void func_809AA230(EffectSs* this, GlobalContext* globalCtx) {
this->rGravity = this->rReg9;
}
} else {
if (this->pos.y <= ((player->actor.groundY - ((this->rReg4 >> 2) & 3)) - 600.0f)) {
if (this->pos.y <= ((player->actor.floorHeight - ((this->rReg4 >> 2) & 3)) - 600.0f)) {
this->life = 0;
}
}