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

4
src/overlays/actors/ovl_En_Mb/z_en_mb.c
View file

@ -571,7 +571,7 @@ void func_80AA6F04(EnMb* this) {
void func_80AA6F8C(EnMb* this) {
this->unk_320 = 5;
this->actor.speedXZ = 0.0f;
func_8003426C(&this->actor, 0, 0x78, 0, 0x50);
Actor_SetColorFilter(&this->actor, 0, 0x78, 0, 0x50);
if (this->unk_188 == 6) {
this->unk_328 = 40;
} else {
@ -1354,7 +1354,7 @@ void func_80AA94D8(EnMb* this, GlobalContext* globalCtx) {
}
} else {
Actor_ApplyDamage(&this->actor);
func_8003426C(&this->actor, 0x4000, 0xFA, 0, 0xC);
Actor_SetColorFilter(&this->actor, 0x4000, 0xFA, 0, 0xC);
if (this->actor.params == 0) {
if (this->actor.colChkInfo.health == 0) {
func_80AA6F04(this);