mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-06 16:04:35 +00:00
Code Issues Projects Releases Wiki Activity

Bomb Related Effect Overlays (#283)

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

* match bomb2

* asm file

* pr review
This commit is contained in:
fig02 2020-07-28 15:49:00 -04:00 • committed by GitHub
parent c76c584006
commit 19c990b852
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
82 changed files with 822 additions and 2416 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/functions.h
View file

@ -223,18 +223,17 @@ void func_80028A54(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos);
void func_80028B74(GlobalContext*, Vec3f*, UNK_PTR, UNK_PTR, Color_RGB8*, Color_RGB8*);
// ? func_80028BB0(?);
// ? func_80028CEC(?);
// ? func_80028DC4(?);
// ? func_80028E1C(?);
void func_80028E84(GlobalContext*, Vec3f*, Vec3f*, Vec3f*, s32, s32);
// ? func_80028EF4(?);
// ? func_80028F84(?);
// ? func_80028FD8(?);
// ? func_80029024(?);
// ? func_80029060(?);
// ? func_800290F0(?);
// ? func_80029184(?);
// ? func_800291D8(?);
// ? func_800292DC(?);
void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep);
void func_80028F84(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 radius, s16 radiusStep,
s16 life);
void func_80028FD8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* envColor,
Color_RGBA8* primColor, s16 life);
void func_80029024(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel);
void func_80029060(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel,
Color_RGBA8* envColor, Color_RGBA8* primColor, s16 scale, s16 scaleStep);
void func_80029184(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel);
void func_800292DC(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel,
Color_RGBA8* envColor, Color_RGBA8* primColor);
// ? func_80029320(?);
// ? func_800293A0(?);
void func_800293E4(GlobalContext*, Vec3f* pos, f32, f32, f32, f32);
@ -281,8 +280,7 @@ void func_8002A6B8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* arg2, Vec3f* arg
// ? func_8002A824(?);
// ? func_8002A894(?);
// ? func_8002A90C(?);
// ? func_8002A95C(?);
// ? func_8002A9F4(?);
void EffectSsDeadSound_SpawnStationary(GlobalContext* globalCtx, Vec3f* pos, u16 sfxId, s16 lowerPriority, s16 unk28, s32 life);
// ? func_8002AA44(?);
void FlagSet_Update(GlobalContext* globalCtx);
void Overlay_LoadGameState(GameStateOverlay* overlayEntry);