mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +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_Dodojr/z_en_dodojr.c
View file

@ -98,7 +98,7 @@ void EnDodojr_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_809F64D0(EnDodojr* this) {
Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
func_8003426C(&this->actor, 0x4000, 200, 0, 8);
Actor_SetColorFilter(&this->actor, 0x4000, 200, 0, 8);
}
void func_809F6510(EnDodojr* this, GlobalContext* globalCtx, s32 count) {
@ -366,7 +366,7 @@ s32 func_809F70E8(EnDodojr* this, GlobalContext* globalCtx) {
(this->actionFunc != func_809F786C)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
this->timer1 = 120;
func_8003426C(&this->actor, 0, 200, 0, 120);
Actor_SetColorFilter(&this->actor, 0, 200, 0, 120);
func_809F6A20(this);
this->actionFunc = func_809F786C;
}
@ -580,7 +580,7 @@ void func_809F7B3C(EnDodojr* this, GlobalContext* globalCtx) {
if (this->unk_1FC != 0) {
if (this->actor.colorFilterTimer == 0) {
func_8003426C(&this->actor, 0x4000, 200, 0, this->unk_1FC);
Actor_SetColorFilter(&this->actor, 0x4000, 200, 0, this->unk_1FC);
this->unk_1FC--;
}
} else {