mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +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

8
src/overlays/actors/ovl_En_Bili/z_en_bili.c
View file

@ -226,7 +226,7 @@ void EnBili_SetupBurnt(EnBili* this) {
this->collider.base.acFlags &= ~AC_ON;
this->actor.flags |= 0x10;
this->actor.speedXZ = 0.0f;
func_8003426C(&this->actor, 0x4000, 0xC8, 0x2000, 0x14);
Actor_SetColorFilter(&this->actor, 0x4000, 0xC8, 0x2000, 0x14);
this->actionFunc = EnBili_Burnt;
}
@ -245,7 +245,7 @@ void EnBili_SetupStunned(EnBili* this) {
this->collider.info.bumper.effect = 0;
this->actor.gravity = -1.0f;
this->actor.speedXZ = 0.0f;
func_8003426C(&this->actor, 0, 0x96, 0x2000, 0x50);
Actor_SetColorFilter(&this->actor, 0, 0x96, 0x2000, 0x50);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
this->collider.base.atFlags &= ~AT_ON;
this->actionFunc = EnBili_Stunned;
@ -273,7 +273,7 @@ void EnBili_SetupFrozen(EnBili* this, GlobalContext* globalCtx) {
}
this->actor.speedXZ = 0.0f;
func_8003426C(&this->actor, 0, 0x96, 0x2000, 0xA);
Actor_SetColorFilter(&this->actor, 0, 0x96, 0x2000, 0xA);
this->collider.base.atFlags &= ~AT_ON;
this->collider.base.acFlags &= ~AC_ON;
this->timer = 300;
@ -563,7 +563,7 @@ void EnBili_UpdateDamage(EnBili* this, GlobalContext* globalCtx) {
}
} else if (damageEffect == BIRI_DMGEFF_SWORD) {
if (this->actionFunc != EnBili_Stunned) {
func_8003426C(&this->actor, 0x4000, 0xC8, 0x2000, 0xA);
Actor_SetColorFilter(&this->actor, 0x4000, 0xC8, 0x2000, 0xA);
if (this->actor.colChkInfo.health == 0) {
this->actor.params = EN_BILI_TYPE_DYING;