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

All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396)

Browse source 
* fix colliderinit typo

* dead sound done

* deadsound documentation

* blast done

* progress

* spk init

* progress

* spark done

* ss bomb ok

* bomb done

* cleanup

* progress

* progress

* almost done with bomb2

* clean up gossip stone

* more

* cleanup and format

* remove unused asm file

* nonmatching reloc

* done i think

* mistakes

* fix headers

* idk how that got in here

* EffectSsStick OK

* progress

* fix conflicting name

* progress

* splash OK

* uname fields

* progress

* lightning OK

* remove unwanted files

* kirakira ok

* kirakira done

* magma OK

* remove files

* ss_g_fire OK

* name funcs

* progress

* progress

* magma2 and kakera OK

* eff_ss_dead_dd OK

* fcircle OK

* stone1 OK

* sibuki2 OK

* dt_bubble OK

* deaddb OK

* sibuki OK

* dead_ds OK

* ice_smoke OK

* hitmark OK

* hahen OK

* k_fire OK

* en_fire OK

* starting colors

* color changes 1

* color switch done

* init file data migrated

* data cleanup

* ice_piece OK

* en_ice OK

* progress

* progress

* docs progress

* fix blast color names

* documentation pass 1

* progress

* cleanup pass 2

* touchups

* added to functions.h

* small changes

* fix functions.h

* renaming progress

* name progress

* color enum

* more cleanups

* enice changes

* final cleanups

* remove unwanted file

* lightning -> shock

* pr suggestions

* fix comment

* remove unwanted comments
This commit is contained in:
fig02 2020-09-29 20:18:46 -04:00 • committed by GitHub
parent a506801cd7
commit 82968a7381
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
541 changed files with 5667 additions and 15639 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -439,31 +439,28 @@ s32 func_80AEB480(GlobalContext* globalCtx, u16 action) {
return func_80AEAFE0(globalCtx, action, 3);
}
void func_80AEB4A8(EnRu1* this, GlobalContext* globalCtx, s16 arg2, s16 arg3) {
Vec3f sp24;
void EnRu1_SpawnRipple(EnRu1* this, GlobalContext* globalCtx, s16 radiusMax, s16 life) {
Vec3f pos;
Actor* thisx = &this->actor;
sp24.x = thisx->posRot.pos.x;
sp24.y = thisx->posRot.pos.y + thisx->waterY;
sp24.z = thisx->posRot.pos.z;
func_80029444(globalCtx, &sp24, 100, arg2, arg3);
pos.x = thisx->posRot.pos.x;
pos.y = thisx->posRot.pos.y + thisx->waterY;
pos.z = thisx->posRot.pos.z;
EffectSsGRipple_Spawn(globalCtx, &pos, 100, radiusMax, life);
}
void func_80AEB50C(EnRu1* this, GlobalContext* globalCtx) {
this->unk_270 += 1.0f;
if (this->unk_270 >= kREG(3) + 10.0f) {
func_80AEB4A8(this, globalCtx, kREG(1) + 500, 0);
EnRu1_SpawnRipple(this, globalCtx, kREG(1) + 500, 0);
this->unk_270 = 0.0f;
}
}
void func_80AEB59C(EnRu1* this, GlobalContext* globalCtx) {
f32 temp_f0;
func_80AEB4A8(this, globalCtx, kREG(2) + 500, 0);
func_80AEB4A8(this, globalCtx, kREG(2) + 500, kREG(3) + 10.0f);
temp_f0 = kREG(3) + 10.0f;
func_80AEB4A8(this, globalCtx, kREG(2) + 500, temp_f0 + temp_f0);
EnRu1_SpawnRipple(this, globalCtx, kREG(2) + 500, 0);
EnRu1_SpawnRipple(this, globalCtx, kREG(2) + 500, kREG(3) + 10.0f);
EnRu1_SpawnRipple(this, globalCtx, kREG(2) + 500, (kREG(3) + 10.0f) * 2.0f);
}
void func_80AEB680(EnRu1* this, GlobalContext* globalCtx) {
@ -474,7 +471,7 @@ void func_80AEB680(EnRu1* this, GlobalContext* globalCtx) {
pos.y = thisx->posRot.pos.y + thisx->waterY;
pos.z = thisx->posRot.pos.z;
func_8002949C(globalCtx, &pos, 0, 0, 1, 0);
EffectSsGSplash_Spawn(globalCtx, &pos, 0, 0, 1, 0);
}
void func_80AEB6E0(EnRu1* this, GlobalContext* globalCtx) {