mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-02 22:14:33 +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

23
src/overlays/actors/ovl_En_Insect/z_en_insect.c
View file

@ -67,8 +67,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_STOP),
};
Vec3f D_80A7DF28[2] = { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } };
void func_80A7BE20(EnInsect* this) {
this->unk_314 = D_80A7DF10[this->actor.params & 3];
}
@ -397,8 +395,10 @@ void func_80A7CBC8(EnInsect* this) {
}
void func_80A7CC3C(EnInsect* this, GlobalContext* globalCtx) {
static Vec3f accel = { 0.0f, 0.0f, 0.0f };
static Vec3f unused = { 0.0f, 0.0f, 0.0f };
s32 pad[2];
Vec3f sp34;
Vec3f velocity;
Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f);
Math_ApproxS(&this->actor.shape.rot.x, 10922, 352);
@ -411,11 +411,11 @@ void func_80A7CC3C(EnInsect* this, GlobalContext* globalCtx) {
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
if (this->unk_31A >= 21 && Math_Rand_ZeroOne() < 0.1f) {
sp34.x = Math_Sins(this->actor.shape.rot.y) * -0.6f;
sp34.y = Math_Sins(this->actor.shape.rot.x) * 0.6f;
sp34.z = Math_Coss(this->actor.shape.rot.y) * -0.6f;
func_800286CC(globalCtx, &this->actor.posRot.pos, &sp34, D_80A7DF28, Math_Rand_ZeroOne() * 5.0f + 8.0f,
if (this->unk_31A > 20 && Math_Rand_ZeroOne() < 0.1f) {
velocity.x = Math_Sins(this->actor.shape.rot.y) * -0.6f;
velocity.y = Math_Sins(this->actor.shape.rot.x) * 0.6f;
velocity.z = Math_Coss(this->actor.shape.rot.y) * -0.6f;
func_800286CC(globalCtx, &this->actor.posRot.pos, &velocity, &accel, Math_Rand_ZeroOne() * 5.0f + 8.0f,
Math_Rand_ZeroOne() * 5.0f + 8.0f);
}
@ -497,8 +497,8 @@ void func_80A7CEC0(EnInsect* this, GlobalContext* globalCtx) {
sp40.x = this->actor.posRot.pos.x;
sp40.y = this->actor.posRot.pos.y + this->actor.waterY;
sp40.z = this->actor.posRot.pos.z;
func_80029444(globalCtx, &sp40, 20, 100, 4);
func_80029444(globalCtx, &sp40, 40, 200, 8);
EffectSsGRipple_Spawn(globalCtx, &sp40, 20, 100, 4);
EffectSsGRipple_Spawn(globalCtx, &sp40, 40, 200, 8);
}
if (this->unk_31A <= 0 || ((this->unk_314 & 4) && this->unk_31C <= 0) ||
@ -532,7 +532,8 @@ void func_80A7D26C(EnInsect* this, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, CLAMP_MIN(this->actor.scale.x - 0.00005f, 0.001f));
if (this->actor.waterY > 5.0f && this->actor.waterY < 30.0f && Math_Rand_ZeroOne() < 0.3f) {
func_800293E4(globalCtx, &this->actor.posRot.pos, -5.0f, 5.0f, 5.0f, (Math_Rand_ZeroOne() * 0.04f) + 0.02f);
EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, -5.0f, 5.0f, 5.0f,
(Math_Rand_ZeroOne() * 0.04f) + 0.02f);
}
if (this->unk_31A <= 0) {