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

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

51
src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
View file

@ -47,11 +47,28 @@ static ColliderCylinderInit sColCylinderInit1 = {
s16 sHasParent = false;
Color_RGBA8_n D_8087259C = { 100, 100, 100, 0 };
Color_RGBA8_n D_808725A0 = { 40, 40, 40, 0 };
extern Gfx D_60013500[];
extern UNK_TYPE D_06001DDC;
static Vec3f sVelocity = { 0.0f, -1.5f, 0.0f };
static Vec3f sAcceleration = { 0.0f, -0.2f, 0.0f };
void BgDodoago_SetupAction(BgDodoago* this, BgDodoagoActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgDodoago_SpawnSparkles(Vec3f* vec, GlobalContext* globalCtx) {
Vec3f pos;
Color_RGBA8 primColor = { 100, 100, 100, 0 };
Color_RGBA8 envColor = { 40, 40, 40, 0 };
static Vec3f velocity = { 0.0f, -1.5f, 0.0f };
static Vec3f acceleration = { 0.0f, -0.2f, 0.0f };
s32 i;
for (i = 4; i > 0; i--) {
pos.x = Math_Rand_CenteredFloat(20.0f) + vec->x;
pos.y = Math_Rand_CenteredFloat(10.0f) + vec->y;
pos.z = Math_Rand_CenteredFloat(20.0f) + vec->z;
EffectSsKiraKira_SpawnSmall(globalCtx, &pos, &velocity, &acceleration, &primColor, &envColor);
}
}
static InitChainEntry D_808725BC[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
@ -60,30 +77,10 @@ static InitChainEntry D_808725BC[] = {
ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP),
};
extern Gfx D_60013500[];
extern UNK_TYPE D_06001DDC;
u8 D_808727C0[100];
s32 D_80872824;
void BgDodoago_SetupAction(BgDodoago* this, BgDodoagoActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
void func_80871A08(Vec3f* vec, GlobalContext* globalCtx) {
Vec3f pos;
Color_RGBA8_n primColor = D_8087259C;
Color_RGBA8_n envColor = D_808725A0;
s32 i;
for (i = 4; i > 0; i--) {
pos.x = Math_Rand_CenteredFloat(20.0f) + vec->x;
pos.y = Math_Rand_CenteredFloat(10.0f) + vec->y;
pos.z = Math_Rand_CenteredFloat(20.0f) + vec->z;
func_80028B74(globalCtx, &pos, &sVelocity, &sAcceleration, &primColor, &envColor);
}
}
void BgDodoago_Init(Actor* thisx, GlobalContext* globalCtx) {
BgDodoago* this = THIS;
s32 pad;
@ -206,13 +203,13 @@ void func_80871FB8(BgDodoago* this, GlobalContext* globalCtx) {
currentPos.y = this->dyna.actor.posRot.pos.y - 20.0f;
currentPos.z = this->dyna.actor.posRot.pos.z + 100.0f;
func_80871A08(&currentPos, globalCtx);
BgDodoago_SpawnSparkles(&currentPos, globalCtx);
currentPos.x = this->dyna.actor.posRot.pos.x - 200.0f;
currentPos.y = this->dyna.actor.posRot.pos.y - 20.0f;
currentPos.z = this->dyna.actor.posRot.pos.z + 100.0f;
func_80871A08(&currentPos, globalCtx);
BgDodoago_SpawnSparkles(&currentPos, globalCtx);
Math_ApproxS(&this->unk_164, 0x64, 3);
func_800AA000(500.0f, 0x78, 0x14, 0xA);