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

52
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
View file

@ -5,6 +5,7 @@
*/
#include "z_obj_comb.h"
#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
#define FLAGS 0x00000000
@ -57,14 +58,14 @@ extern Gfx D_05009940[];
void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) {
Vec3f pos1;
Vec3f posSum;
Vec3f pos2;
Vec3f pos;
Vec3f velocity;
Gfx** dlist = D_05009940;
s16 scale;
s16 angle = 0;
s16 gravityInfluence;
u8 u0;
u8 rotSpeed;
s16 gravity;
u8 arg5;
u8 arg6;
f32 rand1;
f32 rand2;
s32 i;
@ -77,40 +78,43 @@ void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) {
pos1.y = (i - 15) * 0.7f;
pos1.z = Math_Coss(angle) * rand1;
Math_Vec3f_Sum(&pos1, &this->actor.posRot.pos, &posSum);
Math_Vec3f_Sum(&pos1, &this->actor.posRot.pos, &pos);
pos2.x = (Math_Rand_ZeroOne() - 0.5f) + pos1.x * 0.5f;
pos2.y = (Math_Rand_ZeroOne() - 0.5f) + pos1.y * 0.6f;
pos2.z = (Math_Rand_ZeroOne() - 0.5f) + pos1.z * 0.5f;
velocity.x = (Math_Rand_ZeroOne() - 0.5f) + pos1.x * 0.5f;
velocity.y = (Math_Rand_ZeroOne() - 0.5f) + pos1.y * 0.6f;
velocity.z = (Math_Rand_ZeroOne() - 0.5f) + pos1.z * 0.5f;
scale = Math_Rand_ZeroOne() * 72.0f + 25.0f;
if (scale < 40) {
gravityInfluence = -200;
rotSpeed = 40;
gravity = -200;
arg6 = 40;
} else if (scale < 70) {
gravityInfluence = -280;
rotSpeed = 30;
gravity = -280;
arg6 = 30;
} else {
gravityInfluence = -340;
rotSpeed = 20;
gravity = -340;
arg6 = 20;
}
rand2 = Math_Rand_ZeroOne();
if (rand2 < 0.1f) {
u0 = 96;
arg5 = 96;
} else if (rand2 < 0.8f) {
u0 = 64;
arg5 = 64;
} else {
u0 = 32;
arg5 = 32;
}
func_80029E8C(globalCtx, &posSum, &pos2, &posSum, gravityInfluence, u0, rotSpeed, 4, 0, scale, 0, 0, 80, -1, 2,
dlist);
EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, gravity, arg5, arg6, 4, 0, scale, 0, 0, 80,
KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, dlist);
}
posSum.x = this->actor.posRot.pos.x;
posSum.y = this->actor.posRot.pos.y - 10.0f;
posSum.z = this->actor.posRot.pos.z;
func_80033480(globalCtx, &posSum, 40.0f, 6, 70, 60, 1);
pos.x = this->actor.posRot.pos.x;
pos.y = this->actor.posRot.pos.y - 10.0f;
pos.z = this->actor.posRot.pos.z;
func_80033480(globalCtx, &pos, 40.0f, 6, 70, 60, 1);
}
void ObjComb_ChooseItemDrop(ObjComb* this, GlobalContext* globalCtx) {