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

12
src/overlays/actors/ovl_En_Rd/z_en_rd.c
View file

@ -692,12 +692,12 @@ void func_80AE3DE4(EnRd* this) {
this->unk_318 = 1;
this->unk_316 = 0x258;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT);
func_8003426C(&this->actor, -0x8000, -0x7F38, 0, 0xFF);
Actor_SetColorFilter(&this->actor, -0x8000, -0x7F38, 0, 0xFF);
} else if (this->unk_31C == 1) {
func_8003426C(&this->actor, 0, 0xC8, 0, 0x50);
Actor_SetColorFilter(&this->actor, 0, 0xC8, 0, 0x50);
} else {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT);
func_8003426C(&this->actor, -0x8000, 0xC8, 0, 0x50);
Actor_SetColorFilter(&this->actor, -0x8000, 0xC8, 0, 0x50);
}
EnRd_SetupAction(this, func_80AE3ECC);
}
@ -706,7 +706,7 @@ void func_80AE3ECC(EnRd* this, GlobalContext* globalCtx) {
if ((this->unk_318 != 0) && (this->unk_316 != 0)) {
this->unk_316--;
if (this->unk_316 >= 0xFF) {
func_8003426C(&this->actor, -0x8000, 0xC8, 0, 0xFF);
Actor_SetColorFilter(&this->actor, -0x8000, 0xC8, 0, 0xFF);
}
if (this->unk_316 == 0) {
this->unk_318 = 0;
@ -779,10 +779,10 @@ void func_80AE4114(EnRd* this, GlobalContext* globalCtx) {
this->unk_316 = 0;
if (this->unk_31C == 0xE) {
func_8003426C(&this->actor, 0x4000, 0xFF, 0, 0x50);
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 0x50);
this->unk_31A = 0x28;
} else {
func_8003426C(&this->actor, 0x4000, 0xFF, 0, 8);
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8);
}
Actor_ApplyDamage(&this->actor);