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

Armos and object_am OK (#652)

Browse source 
* started

* all but 2

* OK

* docs progress

* lots of docs

* add gitkeep back

* all funcs named

* small fix

* 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"

* object_am

* change

* ready i think

* last thing

* asm

* progress
This commit is contained in:
fig02 2021-02-15 13:41:55 -05:00 • committed by GitHub
parent 79c8accfab
commit 982c645167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
131 changed files with 1077 additions and 2585 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Ny/z_en_ny.c
View file

@ -316,16 +316,16 @@ s32 EnNy_CollisionCheck(EnNy* this, GlobalContext* globalCtx) {
sp3F = 1;
case 0xF:
Actor_ApplyDamage(&this->actor);
func_8003426C(&this->actor, 0x4000, 0xFF, 0x2000, 0x50);
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0x2000, 0x50);
break;
case 1:
Actor_ApplyDamage(&this->actor);
func_8003426C(&this->actor, 0x4000, 0xFF, 0x2000, 0x50);
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0x2000, 0x50);
break;
case 2:
this->unk_1CA = 4;
Actor_ApplyDamage(&this->actor);
func_8003426C(&this->actor, 0x4000, 0xFF, 0x2000, 0x50);
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0x2000, 0x50);
break;
}
}